feat: resolve conflicts

.eslintrc.js

@@ -116,7 +116,7 @@ module.exports = {
                     },
                     {
                         selector: ['parameter', 'method'],
-                        format: ['camelCase'],
+                        format: ['camelCase', 'PascalCase'],
                     },
                 ],
                 '@typescript-eslint/ban-types': [

.github/actions/javascript/bumpVersion/index.js

@@ -298,9 +298,6 @@ function getPreviousVersion(currentVersion, level) {
         if (patch === 0) {
             return getPreviousVersion(currentVersion, SEMANTIC_VERSION_LEVELS.MINOR);
         }
-        if (major === 1 && minor === 3 && patch === 83) {
-            return getVersionStringFromNumber(major, minor, patch - 2, 0);
-        }
         return getVersionStringFromNumber(major, minor, patch - 1, 0);
     }
 

.github/actions/javascript/createOrUpdateStagingDeploy/index.js

@@ -998,9 +998,6 @@ function getPreviousVersion(currentVersion, level) {
         if (patch === 0) {
             return getPreviousVersion(currentVersion, SEMANTIC_VERSION_LEVELS.MINOR);
         }
-        if (major === 1 && minor === 3 && patch === 83) {
-            return getVersionStringFromNumber(major, minor, patch - 2, 0);
-        }
         return getVersionStringFromNumber(major, minor, patch - 1, 0);
     }
 

.github/actions/javascript/getDeployPullRequestList/index.js

@@ -961,9 +961,6 @@ function getPreviousVersion(currentVersion, level) {
         if (patch === 0) {
             return getPreviousVersion(currentVersion, SEMANTIC_VERSION_LEVELS.MINOR);
         }
-        if (major === 1 && minor === 3 && patch === 83) {
-            return getVersionStringFromNumber(major, minor, patch - 2, 0);
-        }
         return getVersionStringFromNumber(major, minor, patch - 1, 0);
     }
 

.github/actions/javascript/getPreviousVersion/index.js

@@ -148,9 +148,6 @@ function getPreviousVersion(currentVersion, level) {
         if (patch === 0) {
             return getPreviousVersion(currentVersion, SEMANTIC_VERSION_LEVELS.MINOR);
         }
-        if (major === 1 && minor === 3 && patch === 83) {
-            return getVersionStringFromNumber(major, minor, patch - 2, 0);
-        }
         return getVersionStringFromNumber(major, minor, patch - 1, 0);
     }
 

.github/libs/versionUpdater.js

@@ -118,9 +118,6 @@ function getPreviousVersion(currentVersion, level) {
         if (patch === 0) {
             return getPreviousVersion(currentVersion, SEMANTIC_VERSION_LEVELS.MINOR);
         }
-        if (major === 1 && minor === 3 && patch === 83) {
-            return getVersionStringFromNumber(major, minor, patch - 2, 0);
-        }
         return getVersionStringFromNumber(major, minor, patch - 1, 0);
     }
 

.github/workflows/platformDeploy.yml

@@ -104,6 +104,13 @@ jobs:
           name: android-sourcemap
           path: android/app/build/generated/sourcemaps/react/release/*.map
 
+      - name: Upload Android version to GitHub artifacts
+        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: app-production-release.aab
+          path: android/app/build/outputs/bundle/productionRelease/app-production-release.aab
+
       - name: Upload Android version to Browser Stack
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: curl -u "$BROWSERSTACK" -X POST "https://api-cloud.browserstack.com/app-live/upload" -F "file=@./android/app/build/outputs/bundle/productionRelease/app-production-release.aab"
@@ -238,6 +245,13 @@ jobs:
           name: ios-sourcemap
           path: main.jsbundle.map
 
+      - name: Upload iOS version to GitHub artifacts
+        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: New Expensify.ipa
+          path: /Users/runner/work/App/App/New Expensify.ipa
+
       - name: Upload iOS version to Browser Stack
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: curl -u "$BROWSERSTACK" -X POST "https://api-cloud.browserstack.com/app-live/upload" -F "file=@/Users/runner/work/App/App/New Expensify.ipa"

.well-known/apple-app-site-association

@@ -79,6 +79,10 @@
                     {
                         "/": "/search/*",
                         "comment": "Search"
+                    },
+                    {
+                        "/": "/money2020/*",
+                        "comment": "Money 2020"
                     }
                 ]
             }

__mocks__/react-native.js

@@ -28,6 +28,7 @@ jest.doMock('react-native', () => {
                 BootSplash: {
                     getVisibilityStatus: jest.fn(),
                     hide: jest.fn(),
+                    logoSizeRatio: 1,
                     navigationBarHeight: 0,
                 },
                 StartupTimer: {stop: jest.fn()},

android/app/build.gradle

@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001038400
-        versionName "1.3.84-0"
+        versionCode 1001038502
+        versionName "1.3.85-2"
     }
 
     flavorDimensions "default"

android/app/src/main/AndroidManifest.xml

@@ -70,6 +70,7 @@
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/request"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/new"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/search"/>
+                <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/money2020"/>
 
                 <!-- Staging URLs -->
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/r"/>
@@ -87,6 +88,7 @@
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/request"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/new"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/search"/>
+                <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/money2020"/>
             </intent-filter>
         </activity>
 

android/app/src/main/java/com/expensify/chat/bootsplash/BootSplashDialog.java

@@ -6,6 +6,7 @@
 import android.view.Window;
 import android.view.WindowManager.LayoutParams;
 import androidx.annotation.NonNull;
+import com.expensify.chat.R;
 
 public class BootSplashDialog extends Dialog {
 
@@ -26,6 +27,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
     if (window != null) {
       window.setLayout(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+
+      if (BootSplashModule.isSamsungOneUI4()) {
+        window.setBackgroundDrawableResource(R.drawable.bootsplash_samsung_oneui_4);
+      }
     }
 
     super.onCreate(savedInstanceState);

android/app/src/main/java/com/expensify/chat/bootsplash/BootSplashModule.java

@@ -23,6 +23,7 @@
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.PixelUtil;
+import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Timer;
@@ -47,6 +48,19 @@ public String getName() {
     return NAME;
   }
 
+  // From https://stackoverflow.com/a/61062773
+  public static boolean isSamsungOneUI4() {
+    String name = "SEM_PLATFORM_INT";
+
+    try {
+      Field field = Build.VERSION.class.getDeclaredField(name);
+      int version = (field.getInt(null) - 90000) / 10000;
+      return version == 4;
+    } catch (Exception ignored) {
+      return false;
+    }
+  }
+
   @Override
   public Map<String, Object> getConstants() {
     final HashMap<String, Object> constants = new HashMap<>();
@@ -61,6 +75,7 @@ public Map<String, Object> getConstants() {
             ? Math.round(PixelUtil.toDIPFromPixel(resources.getDimensionPixelSize(heightResId)))
             : 0;
 
+    constants.put("logoSizeRatio", isSamsungOneUI4() ? 0.5 : 1);
     constants.put("navigationBarHeight", height);
     return constants;
   }

android/app/src/main/res/drawable/bootsplash_samsung_oneui_4.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:opacity="opaque">
+    <item android:gravity="fill">
+        <color android:color="?attr/windowSplashScreenBackground" />
+    </item>
+
+    <!-- There's an issue with logo size on Samsung OneUI v4
+         We need to render it 2 times smaller (288 / 2 = 144) -->
+    <item
+        tools:ignore="UnusedAttribute"
+        android:drawable="?windowSplashScreenAnimatedIcon"
+        android:gravity="center"
+        android:width="144dp"
+        android:height="144dp" />
+</layer-list>

android/app/src/main/res/values/styles.xml

@@ -72,7 +72,7 @@
 
     <style name="BootTheme" parent="Theme.SplashScreen">
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="windowSplashScreenAnimatedIcon">@mipmap/bootsplash_logo</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/bootsplash_logo</item>
         <item name="windowSplashScreenBackground">@color/bootsplash_background</item>
     </style>
 

docs/Gemfile.lock

@@ -256,6 +256,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-23
   x86_64-darwin-20
   x86_64-darwin-21
 

docs/_sass/_main.scss

@@ -371,9 +371,26 @@ button {
             flex-wrap: wrap;
         }
 
+        h1 {
+            font-size: 1.5em;
+            padding: 20px 0 12px 0;
+        }
+
+        h2 {
+            font-size: 1.125em;
+            font-weight: 500;
+            font-family: "ExpensifyNewKansas", "Helvetica Neue", "Helvetica", Arial, sans-serif;
+        }
+
+        h3 {
+            font-size: 1em;
+            font-family: "ExpensifyNeue", "Helvetica Neue", "Helvetica", Arial, sans-serif;
+        }
+
         h2,
         h3 {
-            font-family: "ExpensifyNewKansas", "Helvetica Neue", "Helvetica", Arial, sans-serif;
+            margin: 0;
+            padding: 12px 0 12px 0;
         }
 
         blockquote {

docs/articles/expensify-classic/bank-accounts-and-credit-cards/business-bank-accounts/Business-Bank-Accounts-AUD.md

@@ -1,5 +1,51 @@
 ---
-title: Business Bank Accounts - AUD
-description: Business Bank Accounts - AUD
+title: Add a Business Bank Account
+description: This article provides insight on setting up and using an Australian Business Bank account in Expensify. 
 ---
-## Resource Coming Soon!
+
+# How to add an Australian business bank account (for admins)
+A withdrawal account is the business bank account that you want to use to pay your employee reimbursements. 
+
+_Your policy currency must be set to AUD and reimbursement setting set to Indirect to continue. If your main policy is used for something other than AUD, then you will need to create a new one and set that policy to AUD._ 
+
+To set this up, you’ll run through the following steps:
+
+1. Go to **Settings > Your Account > Payments** and click **Add Verified Bank Account**
+![Click the Verified Bank Account button in the bottom right-hand corner of the screen](https://help.expensify.com/assets/images/add-vba-australian-account.png){:width="100%"}
+
+2. Enter the required information to connect to your business bank account. If you don't know your Bank User ID/Direct Entry ID/APCA Number, please contact your bank and they will be able to provide this.
+![Enter your information in each of the required fields](https://help.expensify.com/assets/images/add-vba-australian-account-modal.png){:width="100%"}
+
+3. Link the withdrawal account to your policy by heading to **Settings > Policies > Group > [Policy name] > Reimbursement**
+4. Click **Direct reimbursement**
+5. Set the default withdrawal account for processing reimbursements 
+6. Tell your employees to add their deposit accounts and start reimbursing. 
+
+# How to delete a bank account
+If you’re no longer using a bank account you previously connected to Expensify, you can delete it by doing the following:
+
+1. Navigate to Settings > Accounts > Payments 
+2. Click **Delete** 
+![Click the Delete button](https://help.expensify.com/assets/images/delete-australian-bank-account.png){:width="100%"}
+
+You can complete this process either via the web app (on a computer), or via the mobile app.
+
+# Deep Dive
+## Bank-specific batch payment support
+
+If you are new to using Batch Payments in Australia, to reimburse your staff or process payroll, you may want to check out these bank-specific instructions for how to upload your .aba file:
+
+- ANZ Bank - [Import a file for payroll payments](https://www.anz.com.au/support/internet-banking/pay-transfer-business/payroll/import-file/)
+- CommBank - [Importing and using
 Direct Entry (EFT) files](https://www.commbank.com.au/business/pds/003-279-importing-a-de-file.pdf)
+- Westpac - [Importing Payment Files](https://www.westpac.com.au/business-banking/online-banking/support-faqs/import-files/)
+- NAB - [Quick Reference Guide - Upload a payment file](https://www.nab.com.au/business/online-banking/nab-connect/help)
+- Bendigo Bank - [Bulk payments user guide](https://www.bendigobank.com.au/globalassets/documents/business/bulk-payments-user-guide.pdf)
+- Bank of Queensland - [Payments file upload facility FAQ](https://www.boq.com.au/help-and-support/online-banking/ob-faqs-and-support/faq-pfuf)
+
+**Note:** Some financial institutions require an ABA file to include a *self-balancing transaction*. If you are unsure, please check with your bank to ensure whether to tick this option or not, as selecting an incorrect option will result in the ABA file not working with your bank's internet banking platform.
+
+## Enable Global Reimbursement
+
+If you have employees in other countries outside of Australia, you can now reimburse them directly using Global Reimbursement. 
+
+To do this, you’ll first need to delete any existing Australian business bank accounts. Then, you’ll want to follow the instructions to enable Global Reimbursements

docs/articles/expensify-classic/bank-accounts-and-credit-cards/business-bank-accounts/Add-a-Deposit-Account-(AUD).md → docs/articles/expensify-classic/bank-accounts-and-credit-cards/deposit-accounts/Deposit-Accounts-AUD.md

@@ -1,20 +1,20 @@
 ---
-title: Add a Deposit Account (AUD)
+title: Deposit Accounts (AUD)
 description: Expensify allows you to add a personal bank account to receive reimbursements for your expenses. We never take money out of this account — it is only a place for us to deposit funds from your employer. This article covers deposit accounts for Australian banks.
 ---
 
 ## How-to add your Australian personal deposit account information
 1. Confirm with your Policy Admin that they’ve set up Global Reimbursment
 2. Set your default policy (by selecting the correct policy after clicking on your profile picture) before adding your deposit account.
-3. Go to *Settings > Account > Payments* and click *Add Deposit-Only Bank Account*
+3. Go to **Settings > Account > Payments** and click **Add Deposit-Only Bank Account**
 ![Click the Add Deposit-Only Bank Account button](https://help.expensify.com/assets/images/add-australian-deposit-only-account.png){:width="100%"}
 
 4. Enter your BSB, account number and name. If your screen looks different than the image below, that means your company hasn't enabled reimbursements through Expensify. Please contact your administrator and ask them to enable reimbursements. 
 
 ![Fill in the required fields](https://help.expensify.com/assets/images/add-australian-deposit-only-account-modal.png){:width="100%"}
 
 # How-to delete a bank account
-Bank accounts are easy to delete! Simply click the red “Delete” button in the bank account under *Settings > Account > Payments*.
+Bank accounts are easy to delete! Simply click the red **Delete** button in the bank account under **Settings > Account > Payments**.
 
 ![Click the Delete button](https://help.expensify.com/assets/images/delete-australian-bank-account.png){:width="100%"}