Merge branch 'main' of https://github.com/Expensify/App into feat/#Ex…

…pensify#23229-linking
margelo · Mar 13, 2024 · ad44807 · ad44807
2 parents 2c809c4 + f52bb02
commit ad44807
Show file tree

Hide file tree

Showing 167 changed files with 2,807 additions and 1,688 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -194,6 +194,7 @@ module.exports = {
                     {
                         selector: ['parameter', 'method'],
                         format: ['camelCase', 'PascalCase'],
+                        leadingUnderscore: 'allow',
                     },
                 ],
                 '@typescript-eslint/ban-types': [

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001045005
-        versionName "1.4.50-5"
+        versionCode 1001045103
+        versionName "1.4.51-3"
     }
 
     flavorDimensions "default"

diff --git a/assets/fonts/web/ExpensifyNewKansas-Medium.woff b/assets/fonts/web/ExpensifyNewKansas-Medium.woff
diff --git a/assets/fonts/web/ExpensifyNewKansas-Medium.woff2 b/assets/fonts/web/ExpensifyNewKansas-Medium.woff2
diff --git a/assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff b/assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff
diff --git a/assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff2 b/assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff2
diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss
@@ -508,6 +508,7 @@ button {
 
         .info {
             padding: 12px;
+            margin-bottom: 20px;
             border-radius: 8px;
             background-color: $color-highlightBG;
             color: $color-text;

diff --git a/docs/redirects.csv b/docs/redirects.csv
@@ -65,3 +65,4 @@ https://help.expensify.com/articles/expensify-classic/expensify-billing/Pay-Per-
 https://help.expensify.com/articles/expensify-classic/expensify-billing/Individual-Subscription,https://use.expensify.com/
 https://help.expensify.com/articles/expensify-classic/settings/Merge-Accounts,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Merge-accounts
 https://help.expensify.com/articles/expensify-classic/settings/Preferences,https://help.expensify.com/expensify-classic/hubs/settings/account-settings
+https://help.expensify.com/articles/expensify-classic/getting-started/support/Your-Expensify-Account-Manager,https://use.expensify.com/support
diff --git a/ios/NewApp_AdHoc.mobileprovision.gpg b/ios/NewApp_AdHoc.mobileprovision.gpg
diff --git a/ios/NewApp_AdHoc_Notification_Service.mobileprovision.gpg b/ios/NewApp_AdHoc_Notification_Service.mobileprovision.gpg
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.50</string>
+	<string>1.4.51</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.50.5</string>
+	<string>1.4.51.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.50</string>
+	<string>1.4.51</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.50.5</string>
+	<string>1.4.51.3</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.50</string>
+	<string>1.4.51</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.50.5</string>
+	<string>1.4.51.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.50-5",
+  "version": "1.4.51-3",
   "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.",
@@ -103,7 +103,7 @@
     "date-fns-tz": "^2.0.0",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
-    "expensify-common": "git+ssh://[email protected]/Expensify/expensify-common.git#a8ed0f8e1be3a1e09016e07a74cfd13c85bbc167",
+    "expensify-common": "git+ssh://[email protected]/Expensify/expensify-common.git#7bfd55f0ce75a37423119029fde58cfbe57086d9",
     "expo": "^50.0.3",
     "expo-av": "~13.10.4",
     "expo-image": "1.10.1",

diff --git a/patches/@react-navigation+stack+6.3.16+002+dontDetachScreen.patch b/patches/@react-navigation+stack+6.3.16+002+dontDetachScreen.patch
@@ -43,7 +43,7 @@ index 7558eb3..b7bb75e 100644
          }) : STATE_TRANSITIONING_OR_BELOW_TOP;
        }
 +      
-+      const isHomeScreenAndNotOnTop = (route.name === 'BottomTabNavigator' || route.name === 'Settings_Root')  && isScreenActive !== STATE_ON_TOP;
++      const isHomeScreenAndNotOnTop = (route.name === 'BottomTabNavigator' || route.name === 'Workspace_Initial')  && isScreenActive !== STATE_ON_TOP;
 +
        const {
          headerShown = true,

diff --git a/...ated+3.7.1+001+fix-boost-dependency.patch → ...ated+3.7.2+001+fix-boost-dependency.patch b/...ated+3.7.1+001+fix-boost-dependency.patch → ...ated+3.7.2+001+fix-boost-dependency.patch
diff --git a/patches/react-native-reanimated+3.7.1.patch → patches/react-native-reanimated+3.7.2.patch b/patches/react-native-reanimated+3.7.1.patch → patches/react-native-reanimated+3.7.2.patch
diff --git a/src/CONST.ts b/src/CONST.ts
@@ -1661,6 +1661,8 @@ const CONST = {
     LOGIN_CHARACTER_LIMIT: 254,
     CATEGORY_NAME_LIMIT: 256,
 
+    TAG_NAME_LIMIT: 256,
+
     TITLE_CHARACTER_LIMIT: 100,
     DESCRIPTION_LIMIT: 500,
 

diff --git a/src/Expensify.tsx b/src/Expensify.tsx
@@ -183,12 +183,12 @@ function Expensify({
         // If the app is opened from a deep link, get the reportID (if exists) from the deep link and navigate to the chat report
         Linking.getInitialURL().then((url) => {
             setInitialUrl(url);
-            Report.openReportFromDeepLink(url ?? '', isAuthenticated);
+            Report.openReportFromDeepLink(url ?? '');
         });
 
         // Open chat report from a deep link (only mobile native)
         Linking.addEventListener('url', (state) => {
-            Report.openReportFromDeepLink(state.url, isAuthenticated);
+            Report.openReportFromDeepLink(state.url);
         });
 
         return () => {

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
@@ -332,6 +332,8 @@ const ONYXKEYS = {
         WORKSPACE_SETTINGS_FORM: 'workspaceSettingsForm',
         WORKSPACE_CATEGORY_CREATE_FORM: 'workspaceCategoryCreate',
         WORKSPACE_CATEGORY_CREATE_FORM_DRAFT: 'workspaceCategoryCreateDraft',
+        WORKSPACE_TAG_CREATE_FORM: 'workspaceTagCreate',
+        WORKSPACE_TAG_CREATE_FORM_DRAFT: 'workspaceTagCreateDraft',
         WORKSPACE_SETTINGS_FORM_DRAFT: 'workspaceSettingsFormDraft',
         WORKSPACE_DESCRIPTION_FORM: 'workspaceDescriptionForm',
         WORKSPACE_DESCRIPTION_FORM_DRAFT: 'workspaceDescriptionFormDraft',
@@ -416,6 +418,7 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM]: FormTypes.AddDebitCardForm;
     [ONYXKEYS.FORMS.WORKSPACE_SETTINGS_FORM]: FormTypes.WorkspaceSettingsForm;
     [ONYXKEYS.FORMS.WORKSPACE_CATEGORY_CREATE_FORM]: FormTypes.WorkspaceCategoryCreateForm;
+    [ONYXKEYS.FORMS.WORKSPACE_TAG_CREATE_FORM]: FormTypes.WorkspaceTagCreateForm;
     [ONYXKEYS.FORMS.WORKSPACE_RATE_AND_UNIT_FORM]: FormTypes.WorkspaceRateAndUnitForm;
     [ONYXKEYS.FORMS.CLOSE_ACCOUNT_FORM]: FormTypes.CloseAccountForm;
     [ONYXKEYS.FORMS.PROFILE_SETTINGS_FORM]: FormTypes.ProfileSettingsForm;

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
@@ -450,140 +450,148 @@ const ROUTES = {
     WORKSPACE_NEW: 'workspace/new',
     WORKSPACE_NEW_ROOM: 'workspace/new-room',
     WORKSPACE_INITIAL: {
-        route: 'workspace/:policyID',
-        getRoute: (policyID: string) => `workspace/${policyID}` as const,
+        route: 'settings/workspaces/:policyID',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}` as const,
     },
     WORKSPACE_INVITE: {
-        route: 'workspace/:policyID/invite',
-        getRoute: (policyID: string) => `workspace/${policyID}/invite` as const,
+        route: 'settings/workspaces/:policyID/invite',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/invite` as const,
     },
     WORKSPACE_INVITE_MESSAGE: {
-        route: 'workspace/:policyID/invite-message',
-        getRoute: (policyID: string) => `workspace/${policyID}/invite-message` as const,
+        route: 'settings/workspaces/:policyID/invite-message',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/invite-message` as const,
     },
     WORKSPACE_PROFILE: {
-        route: 'workspace/:policyID/profile',
-        getRoute: (policyID: string) => `workspace/${policyID}/profile` as const,
+        route: 'settings/workspaces/:policyID/profile',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/profile` as const,
     },
     WORKSPACE_PROFILE_CURRENCY: {
-        route: 'workspace/:policyID/profile/currency',
-        getRoute: (policyID: string) => `workspace/${policyID}/profile/currency` as const,
+        route: 'settings/workspaces/:policyID/profile/currency',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/profile/currency` as const,
     },
     WORKSPACE_PROFILE_NAME: {
-        route: 'workspace/:policyID/profile/name',
-        getRoute: (policyID: string) => `workspace/${policyID}/profile/name` as const,
+        route: 'settings/workspaces/:policyID/profile/name',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/profile/name` as const,
     },
     WORKSPACE_PROFILE_DESCRIPTION: {
-        route: 'workspace/:policyID/profile/description',
-        getRoute: (policyID: string) => `workspace/${policyID}/profile/description` as const,
+        route: 'settings/workspaces/:policyID/profile/description',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/profile/description` as const,
     },
     WORKSPACE_PROFILE_SHARE: {
-        route: 'workspace/:policyID/profile/share',
-        getRoute: (policyID: string) => `workspace/${policyID}/profile/share` as const,
+        route: 'settings/workspaces/:policyID/profile/share',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/profile/share` as const,
     },
     WORKSPACE_AVATAR: {
-        route: 'workspace/:policyID/avatar',
-        getRoute: (policyID: string) => `workspace/${policyID}/avatar` as const,
+        route: 'settings/workspaces/:policyID/avatar',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/avatar` as const,
     },
     WORKSPACE_JOIN_USER: {
-        route: 'workspace/:policyID/join',
-        getRoute: (policyID: string, inviterEmail: string) => `workspace/${policyID}/join?email=${inviterEmail}` as const,
+        route: 'settings/workspaces/:policyID/join',
+        getRoute: (policyID: string, inviterEmail: string) => `settings/workspaces/${policyID}/join?email=${inviterEmail}` as const,
     },
     WORKSPACE_SETTINGS_CURRENCY: {
-        route: 'workspace/:policyID/settings/currency',
-        getRoute: (policyID: string) => `workspace/${policyID}/settings/currency` as const,
+        route: 'settings/workspaces/:policyID/settings/currency',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/settings/currency` as const,
     },
     WORKSPACE_WORKFLOWS: {
-        route: 'workspace/:policyID/workflows',
-        getRoute: (policyID: string) => `workspace/${policyID}/workflows` as const,
+        route: 'settings/workspaces/:policyID/workflows',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/workflows` as const,
+    },
+    WORKSPACE_WORKFLOWS_PAYER: {
+        route: 'workspace/:policyID/settings/workflows/payer',
+        getRoute: (policyId: string) => `workspace/${policyId}/settings/workflows/payer` as const,
     },
     WORKSPACE_WORKFLOWS_APPROVER: {
-        route: 'workspace/:policyID/settings/workflows/approver',
-        getRoute: (policyId: string) => `workspace/${policyId}/settings/workflows/approver` as const,
+        route: 'settings/workspaces/:policyID/settings/workflows/approver',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/settings/workflows/approver` as const,
     },
     WORKSPACE_WORKFLOWS_AUTOREPORTING_FREQUENCY: {
-        route: 'workspace/:policyID/settings/workflows/auto-reporting-frequency',
-        getRoute: (policyID: string) => `workspace/${policyID}/settings/workflows/auto-reporting-frequency` as const,
+        route: 'settings/workspaces/:policyID/settings/workflows/auto-reporting-frequency',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/settings/workflows/auto-reporting-frequency` as const,
     },
     WORKSPACE_WORKFLOWS_AUTOREPORTING_MONTHLY_OFFSET: {
-        route: 'workspace/:policyID/settings/workflows/auto-reporting-frequency/monthly-offset',
-        getRoute: (policyID: string) => `workspace/${policyID}/settings/workflows/auto-reporting-frequency/monthly-offset` as const,
+        route: 'settings/workspaces/:policyID/settings/workflows/auto-reporting-frequency/monthly-offset',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/settings/workflows/auto-reporting-frequency/monthly-offset` as const,
     },
     WORKSPACE_CARD: {
-        route: 'workspace/:policyID/card',
-        getRoute: (policyID: string) => `workspace/${policyID}/card` as const,
+        route: 'settings/workspaces/:policyID/card',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/card` as const,
     },
     WORKSPACE_REIMBURSE: {
-        route: 'workspace/:policyID/reimburse',
-        getRoute: (policyID: string) => `workspace/${policyID}/reimburse` as const,
+        route: 'settings/workspaces/:policyID/reimburse',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/reimburse` as const,
     },
     WORKSPACE_RATE_AND_UNIT: {
-        route: 'workspace/:policyID/rateandunit',
-        getRoute: (policyID: string) => `workspace/${policyID}/rateandunit` as const,
+        route: 'settings/workspaces/:policyID/rateandunit',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/rateandunit` as const,
     },
     WORKSPACE_RATE_AND_UNIT_RATE: {
-        route: 'workspace/:policyID/rateandunit/rate',
-        getRoute: (policyID: string) => `workspace/${policyID}/rateandunit/rate` as const,
+        route: 'settings/workspaces/:policyID/rateandunit/rate',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/rateandunit/rate` as const,
     },
     WORKSPACE_RATE_AND_UNIT_UNIT: {
-        route: 'workspace/:policyID/rateandunit/unit',
-        getRoute: (policyID: string) => `workspace/${policyID}/rateandunit/unit` as const,
+        route: 'settings/workspaces/:policyID/rateandunit/unit',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/rateandunit/unit` as const,
     },
     WORKSPACE_BILLS: {
-        route: 'workspace/:policyID/bills',
-        getRoute: (policyID: string) => `workspace/${policyID}/bills` as const,
+        route: 'settings/workspaces/:policyID/bills',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/bills` as const,
     },
     WORKSPACE_INVOICES: {
-        route: 'workspace/:policyID/invoices',
-        getRoute: (policyID: string) => `workspace/${policyID}/invoices` as const,
+        route: 'settings/workspaces/:policyID/invoices',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/invoices` as const,
     },
     WORKSPACE_TRAVEL: {
-        route: 'workspace/:policyID/travel',
-        getRoute: (policyID: string) => `workspace/${policyID}/travel` as const,
+        route: 'settings/workspaces/:policyID/travel',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/travel` as const,
     },
     WORKSPACE_MEMBERS: {
-        route: 'workspace/:policyID/members',
-        getRoute: (policyID: string) => `workspace/${policyID}/members` as const,
+        route: 'settings/workspaces/:policyID/members',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/members` as const,
     },
     WORKSPACE_CATEGORIES: {
-        route: 'workspace/:policyID/categories',
-        getRoute: (policyID: string) => `workspace/${policyID}/categories` as const,
+        route: 'settings/workspaces/:policyID/categories',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/categories` as const,
     },
     WORKSPACE_CATEGORY_SETTINGS: {
-        route: 'workspace/:policyID/categories/:categoryName',
-        getRoute: (policyID: string, categoryName: string) => `workspace/${policyID}/categories/${encodeURI(categoryName)}` as const,
+        route: 'settings/workspaces/:policyID/categories/:categoryName',
+        getRoute: (policyID: string, categoryName: string) => `settings/workspaces/${policyID}/categories/${encodeURI(categoryName)}` as const,
     },
     WORKSPACE_CATEGORIES_SETTINGS: {
-        route: 'workspace/:policyID/categories/settings',
-        getRoute: (policyID: string) => `workspace/${policyID}/categories/settings` as const,
+        route: 'settings/workspaces/:policyID/categories/settings',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/categories/settings` as const,
     },
     WORKSPACE_MORE_FEATURES: {
         route: 'workspace/:policyID/more-features',
         getRoute: (policyID: string) => `workspace/${policyID}/more-features` as const,
     },
     WORKSPACE_CATEGORY_CREATE: {
-        route: 'workspace/:policyID/categories/new',
-        getRoute: (policyID: string) => `workspace/${policyID}/categories/new` as const,
+        route: 'settings/workspaces/:policyID/categories/new',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/categories/new` as const,
     },
     WORKSPACE_TAGS: {
-        route: 'workspace/:policyID/tags',
-        getRoute: (policyID: string) => `workspace/${policyID}/tags` as const,
+        route: 'settings/workspaces/:policyID/tags',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/tags` as const,
+    },
+    WORKSPACE_TAG_CREATE: {
+        route: 'settings/workspaces/:policyID/tags/new',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/tags/new` as const,
     },
     WORKSPACE_TAGS_SETTINGS: {
-        route: 'workspace/:policyID/tags/settings',
-        getRoute: (policyID: string) => `workspace/${policyID}/tags/settings` as const,
+        route: 'settings/workspaces/:policyID/tags/settings',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/tags/settings` as const,
     },
     WORKSPACE_EDIT_TAGS: {
-        route: 'workspace/:policyID/tags/edit',
-        getRoute: (policyID: string) => `workspace/${policyID}/tags/edit` as const,
+        route: 'settings/workspaces/:policyID/tags/edit',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/tags/edit` as const,
     },
     WORKSPACE_MEMBER_DETAILS: {
-        route: 'workspace/:policyID/members/:accountID',
-        getRoute: (policyID: string, accountID: number, backTo?: string) => getUrlWithBackToParam(`workspace/${policyID}/members/${accountID}`, backTo),
+        route: 'settings/workspaces/:policyID/members/:accountID',
+        getRoute: (policyID: string, accountID: number, backTo?: string) => getUrlWithBackToParam(`settings/workspaces/${policyID}/members/${accountID}`, backTo),
     },
     WORKSPACE_MEMBER_ROLE_SELECTION: {
-        route: 'workspace/:policyID/members/:accountID/role-selection',
-        getRoute: (policyID: string, accountID: number, backTo?: string) => getUrlWithBackToParam(`workspace/${policyID}/members/${accountID}/role-selection`, backTo),
+        route: 'settings/workspaces/:policyID/members/:accountID/role-selection',
+        getRoute: (policyID: string, accountID: number, backTo?: string) => getUrlWithBackToParam(`settings/workspaces/${policyID}/members/${accountID}/role-selection`, backTo),
     },
     WORKSPACE_DISTANCE_RATES: {
         route: 'workspace/:policyID/distance-rates',