Merge branch 'main' into migrate-search-page-to-chat-finder-page

Expensify · Apr 15, 2024 · 223099a · 223099a
2 parents 46b6a09 + 447f0f7
commit 223099a
Show file tree

Hide file tree

Showing 212 changed files with 5,045 additions and 2,599 deletions.
diff --git a/.github/actions/javascript/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js
@@ -12738,6 +12738,10 @@ function promiseWhile(condition, action) {
             else {
                 const actionResult = action?.();
                 console.info('[promiseWhile] promiseWhile() actionResult', actionResult);
+                if (!actionResult) {
+                    resolve();
+                    return;
+                }
                 Promise.resolve(actionResult).then(loop).catch(reject);
             }
         };

diff --git a/.github/libs/promiseWhile.ts b/.github/libs/promiseWhile.ts
@@ -13,6 +13,12 @@ function promiseWhile(condition: () => boolean, action: (() => Promise<void>) |
             } else {
                 const actionResult = action?.();
                 console.info('[promiseWhile] promiseWhile() actionResult', actionResult);
+
+                if (!actionResult) {
+                    resolve();
+                    return;
+                }
+
                 Promise.resolve(actionResult).then(loop).catch(reject);
             }
         };

diff --git a/__mocks__/react-native-onyx.ts b/__mocks__/react-native-onyx.ts
@@ -5,7 +5,7 @@
 
 /* eslint-disable rulesdir/prefer-onyx-connect-in-libs */
 import type {ConnectOptions, OnyxKey} from 'react-native-onyx';
-import Onyx, {withOnyx} from 'react-native-onyx';
+import Onyx, {useOnyx, withOnyx} from 'react-native-onyx';
 
 let connectCallbackDelay = 0;
 function addDelayToConnectCallback(delay: number) {
@@ -40,4 +40,4 @@ const reactNativeOnyxMock: ReactNativeOnyxMock = {
 };
 
 export default reactNativeOnyxMock;
-export {withOnyx};
+export {withOnyx, useOnyx};
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 1001046203
-        versionName "1.4.62-3"
+        versionCode 1001046206
+        versionName "1.4.62-6"
         // 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"

diff --git a/assets/images/new-expensify-adhoc.svg b/assets/images/new-expensify-adhoc.svg
diff --git a/assets/images/new-expensify-dev.svg b/assets/images/new-expensify-dev.svg
diff --git a/assets/images/new-expensify-stg.svg b/assets/images/new-expensify-stg.svg
diff --git a/assets/images/simple-illustrations/simple-illustration__lightbulb.svg b/assets/images/simple-illustrations/simple-illustration__lightbulb.svg
diff --git a/config/webpack/webpack.common.ts b/config/webpack/webpack.common.ts
@@ -30,7 +30,7 @@ const includeModules = [
 ].join('|');
 
 const environmentToLogoSuffixMap: Record<string, string> = {
-    production: '',
+    production: '-dark',
     staging: '-stg',
     dev: '-dev',
     adhoc: '-adhoc',

diff --git a/...nk-accounts/Business-Bank-Accounts-AUD.md → ...nd-payments/Business-Bank-Accounts-AUD.md b/...nk-accounts/Business-Bank-Accounts-AUD.md → ...nd-payments/Business-Bank-Accounts-AUD.md