Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Mobile-Expensify
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1009026104
versionName "9.2.61-4"
versionCode 1009026105
versionName "9.2.61-5"
// Supported language variants must be declared here to avoid from being removed during the compilation.
// This also helps us to not include unnecessary language variants in the APK.
resConfigs "en", "es"
Expand Down

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>9.2.61.4</string>
<string>9.2.61.5</string>
<key>FullStory</key>
<dict>
<key>OrgId</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NotificationServiceExtension/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundleShortVersionString</key>
<string>9.2.61</string>
<key>CFBundleVersion</key>
<string>9.2.61.4</string>
<string>9.2.61.5</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/ShareViewController/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundleShortVersionString</key>
<string>9.2.61</string>
<key>CFBundleVersion</key>
<string>9.2.61.4</string>
<string>9.2.61.5</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "9.2.61-4",
"version": "9.2.61-5",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
Expand Down
4 changes: 0 additions & 4 deletions src/CONST/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1035,14 +1035,10 @@ const CONST = {
STORYLANE: {
ADMIN_TOUR: 'https://app.storylane.io/demo/bbcreg8vccag?embed=inline',
ADMIN_TOUR_MOBILE: 'https://app.storylane.io/demo/b6faqcdsxgww?embed=inline',
ADMIN_MIGRATED: 'https://app.storylane.io/share/qlgnexxbsdtp',
ADMIN_MIGRATED_MOBILE: 'https://app.storylane.io/share/fgireksbt2oh',
TRACK_WORKSPACE_TOUR: 'https://app.storylane.io/share/mqzy3huvtrhx?embed=inline',
TRACK_WORKSPACE_TOUR_MOBILE: 'https://app.storylane.io/share/wq4hiwsqvoho?embed=inline',
EMPLOYEE_TOUR: 'https://app.storylane.io/share/izmryscwurdd?embed=inline',
EMPLOYEE_TOUR_MOBILE: 'https://app.storylane.io/share/wckqdetaacgy?embed=inline',
EMPLOYEE_MIGRATED: 'https://app.storylane.io/share/v9dr1rjqsd9y',
EMPLOYEE_MIGRATED_MOBILE: 'https://app.storylane.io/share/qbbob6zvapqo',
},
OLD_DOT_PUBLIC_URLS: {
TERMS_URL: `${EXPENSIFY_URL}/terms`,
Expand Down
2 changes: 0 additions & 2 deletions src/components/Icon/Illustrations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ import LockClosed from '@assets/images/simple-illustrations/simple-illustration_
import LockClosedOrange from '@assets/images/simple-illustrations/simple-illustration__lockclosed_orange.svg';
import LockOpen from '@assets/images/simple-illustrations/simple-illustration__lockopen.svg';
import Luggage from '@assets/images/simple-illustrations/simple-illustration__luggage.svg';
import MagnifyingGlassReceipt from '@assets/images/simple-illustrations/simple-illustration__magnifyingglass-receipt.svg';
import Mailbox from '@assets/images/simple-illustrations/simple-illustration__mailbox.svg';
import ExpensifyMobileApp from '@assets/images/simple-illustrations/simple-illustration__mobileapp.svg';
import MoneyIntoWallet from '@assets/images/simple-illustrations/simple-illustration__moneyintowallet.svg';
Expand Down Expand Up @@ -129,7 +128,6 @@ export {
ExpensifyCardImage,
PaymentHands,
MagicCode,
MagnifyingGlassReceipt,
Mailbox,
MushroomTopHat,
RocketBlue,
Expand Down
62 changes: 22 additions & 40 deletions src/components/MigratedUserWelcomeModal.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import {useRoute} from '@react-navigation/native';
import {tryNewDotOnyxSelector} from '@selectors/Onboarding';
import React, {lazy, Suspense, useEffect, useState} from 'react';
import React, {useEffect, useState} from 'react';
import {View} from 'react-native';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useSearchTypeMenuSections from '@hooks/useSearchTypeMenuSections';
import useStyleUtils from '@hooks/useStyleUtils';
import useThemeStyles from '@hooks/useThemeStyles';
import {openExternalLink} from '@libs/actions/Link';
import {dismissProductTraining} from '@libs/actions/Welcome';
import convertToLTR from '@libs/convertToLTR';
import Log from '@libs/Log';
Expand All @@ -25,26 +24,22 @@ import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
import type {FeatureListItem} from './FeatureList';
import FeatureTrainingModal from './FeatureTrainingModal';
import Icon from './Icon';
import * as Illustrations from './Icon/Illustrations';
import LottieAnimations from './LottieAnimations';
import RenderHTML from './RenderHTML';

// Lazy load illustrations
const MagnifyingGlassReceipt = lazy(() => import('@assets/images/simple-illustrations/simple-illustration__magnifyingglass-receipt.svg'));
const ConciergeBot = lazy(() => import('@assets/images/simple-illustrations/simple-illustration__concierge-bot.svg'));
const ChatBubbles = lazy(() => import('@assets/images/simple-illustrations/simple-illustration__chatbubbles.svg'));

const ExpensifyFeatures: FeatureListItem[] = [
{
icon: MagnifyingGlassReceipt,
translationKey: 'migratedUserWelcomeModal.features.search',
icon: Illustrations.ChatBubbles,
translationKey: 'migratedUserWelcomeModal.features.chat',
},
{
icon: ConciergeBot,
translationKey: 'migratedUserWelcomeModal.features.concierge',
icon: Illustrations.Flash,
translationKey: 'migratedUserWelcomeModal.features.scanReceipt',
},
{
icon: ChatBubbles,
translationKey: 'migratedUserWelcomeModal.features.chat',
icon: Illustrations.ExpensifyMobileApp,
translationKey: 'migratedUserWelcomeModal.features.crossPlatform',
},
];

Expand All @@ -63,7 +58,6 @@ function MigratedUserWelcomeModal() {
canBeMissing: true,
});
const [dismissedProductTraining, dismissedProductTrainingMetadata] = useOnyx(ONYXKEYS.NVP_DISMISSED_PRODUCT_TRAINING, {canBeMissing: true});
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});

useEffect(() => {
if (isLoadingOnyxValue(tryNewDotMetadata, dismissedProductTrainingMetadata)) {
Expand Down Expand Up @@ -93,16 +87,6 @@ function MigratedUserWelcomeModal() {
title={translate('migratedUserWelcomeModal.title')}
description={translate('migratedUserWelcomeModal.subtitle')}
confirmText={translate('migratedUserWelcomeModal.confirmText')}
helpText={translate('migratedUserWelcomeModal.helpText')}
onHelp={() => {
Log.info('[MigratedUserWelcomeModal] onHelp called, opening help URL based on admin status and device type');
const isAdmin = !!account?.adminsRoomReportID;
const adminUrl = shouldUseNarrowLayout ? CONST.STORYLANE.ADMIN_MIGRATED_MOBILE : CONST.STORYLANE.ADMIN_MIGRATED;
const employeeUrl = shouldUseNarrowLayout ? CONST.STORYLANE.EMPLOYEE_MIGRATED_MOBILE : CONST.STORYLANE.EMPLOYEE_MIGRATED;
const helpUrl = isAdmin ? adminUrl : employeeUrl;
openExternalLink(helpUrl);
dismissProductTraining(CONST.MIGRATED_USER_WELCOME_MODAL);
}}
animation={LottieAnimations.WorkspacePlanet}
onClose={() => {
Log.hmmm('[MigratedUserWelcomeModal] onClose called, dismissing product training');
Expand All @@ -120,23 +104,21 @@ function MigratedUserWelcomeModal() {
style={[styles.gap3, styles.pt1, styles.pl1]}
fsClass={CONST.FULLSTORY.CLASS.UNMASK}
>
<Suspense fallback={null}>
{ExpensifyFeatures.map(({translationKey, icon}) => (
<View
key={translationKey}
style={[styles.flexRow, styles.alignItemsCenter, styles.wAuto]}
>
<Icon
src={icon}
height={variables.menuIconSize}
width={variables.menuIconSize}
/>
<View style={[styles.flexRow, styles.alignItemsCenter, styles.wAuto, styles.flex1, styles.ml6]}>
<RenderHTML html={`<comment>${convertToLTR(translate(translationKey))}</comment>`} />
</View>
{ExpensifyFeatures.map(({translationKey, icon}) => (
<View
key={translationKey}
style={[styles.flexRow, styles.alignItemsCenter, styles.wAuto]}
>
<Icon
src={icon}
height={variables.menuIconSize}
width={variables.menuIconSize}
/>
<View style={[styles.flexRow, styles.alignItemsCenter, styles.wAuto, styles.flex1, styles.ml6]}>
<RenderHTML html={`<comment>${convertToLTR(translate(translationKey))}</comment>`} />
</View>
))}
</Suspense>
</View>
))}
</View>
</FeatureTrainingModal>
);
Expand Down
9 changes: 4 additions & 5 deletions src/languages/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7439,14 +7439,13 @@ ${
},
migratedUserWelcomeModal: {
title: 'Willkommen bei New Expensify!',
subtitle: 'Es enthält alles, was du an unserem klassischen Erlebnis liebst, mit einer ganzen Reihe von Verbesserungen, die dein Leben noch einfacher machen:',
subtitle: 'New Expensify hat die gleiche großartige Automatisierung, aber jetzt mit erstaunlicher Zusammenarbeit:',
confirmText: "Los geht's!",
features: {
chat: 'Chatte zu jeder Ausgabe, um Fragen schnell zu klären',
search: 'Leistungsstärkere Suche auf Mobilgeräten, im Web und auf dem Desktop',
concierge: 'Integrierte Concierge-KI zur Automatisierung Ihrer Ausgaben',
chat: '<strong>Chatten Sie direkt über jede Ausgabe</strong>, jeden Bericht oder Arbeitsbereich',
scanReceipt: '<strong>Belege scannen</strong> und Rückerstattung erhalten',
crossPlatform: 'Erledigen Sie <strong>alles</strong> von Ihrem Telefon oder Browser aus',
},
helpText: '2-Minuten-Demo ausprobieren',
},
productTrainingTooltip: {
// TODO: CONCIERGE_LHN_GBR tooltip will be replaced by a tooltip in the #admins room
Expand Down
Loading
Loading