Merge branch 'main' into fix/31992-migrate-iou-currency-selection-to-ts

Expensify · Apr 12, 2024 · 5645f06 · 5645f06
2 parents c055d06 + b59ae94
commit 5645f06
Show file tree

Hide file tree

Showing 130 changed files with 1,959 additions and 1,618 deletions.
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 1001046200
-        versionName "1.4.62-0"
+        versionCode 1001046204
+        versionName "1.4.62-4"
         // 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/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