Merge main

.github/workflows/e2ePerformanceTests.yml

@@ -126,16 +126,24 @@ jobs:
 
       - name: Download baseline APK
         uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b
+        id: downloadBaselineAPK
         with:
           name: baseline-apk-${{ needs.buildBaseline.outputs.VERSION }}
           path: zip
 
+      # The downloaded artifact will be a file named "app-e2eRelease.apk" so we have to rename it
+      - name: Rename baseline APK
+        run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-baseline.apk"
+
       - name: Download delta APK
         uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b
         with:
           name: delta-apk-${{ needs.buildDelta.outputs.DELTA_REF }}
           path: zip
 
+      - name: Rename delta APK
+        run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease-compare.apk"
+
       - name: Copy e2e code into zip folder
         run: cp -r tests/e2e zip
 
@@ -163,19 +171,19 @@ jobs:
           test_spec_file: tests/e2e/TestSpec.yml
           test_spec_type: APPIUM_NODE_TEST_SPEC
           remote_src: false
-          file_artifacts: CustomerArtifacts.zip
+          file_artifacts: Customer Artifacts.zip
           cleanup: true
 
       - name: Unzip AWS Device Farm results
         if: ${{ always() }}
-        run: unzip CustomerArtifacts.zip
+        run: unzip "Customer Artifacts.zip"
 
       - name: Print AWS Device Farm run results
         if: ${{ always() }}
         run: cat "./Host_Machine_Files/\$WORKING_DIRECTORY/output.md"
 
       - name: Print AWS Device Farm verbose run results
-        if: ${{ always() && fromJSON(runner.debug) }}
+        if: ${{ always() && runner.debug != null && fromJSON(runner.debug) }}
         run: cat "./Host_Machine_Files/\$WORKING_DIRECTORY/debug.log"
 
       - name: Check if test failed, if so post the results and add the DeployBlocker label

.github/workflows/lint.yml

@@ -22,3 +22,12 @@ jobs:
 
       - name: Lint shell scripts with ShellCheck
         run: npm run shellcheck
+
+      - name: Verify there's no Prettier diff
+        run: |
+          npm run prettier -- --loglevel silent
+          if ! git diff --name-only --exit-code; then
+            # shellcheck disable=SC2016
+            echo 'Error: Prettier diff detected! Please run `npm run prettier` and commit the changes.'
+            exit 1
+          fi

android/app/build.gradle

@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001031401
-        versionName "1.3.14-1"
+        versionCode 1001031500
+        versionName "1.3.15-0"
     }
 
     splits {

android/app/src/main/java/com/expensify/chat/MainApplication.java

@@ -37,6 +37,7 @@ protected List<ReactPackage> getPackages() {
           // packages.add(new MyReactNativePackage());
           packages.add(new BootSplashPackage());
           packages.add(new ExpensifyAppPackage());
+          packages.add(new RNTextInputResetPackage());
 
           return packages;
         }

android/app/src/main/java/com/expensify/chat/RNTextInputResetModule.java

@@ -0,0 +1,46 @@
+package com.expensify.chat;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.UIBlock;
+import com.facebook.react.uimanager.NativeViewHierarchyManager;
+import android.content.Context;
+import android.view.View;
+import android.widget.TextView;
+import android.view.inputmethod.InputMethodManager;
+import android.util.Log;
+
+public class RNTextInputResetModule extends ReactContextBaseJavaModule {
+
+    private final ReactApplicationContext reactContext;
+
+    public RNTextInputResetModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+        this.reactContext = reactContext;
+    }
+
+    @Override
+    public String getName() {
+        return "RNTextInputReset";
+    }
+
+    // Props to https://github.com/MattFoley for this temporary hack
+    // https://github.com/facebook/react-native/pull/12462#issuecomment-298812731
+    @ReactMethod
+    public void resetKeyboardInput(final int reactTagToReset) {
+        UIManagerModule uiManager = getReactApplicationContext().getNativeModule(UIManagerModule.class);
+        uiManager.addUIBlock(new UIBlock() {
+            @Override
+            public void execute(NativeViewHierarchyManager nativeViewHierarchyManager) {
+                InputMethodManager imm = (InputMethodManager) getReactApplicationContext().getBaseContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+                if (imm != null) {
+                    View viewToReset = nativeViewHierarchyManager.resolveView(reactTagToReset);
+                    imm.restartInput(viewToReset);
+                }
+            }
+        });
+    }
+}

android/app/src/main/java/com/expensify/chat/RNTextInputResetPackage.java

@@ -0,0 +1,28 @@
+package com.expensify.chat;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+import com.facebook.react.bridge.JavaScriptModule;
+
+public class RNTextInputResetPackage implements ReactPackage {
+    @Override
+    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
+        return Arrays.<NativeModule>asList(new RNTextInputResetModule(reactContext));
+    }
+
+    // Deprecated from RN 0.47
+    public List<Class<? extends JavaScriptModule>> createJSModules() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
+        return Collections.emptyList();
+    }
+}

contributingGuides/STYLE.md

@@ -4,94 +4,11 @@ For almost all of our code style rules, refer to the [Airbnb JavaScript Style Gu
 
 When writing ES6 or React code, please also refer to the [Airbnb React/JSX Style Guide](https://github.com/airbnb/javascript/tree/master/react).
 
-There are a few things that we have customized for our tastes which will take precedence over Airbnb's guide.
-
-## Functions
-  - Always wrap the function expression for immediately-invoked function expressions (IIFE) in parens:
-
-    ```javascript
-    // Bad
-    (function () {
-        console.log('Welcome to the Internet. Please follow me.');
-    }());
-
-    // Good
-    (function () {
-        console.log('Welcome to the Internet. Please follow me.');
-    })();
-    ```
-
-## Whitespace
-  - Use soft tabs set to 4 spaces.
-
-    ```javascript
-    // Bad
-    function () {
-    ∙∙const name;
-    }
-
-    // Bad
-    function () {
-    ∙const name;
-    }
-
-    // Good
-    function () {
-    ∙∙∙∙const name;
-    }
-    ```
-
-  - Place 1 space before the function keyword and the opening parent for anonymous functions. This does not count for named functions.
-
-    ```javascript
-    // Bad
-    function() {
-        ...
-    }
+We use Prettier to automatically style our code.
+- You can run Prettier to fix the style on all files with `npm run prettier`
+- You can run Prettier in watch mode to fix the styles when they are saved with `npm run prettier-watch`
 
-    // Bad
-    function getValue (element) {
-        ...
-    }
-
-    // Good
-    function∙() {
-        ...
-    }
-
-    // Good
-    function getValue(element) {
-        ...
-    }
-    ```
-
-  - Do not add spaces inside curly braces.
-
-    ```javascript
-    // Bad
-    const foo = { clark: 'kent' };
-
-    // Good
-    const foo = {clark: 'kent'};
-    ```
-  - Aligning tokens should be avoided as it rarely aids in readability and often
-  produces inconsistencies and larger diffs when updating the code.
-
-    ```javascript
-    // Good
-    const foo = {
-        foo: 'bar',
-        foobar: 'foobar',
-        foobarbaz: 'foobarbaz',
-    };
-
-    // Bad
-    const foo = {
-        foo      : 'bar',
-        foobar   : 'foobar',
-        foobarbaz: 'foobarbaz',
-    };
-    ```
+There are a few things that we have customized for our tastes which will take precedence over Airbnb's guide.
 
 ## Naming Conventions
 

docs/articles/playbooks/Expensify-Playbook-for-Small-to-Medium-Sized-Businesses.md

@@ -51,14 +51,14 @@ You do this by synchronizing Expensify and your accounting package as follows:
 1. Click *Settings > Policies*
 2. Navigate to the *Connections* tab
 3. Select your accounting system
-   - If you don’t see your accounting solution in the list of integrations we support, you can review an alternative solution in the Feature Deep Dives section below.
 4. Follow the prompts to connect your accounting package
 
 Check out the links below for more information on how to connect to your accounting solution:
 - *[QuickBooks Online](https://community.expensify.com/discussion/4833/how-to-connect-your-policy-to-quickbooks-online)*
 - *[Xero](https://community.expensify.com/discussion/5282/how-to-connect-your-policy-to-xero)*
 - *[NetSuite](https://community.expensify.com/discussion/5212/how-to-connect-your-policy-to-netsuite-token-based-authentication)*
 - *[Sage Intacct](https://community.expensify.com/discussion/4777/how-to-connect-to-sage-intacct-user-based-permissions-expense-reports)*
+- *[Other Accounting System](https://community.expensify.com/discussion/5271/how-to-set-up-an-indirect-accounting-integration)
 
 
 *“Employees really appreciate how easy it is to use, and the fact that the reimbursement drops right into their bank account. Since most employees are submitting expenses from their phones, the ease of use of the app is critical.”*

ios/NewExpensify/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.14</string>
+	<string>1.3.15</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.14.1</string>
+	<string>1.3.15.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.14</string>
+	<string>1.3.15</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.14.1</string>
+	<string>1.3.15.0</string>
 </dict>
 </plist>