Merge branch 'main' into fix/39049-self-dm-task-shortcut

Expensify · Mar 28, 2024 · aeeb77b · aeeb77b
2 parents b68937c + 4fbd218
commit aeeb77b
Show file tree

Hide file tree

Showing 58 changed files with 1,420 additions and 840 deletions.
diff --git a/.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.js b/.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.js
@@ -5,46 +5,59 @@ const GitHubUtils = require('../../../libs/GithubUtils');
 const {promiseDoWhile} = require('../../../libs/promiseWhile');
 
 function run() {
+    console.info('[awaitStagingDeploys] run()');
+    console.info('[awaitStagingDeploys] ActionUtils', ActionUtils);
+    console.info('[awaitStagingDeploys] GitHubUtils', GitHubUtils);
+    console.info('[awaitStagingDeploys] promiseDoWhile', promiseDoWhile);
+
     const tag = ActionUtils.getStringInput('TAG', {required: false});
+    console.info('[awaitStagingDeploys] run() tag', tag);
+
     let currentStagingDeploys = [];
+
+    console.info('[awaitStagingDeploys] run()  _.throttle', _.throttle);
+
+    const throttleFunc = () =>
+        Promise.all([
+            // These are active deploys
+            GitHubUtils.octokit.actions.listWorkflowRuns({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                workflow_id: 'platformDeploy.yml',
+                event: 'push',
+                branch: tag,
+            }),
+
+            // These have the potential to become active deploys, so we need to wait for them to finish as well (unless we're looking for a specific tag)
+            // In this context, we'll refer to unresolved preDeploy workflow runs as staging deploys as well
+            !tag &&
+                GitHubUtils.octokit.actions.listWorkflowRuns({
+                    owner: CONST.GITHUB_OWNER,
+                    repo: CONST.APP_REPO,
+                    workflow_id: 'preDeploy.yml',
+                }),
+        ])
+            .then((responses) => {
+                const workflowRuns = responses[0].data.workflow_runs;
+                if (!tag) {
+                    workflowRuns.push(...responses[1].data.workflow_runs);
+                }
+                return workflowRuns;
+            })
+            .then((workflowRuns) => (currentStagingDeploys = _.filter(workflowRuns, (workflowRun) => workflowRun.status !== 'completed')))
+            .then(() =>
+                console.log(
+                    _.isEmpty(currentStagingDeploys)
+                        ? 'No current staging deploys found'
+                        : `Found ${currentStagingDeploys.length} staging deploy${currentStagingDeploys.length > 1 ? 's' : ''} still running...`,
+                ),
+            );
+    console.info('[awaitStagingDeploys] run() throttleFunc', throttleFunc);
+
     return promiseDoWhile(
         () => !_.isEmpty(currentStagingDeploys),
         _.throttle(
-            () =>
-                Promise.all([
-                    // These are active deploys
-                    GitHubUtils.octokit.actions.listWorkflowRuns({
-                        owner: CONST.GITHUB_OWNER,
-                        repo: CONST.APP_REPO,
-                        workflow_id: 'platformDeploy.yml',
-                        event: 'push',
-                        branch: tag,
-                    }),
-
-                    // These have the potential to become active deploys, so we need to wait for them to finish as well (unless we're looking for a specific tag)
-                    // In this context, we'll refer to unresolved preDeploy workflow runs as staging deploys as well
-                    !tag &&
-                        GitHubUtils.octokit.actions.listWorkflowRuns({
-                            owner: CONST.GITHUB_OWNER,
-                            repo: CONST.APP_REPO,
-                            workflow_id: 'preDeploy.yml',
-                        }),
-                ])
-                    .then((responses) => {
-                        const workflowRuns = responses[0].data.workflow_runs;
-                        if (!tag) {
-                            workflowRuns.push(...responses[1].data.workflow_runs);
-                        }
-                        return workflowRuns;
-                    })
-                    .then((workflowRuns) => (currentStagingDeploys = _.filter(workflowRuns, (workflowRun) => workflowRun.status !== 'completed')))
-                    .then(() =>
-                        console.log(
-                            _.isEmpty(currentStagingDeploys)
-                                ? 'No current staging deploys found'
-                                : `Found ${currentStagingDeploys.length} staging deploy${currentStagingDeploys.length > 1 ? 's' : ''} still running...`,
-                        ),
-                    ),
+            throttleFunc,
 
             // Poll every 60 seconds instead of every 10 seconds
             GitHubUtils.POLL_RATE * 6,

diff --git a/.github/actions/javascript/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js
@@ -14,46 +14,59 @@ const GitHubUtils = __nccwpck_require__(9296);
 const {promiseDoWhile} = __nccwpck_require__(4502);
 
 function run() {
+    console.info('[awaitStagingDeploys] run()');
+    console.info('[awaitStagingDeploys] ActionUtils', ActionUtils);
+    console.info('[awaitStagingDeploys] GitHubUtils', GitHubUtils);
+    console.info('[awaitStagingDeploys] promiseDoWhile', promiseDoWhile);
+
     const tag = ActionUtils.getStringInput('TAG', {required: false});
+    console.info('[awaitStagingDeploys] run() tag', tag);
+
     let currentStagingDeploys = [];
+
+    console.info('[awaitStagingDeploys] run()  _.throttle', _.throttle);
+
+    const throttleFunc = () =>
+        Promise.all([
+            // These are active deploys
+            GitHubUtils.octokit.actions.listWorkflowRuns({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                workflow_id: 'platformDeploy.yml',
+                event: 'push',
+                branch: tag,
+            }),
+
+            // These have the potential to become active deploys, so we need to wait for them to finish as well (unless we're looking for a specific tag)
+            // In this context, we'll refer to unresolved preDeploy workflow runs as staging deploys as well
+            !tag &&
+                GitHubUtils.octokit.actions.listWorkflowRuns({
+                    owner: CONST.GITHUB_OWNER,
+                    repo: CONST.APP_REPO,
+                    workflow_id: 'preDeploy.yml',
+                }),
+        ])
+            .then((responses) => {
+                const workflowRuns = responses[0].data.workflow_runs;
+                if (!tag) {
+                    workflowRuns.push(...responses[1].data.workflow_runs);
+                }
+                return workflowRuns;
+            })
+            .then((workflowRuns) => (currentStagingDeploys = _.filter(workflowRuns, (workflowRun) => workflowRun.status !== 'completed')))
+            .then(() =>
+                console.log(
+                    _.isEmpty(currentStagingDeploys)
+                        ? 'No current staging deploys found'
+                        : `Found ${currentStagingDeploys.length} staging deploy${currentStagingDeploys.length > 1 ? 's' : ''} still running...`,
+                ),
+            );
+    console.info('[awaitStagingDeploys] run() throttleFunc', throttleFunc);
+
     return promiseDoWhile(
         () => !_.isEmpty(currentStagingDeploys),
         _.throttle(
-            () =>
-                Promise.all([
-                    // These are active deploys
-                    GitHubUtils.octokit.actions.listWorkflowRuns({
-                        owner: CONST.GITHUB_OWNER,
-                        repo: CONST.APP_REPO,
-                        workflow_id: 'platformDeploy.yml',
-                        event: 'push',
-                        branch: tag,
-                    }),
-
-                    // These have the potential to become active deploys, so we need to wait for them to finish as well (unless we're looking for a specific tag)
-                    // In this context, we'll refer to unresolved preDeploy workflow runs as staging deploys as well
-                    !tag &&
-                        GitHubUtils.octokit.actions.listWorkflowRuns({
-                            owner: CONST.GITHUB_OWNER,
-                            repo: CONST.APP_REPO,
-                            workflow_id: 'preDeploy.yml',
-                        }),
-                ])
-                    .then((responses) => {
-                        const workflowRuns = responses[0].data.workflow_runs;
-                        if (!tag) {
-                            workflowRuns.push(...responses[1].data.workflow_runs);
-                        }
-                        return workflowRuns;
-                    })
-                    .then((workflowRuns) => (currentStagingDeploys = _.filter(workflowRuns, (workflowRun) => workflowRun.status !== 'completed')))
-                    .then(() =>
-                        console.log(
-                            _.isEmpty(currentStagingDeploys)
-                                ? 'No current staging deploys found'
-                                : `Found ${currentStagingDeploys.length} staging deploy${currentStagingDeploys.length > 1 ? 's' : ''} still running...`,
-                        ),
-                    ),
+            throttleFunc,
 
             // Poll every 60 seconds instead of every 10 seconds
             GitHubUtils.POLL_RATE * 6,
@@ -151,12 +164,16 @@ module.exports = CONST;
  * @returns {Promise}
  */
 function promiseWhile(condition, action) {
+    console.info('[promiseWhile] promiseWhile()');
+
     return new Promise((resolve, reject) => {
         const loop = function () {
             if (!condition()) {
                 resolve();
             } else {
-                Promise.resolve(action()).then(loop).catch(reject);
+                const actionResult = action();
+                console.info('[promiseWhile] promiseWhile() actionResult', actionResult);
+                Promise.resolve(actionResult).then(loop).catch(reject);
             }
         };
         loop();
@@ -171,8 +188,13 @@ function promiseWhile(condition, action) {
  * @returns {Promise}
  */
 function promiseDoWhile(condition, action) {
+    console.info('[promiseWhile] promiseDoWhile()');
+
     return new Promise((resolve, reject) => {
-        action()
+        console.info('[promiseWhile] promiseDoWhile() condition', condition);
+        const actionResult = action();
+        console.info('[promiseWhile] promiseDoWhile() actionResult', actionResult);
+        actionResult
             .then(() => promiseWhile(condition, action))
             .then(() => resolve())
             .catch(reject);

diff --git a/.github/libs/promiseWhile.js b/.github/libs/promiseWhile.js
@@ -6,12 +6,16 @@
  * @returns {Promise}
  */
 function promiseWhile(condition, action) {
+    console.info('[promiseWhile] promiseWhile()');
+
     return new Promise((resolve, reject) => {
         const loop = function () {
             if (!condition()) {
                 resolve();
             } else {
-                Promise.resolve(action()).then(loop).catch(reject);
+                const actionResult = action();
+                console.info('[promiseWhile] promiseWhile() actionResult', actionResult);
+                Promise.resolve(actionResult).then(loop).catch(reject);
             }
         };
         loop();
@@ -26,8 +30,13 @@ function promiseWhile(condition, action) {
  * @returns {Promise}
  */
 function promiseDoWhile(condition, action) {
+    console.info('[promiseWhile] promiseDoWhile()');
+
     return new Promise((resolve, reject) => {
-        action()
+        console.info('[promiseWhile] promiseDoWhile() condition', condition);
+        const actionResult = action();
+        console.info('[promiseWhile] promiseDoWhile() actionResult', actionResult);
+        actionResult
             .then(() => promiseWhile(condition, action))
             .then(() => resolve())
             .catch(reject);

diff --git a/docs/articles/new-expensify/bank-accounts/Connect-a-Bank-Account.md b/docs/articles/new-expensify/bank-accounts/Connect-a-Bank-Account.md
@@ -94,6 +94,14 @@ If you need to enable direct debits from your verified bank account, your bank w
 - The ACH CompanyIDs (1270239450, 4270239450 and 2270239450) 
 - The ACH Originator Name (Expensify)
 
+If using Expensify to process Bill payments, you'll also need to whitelist the ACH IDs from our partner [Stripe](https://support.stripe.com/questions/ach-direct-debit-company-ids-for-stripe?):
+- The ACH CompanyIDs (1800948598 and 4270465600)
+- The ACH Originator Name (Stripe Payments company)
+
+If using Expensify to process international reimbursements from your USD bank account, you'll also need to whitelist the ACH IDs from our partner CorPay:
+- The ACH CompanyIDs (1522304924 and 2522304924)
+- The ACH Originator Name (Cambridge Global Payments)
+
 To request to unlock the bank account, go to **Settings > Workspaces > _Workspace Name_ > Bank account** and click **Fix.** This sends a request to our support team to review why the bank account was locked, who will send you a message to confirm that.
 
 Unlocking a bank account can take 4-5 business days to process, to allow for ACH processing time and clawback periods.

diff --git a/docs/redirects.csv b/docs/redirects.csv
@@ -67,3 +67,6 @@ https://help.expensify.com/articles/expensify-classic/settings/Merge-Accounts,ht
 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
 https://help.expensify.com/articles/expensify-classic/settings/Copilot,https://help.expensify.com/expensify-classic/hubs/copilots-and-delegates/
+https://help.expensify.com/articles/expensify-classic/workspace-and-domain-settings/Budgets,https://help.expensify.com/articles/expensify-classic/workspaces/Budgets
+https://help.expensify.com/articles/expensify-classic/workspace-and-domain-settings/Reimbursement,https://help.expensify.com/articles/expensify-classic/send-payments/Reimbursing-Reports
+https://help.expensify.com/articles/expensify-classic/workspace-and-domain-settings/Tags,https://help.expensify.com/articles/expensify-classic/workspaces/Tags
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1363,7 +1363,7 @@ PODS:
   - RNGoogleSignin (10.0.1):
     - GoogleSignIn (~> 7.0)
     - React-Core
-  - RNLiveMarkdown (0.1.5):
+  - RNLiveMarkdown (0.1.33):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
@@ -1904,7 +1904,7 @@ SPEC CHECKSUMS:
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 25b969a1ffc806b9f9ad2e170d4a3b049c6af85e
   RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
-  RNLiveMarkdown: 35eeecf7e57eb26fdc279d5d4815982a9a9f7beb
+  RNLiveMarkdown: aaf75630fb2129db43fb5a873d33125e7173f3a0
   RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
   rnmapbox-maps: fcf7f1cbdc8bd7569c267d07284e8a5c7bee06ed
   RNPermissions: 9b086c8f05b2e2faa587fdc31f4c5ab4509728aa

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
   },
   "dependencies": {
     "@dotlottie/react-player": "^1.6.3",
-    "@expensify/react-native-live-markdown": "0.1.5",
+    "@expensify/react-native-live-markdown": "0.1.33",
     "@expo/metro-runtime": "~3.1.1",
     "@formatjs/intl-datetimeformat": "^6.10.0",
     "@formatjs/intl-listformat": "^7.2.2",

diff --git a/src/App.tsx b/src/App.tsx
@@ -22,6 +22,7 @@ import ScrollOffsetContextProvider from './components/ScrollOffsetContextProvide
 import ThemeIllustrationsProvider from './components/ThemeIllustrationsProvider';
 import ThemeProvider from './components/ThemeProvider';
 import ThemeStylesProvider from './components/ThemeStylesProvider';
+import {FullScreenContextProvider} from './components/VideoPlayerContexts/FullScreenContext';
 import {PlaybackContextProvider} from './components/VideoPlayerContexts/PlaybackContext';
 import {VideoPopoverMenuContextProvider} from './components/VideoPlayerContexts/VideoPopoverMenuContext';
 import {VolumeContextProvider} from './components/VideoPlayerContexts/VolumeContext';
@@ -78,6 +79,7 @@ function App({url}: AppProps) {
                         ActiveElementRoleProvider,
                         ActiveWorkspaceContextProvider,
                         PlaybackContextProvider,
+                        FullScreenContextProvider,
                         VolumeContextProvider,
                         VideoPopoverMenuContextProvider,
                     ]}

diff --git a/src/CONST.ts b/src/CONST.ts
@@ -4153,6 +4153,7 @@ const CONST = {
         },
     },
 
+    MAX_TAX_RATE_INTEGER_PLACES: 4,
     MAX_TAX_RATE_DECIMAL_PLACES: 4,
 } as const;
 

diff --git a/src/components/AmountTextInput.tsx b/src/components/AmountTextInput.tsx
@@ -57,6 +57,10 @@ function AmountTextInput(
             role={CONST.ROLE.PRESENTATION}
             onKeyPress={onKeyPress as (event: NativeSyntheticEvent<TextInputKeyPressEventData>) => void}
             touchableInputWrapperStyle={touchableInputWrapperStyle}
+            // On iPad, even if the soft keyboard is hidden, the keyboard suggestion is still shown.
+            // Setting both autoCorrect and spellCheck to false will hide the suggestion.
+            autoCorrect={false}
+            spellCheck={false}
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         />

diff --git a/src/components/Attachments/AttachmentCarousel/CarouselItem.tsx b/src/components/Attachments/AttachmentCarousel/CarouselItem.tsx
@@ -82,6 +82,7 @@ function CarouselItem({item, onPress, isFocused, isModalHovered}: CarouselItemPr
                     isHovered={isModalHovered}
                     isFocused={isFocused}
                     duration={item.duration}
+                    isUsedInCarousel
                 />
             </View>
-Original file line number
+Diff line change
@@ Expand Up / @@ -4153,6 +4153,7 @@ const CONST = { @@
             },
         },
+        MAX_TAX_RATE_INTEGER_PLACES: 4,
         MAX_TAX_RATE_DECIMAL_PLACES: 4,
     } as const;
@@ Expand Down @@