Merge branch 'main' into fix/50779

Expensify · Oct 23, 2024 · 1ef6ff2 · 1ef6ff2
2 parents 186deb4 + 4f0ca94
commit 1ef6ff2
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 16 deletions.
diff --git a/docs/assets/images/cardfeeds-01.png b/docs/assets/images/cardfeeds-01.png
diff --git a/docs/assets/images/cardfeeds-02.png b/docs/assets/images/cardfeeds-02.png
diff --git a/docs/assets/images/compcard-01.png b/docs/assets/images/compcard-01.png
diff --git a/docs/assets/images/compcard-02.png b/docs/assets/images/compcard-02.png
diff --git a/docs/assets/images/compcard-03.png b/docs/assets/images/compcard-03.png
diff --git a/docs/assets/images/csv-01.png b/docs/assets/images/csv-01.png
diff --git a/docs/assets/images/csv-02.png b/docs/assets/images/csv-02.png
diff --git a/docs/assets/images/csv-03.png b/docs/assets/images/csv-03.png
diff --git a/docs/assets/images/expenses-01.png b/docs/assets/images/expenses-01.png
diff --git a/docs/assets/images/expenses-02.png b/docs/assets/images/expenses-02.png
diff --git a/docs/assets/images/expenses-03.png b/docs/assets/images/expenses-03.png
diff --git a/docs/assets/images/expenses-04.png b/docs/assets/images/expenses-04.png
diff --git a/docs/assets/images/expenses-05.png b/docs/assets/images/expenses-05.png
diff --git a/docs/assets/images/tax_tracking-01.png b/docs/assets/images/tax_tracking-01.png
diff --git a/docs/assets/images/tax_tracking-02.png b/docs/assets/images/tax_tracking-02.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -107,7 +107,7 @@
     "date-fns-tz": "^3.2.0",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
-    "expensify-common": "2.0.94",
+    "expensify-common": "2.0.100",
     "expo": "51.0.31",
     "expo-av": "14.0.7",
     "expo-image": "1.12.15",

diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -4057,7 +4057,7 @@ const translations = {
             upgradeToUnlock: 'Unlock this feature',
             completed: {
                 headline: `You've upgraded your workspace!`,
-                successMessage: ({policyName}: ReportPolicyNameParams) => `You've successfully upgraded your ${policyName} workspace to the Control plan!`,
+                successMessage: ({policyName}: ReportPolicyNameParams) => `You've successfully upgraded ${policyName} to the Control plan!`,
                 viewSubscription: 'View your subscription',
                 moreDetails: 'for more details.',
                 gotIt: 'Got it, thanks',

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -4104,7 +4104,7 @@ const translations = {
             upgradeToUnlock: 'Desbloquear esta función',
             completed: {
                 headline: 'Has mejorado tu espacio de trabajo.',
-                successMessage: ({policyName}: ReportPolicyNameParams) => `Ha mejorado correctamente su espacio de trabajo ${policyName} al plan Control.`,
+                successMessage: ({policyName}: ReportPolicyNameParams) => `Has actualizado con éxito ${policyName} al plan Control.`,
                 viewSubscription: 'Ver su suscripción',
                 moreDetails: 'para obtener más información.',
                 gotIt: 'Entendido, gracias.',

diff --git a/src/libs/Network/NetworkStore.ts b/src/libs/Network/NetworkStore.ts
@@ -104,16 +104,26 @@ function isSupportRequest(command: string): boolean {
         SIDE_EFFECT_REQUEST_COMMANDS.RECONNECT_APP,
         SIDE_EFFECT_REQUEST_COMMANDS.OPEN_REPORT,
         READ_COMMANDS.OPEN_CARD_DETAILS_PAGE,
+        READ_COMMANDS.GET_POLICY_CATEGORIES,
         READ_COMMANDS.OPEN_POLICY_CATEGORIES_PAGE,
         READ_COMMANDS.OPEN_POLICY_COMPANY_CARDS_PAGE,
+        READ_COMMANDS.OPEN_POLICY_COMPANY_CARDS_FEED,
         READ_COMMANDS.OPEN_POLICY_DISTANCE_RATES_PAGE,
+        READ_COMMANDS.OPEN_POLICY_ACCOUNTING_PAGE,
         READ_COMMANDS.OPEN_POLICY_EXPENSIFY_CARDS_PAGE,
         READ_COMMANDS.OPEN_POLICY_MORE_FEATURES_PAGE,
         READ_COMMANDS.OPEN_POLICY_PROFILE_PAGE,
         READ_COMMANDS.OPEN_POLICY_REPORT_FIELDS_PAGE,
+        READ_COMMANDS.OPEN_POLICY_INITIAL_PAGE,
+        READ_COMMANDS.OPEN_INITIAL_SETTINGS_PAGE,
         READ_COMMANDS.OPEN_POLICY_TAGS_PAGE,
-        READ_COMMANDS.OPEN_POLICY_WORKFLOWS_PAGE,
         READ_COMMANDS.OPEN_SUBSCRIPTION_PAGE,
+        READ_COMMANDS.OPEN_POLICY_TAXES_PAGE,
+        READ_COMMANDS.OPEN_POLICY_WORKFLOWS_PAGE,
+        READ_COMMANDS.OPEN_WORKSPACE_VIEW,
+        READ_COMMANDS.OPEN_PAYMENTS_PAGE,
+        READ_COMMANDS.OPEN_WORKSPACE_MEMBERS_PAGE,
+        READ_COMMANDS.SEARCH_FOR_REPORTS,
     ].some((cmd) => cmd === command);
 }
 

diff --git a/src/pages/ReimbursementAccount/BankInfo/substeps/Manual.tsx b/src/pages/ReimbursementAccount/BankInfo/substeps/Manual.tsx
@@ -33,7 +33,7 @@ function Manual({onNext}: ManualProps) {
         [BANK_INFO_STEP_KEYS.ACCOUNT_NUMBER]: reimbursementAccount?.achData?.[BANK_INFO_STEP_KEYS.ACCOUNT_NUMBER] ?? '',
     };
 
-    const shouldBeReadOnlyInput = reimbursementAccount?.achData?.setupType === CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID;
+    const hasBankAccountData = !!(reimbursementAccount?.achData?.bankAccountID ?? '');
 
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
@@ -58,8 +58,6 @@ function Manual({onNext}: ManualProps) {
         [translate],
     );
 
-    const hasBankAccountData = !!(reimbursementAccount?.achData?.bankAccountID ?? '');
-
     const handleSubmit = useReimbursementAccountStepFormSubmit({
         fieldIds: STEP_FIELDS,
         onNext,
@@ -88,7 +86,7 @@ function Manual({onNext}: ManualProps) {
                 inputMode={CONST.INPUT_MODE.NUMERIC}
                 shouldSaveDraft
                 shouldUseDefaultValue={hasBankAccountData}
-                disabled={shouldBeReadOnlyInput}
+                disabled={hasBankAccountData}
             />
             <InputWrapper
                 InputComponent={TextInput}
@@ -101,7 +99,7 @@ function Manual({onNext}: ManualProps) {
                 inputMode={CONST.INPUT_MODE.NUMERIC}
                 shouldSaveDraft
                 shouldUseDefaultValue={hasBankAccountData}
-                disabled={shouldBeReadOnlyInput}
+                disabled={hasBankAccountData}
             />
         </FormProvider>
     );

diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.tsx b/src/pages/iou/request/step/IOURequestStepParticipants.tsx
@@ -76,7 +76,7 @@ function IOURequestStepParticipants({
     }, [iouType, translate, isSplitRequest, action]);
 
     const selfDMReportID = useMemo(() => ReportUtils.findSelfDMReportID(), []);
-    const shouldDisplayTrackExpenseButton = !!selfDMReportID && action === CONST.IOU.ACTION.CREATE;
+    const shouldDisplayTrackExpenseButton = !!selfDMReportID && iouType === CONST.IOU.TYPE.CREATE;
 
     const receiptFilename = transaction?.filename;
     const receiptPath = transaction?.receipt?.source;

diff --git a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
@@ -224,14 +224,14 @@ function WorkspaceTaxesPage({
 
     const shouldShowBulkActionsButton = shouldUseNarrowLayout ? selectionMode?.isEnabled : selectedTaxesIDs.length > 0;
     const headerButtons = !shouldShowBulkActionsButton ? (
-        <View style={[styles.w100, styles.flexRow, shouldUseNarrowLayout && styles.mb3]}>
+        <View style={[styles.w100, styles.flexRow, styles.gap2, shouldUseNarrowLayout && styles.mb3]}>
             {!hasAccountingConnections && (
                 <Button
                     success
                     onPress={() => Navigation.navigate(ROUTES.WORKSPACE_TAX_CREATE.getRoute(policyID))}
                     icon={Expensicons.Plus}
                     text={translate('workspace.taxes.addRate')}
-                    style={[styles.mr3, shouldUseNarrowLayout && styles.flex1]}
+                    style={[shouldUseNarrowLayout && styles.flex1]}
                 />
             )}
             <Button