Merge branch 'main' into jsys/upgrade-pager-view

Author: MrRefactor

android/app/build.gradle

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009011205
-        versionName "9.1.12-5"
+        versionCode 1009011305
+        versionName "9.1.13-5"
         // 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"

android/app/src/main/java/com/expensify/chat/navbar/NavBarManagerModule.kt

@@ -1,10 +1,12 @@
 package com.expensify.chat.navbar
 
+import android.content.res.Resources
 import androidx.core.view.WindowInsetsControllerCompat
+import com.expensify.chat.R
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.bridge.UiThreadUtil
 
 class NavBarManagerModule(
     private val mReactContext: ReactApplicationContext,
@@ -24,4 +26,18 @@ class NavBarManagerModule(
             }
         }
     }
+
+    @ReactMethod
+    fun getType(): String {
+        val resources = mReactContext.resources
+        val resourceId = resources.getIdentifier("config_navBarInteractionMode", "integer", "android");
+        if (resourceId > 0) {
+            val navBarInteractionMode = resources.getInteger(resourceId)
+            when (navBarInteractionMode) {
+                0, 1 -> return "soft-keys"
+                2 -> return "gesture-bar"
+            }
+        }
+        return "soft-keys";
+    }
 }

assets/images/product-illustrations/emptystate__receiptfairy.svg

@@ -68,7 +68,7 @@ Browsers use the name prop to autofill information into the input. Here's a [ref
 
 ```jsx
 <InputWrapper
-    InputComponent={TextInput} 
+    InputComponent={TextInput}
     name="fname"
 />
 ```
@@ -118,7 +118,7 @@ Once a user has “touched” an input, i.e. blurred the input, we will also sta
 
 All form fields will additionally be validated when the form is submitted. Although we are validating on blur this additional step is necessary to cover edge cases where forms are auto-filled or when a form is submitted by pressing enter (i.e. there will be only a ‘submit’ event and no ‘blur’ event to hook into).
 
-The Form component takes care of validation internally and the only requirement is that we pass a validate callback prop. The validate callback takes in the input values as argument and should return an object with shape `{[inputID]: errorMessage}`. 
+The Form component takes care of validation internally and the only requirement is that we pass a validate callback prop. The validate callback takes in the input values as argument and should return an object with shape `{[inputID]: errorMessage}`.
 
 Here's an example for a form that has two inputs, `routingNumber` and `accountNumber`:
 
@@ -332,10 +332,10 @@ An example of this can be seen in the [ACHContractStep](https://github.com/Expen
 ### Safe Area Padding
 
 Any `FormProvider.tsx` that has a button at the bottom. If the `<FormProvider>` is inside a `<ScreenWrapper>`, the bottom safe area inset is handled automatically (`includeSafeAreaPaddingBottom` needs to be set to `true`, but its the default).
-If you have custom requirements and can't use `<ScreenWrapper includeSafeAreaPaddingBottom={true}>`, you can use the `useStyledSafeAreaInsets()` hook:
+If you have custom requirements and can't use `<ScreenWrapper includeSafeAreaPaddingBottom={true}>`, you can use the `useSafeAreaPaddings()` hook:
 
 ```jsx
-const { paddingTop, paddingBottom, safeAreaPaddingBottomStyle } = useStyledSafeAreaInsets();
+const { paddingTop, paddingBottom, safeAreaPaddingBottomStyle } = useSafeAreaPaddings();
 
 <View styles={[safeAreaPaddingBottomStyle, styles.pb5]}>
     <FormProvider>

contributingGuides/FORMS.md

@@ -1,25 +1,28 @@
 ---
-title: Enable Australian reimbursements
-description: Reimburse AUD expenses using ABA files
+title: Enable Australian Reimbursements
+description: Learn how to reimburse AUD expenses using ABA files in Expensify.
+keywords: [Expensify Classic, AUD, reimbursement, ABA file, indirect reimbursement, Expensify, Australian payments]
 ---
 <div id="expensify-classic" markdown="1">
+  
+You can reimburse AUD expenses using **indirect reimbursements**. This allows Australian employees to submit their bank account details in Expensify, which are then provided to you for payment via `.aba` file. A **Workspace Admin** can upload the `.aba` file to the bank to process payments.
 
-{% include info.html %}
-AUD bank accounts do not rely on direct deposit or ACH.
+**Note:** AUD bank accounts do not use direct deposit or ACH.
 
-For businesses that will also be reimbursing employees in other countries outside of Australia, you’ll need to set up Global Reimbursement instead.
-{% include end-info.html %}
+If you'd like an option for direct international payments, consider setting up [global reimbursements](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Global-Reimbursements) instead. 
 
-You can reimburse AUD expenses using indirect reimbursements. This allows your Australian employees to submit their personal bank account information to Expensify where it will be provided to you for payment via an .aba file. A Workspace Admin can then upload the .aba file to the bank to have payments issued. 
+---
 
-To enable ABA payments,
+# Setting Up ABA Payments
 
-1. Hover over **Settings**, then click **Workspaces**. 
-2. Select the desired workspace. 
-3. Click the **Reports** tab on the left. 
-4. Click the Report Currency dropdown and select **AUD A$**. 
-5. Click the **Reimbursement** tab on the left. 
-6. Select **Indirect** as the Reimbursement type.
+1. Go to **Settings > Workspaces**.
+2. Select the workspace you want to configure.
+3. Click the **Reports** tab.
+4. In the **Report Currency** dropdown, select **AUD A$**.
+5. Click the **Reimbursement** tab.
+6. Set **Reimbursement Type** to **Indirect**.
 7. Enable the toggle.
 
+Once enabled, employees can submit expenses in AUD, and you can process reimbursements via ABA files.
+
 </div>