Merge branch 'main' of https://github.com/Expensify/App into issue-8842

.github/workflows/cherryPick.yml

@@ -148,6 +148,7 @@ jobs:
             --body "🍒 Cherry pick https://github.com/Expensify/App/pull/${{ github.event.inputs.PULL_REQUEST_NUMBER }} to staging 🍒" \
             --label "automerge" \
             --base "staging"
+          sleep 5
           echo "::set-output name=PR_NUMBER::$(gh pr view --json 'number' --jq '.number')"
         env:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
@@ -205,7 +206,7 @@ jobs:
       - name: Auto-merge the PR
         # Important: only auto-merge if there was no merge conflict and the PR is mergable (not blocked by a missing status check)!
         if: ${{ fromJSON(steps.cherryPick.outputs.SHOULD_AUTOMERGE) && fromJSON(steps.isPullRequestMergeable.outputs.IS_MERGEABLE) }}
-        run: gh pr merge --merge --delete-branch
+        run: gh pr merge ${{ steps.createPullRequest.outputs.pr_number }} --merge --delete-branch
         env:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
 

.github/workflows/platformDeploy.yml

@@ -209,13 +209,12 @@ jobs:
           max_attempts: 5
           command: npm ci
 
-      - uses: actions/cache@v2
-        with:
-          path: ios/Pods
-          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
-
       - name: Install cocoapods
-        run: cd ios && pod install
+        uses: nick-invision/retry@7c68161adf97a48beb850a595b8784ec57a98cbb
+        with:
+          timeout_minutes: 10
+          max_attempts: 5
+          command: cd ios && pod install
 
       - name: Decrypt profile
         run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output chat_expensify_appstore.mobileprovision chat_expensify_appstore.mobileprovision.gpg

.github/workflows/updateProtectedBranch.yml

@@ -86,6 +86,7 @@ jobs:
             --body "Update version to ${{ env.NEW_VERSION }}" \
             --label "automerge" \
             --base ${{ github.event.inputs.TARGET_BRANCH }}
+          sleep 5
           echo "::set-output name=PR_NUMBER::$(gh pr view --json 'number' --jq '.number')"
         env:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
@@ -129,7 +130,7 @@ jobs:
         run: exit 1
 
       - name: Auto-merge the PR
-        run: gh pr merge --merge --delete-branch
+        run: gh pr merge ${{ steps.createPullRequest.outputs.PR_NUMBER }} --merge --delete-branch
         env:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
 

FORMS.md

@@ -210,4 +210,4 @@ Form.js will automatically provide the following props to any input with the inp
 - defaultValue: The input default value.
 - errorText: The translated error text that is returned by validate for that specific input.
 - onBlur: An onBlur handler that calls validate.
-- onChange: An onChange handler that saves draft values and calls validate.
+- onInputChange: An onChange handler that saves draft values and calls validate for that input (inputA). Passing an inputID as a second param allows inputA to manipulate the input value of the provided inputID (inputB).

android/app/build.gradle

@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001016003
-        versionName "1.1.60-3"
+        versionCode 1001017003
+        versionName "1.1.70-3"
     }
     splits {
         abi {

config/webpack/webpack.common.js

@@ -15,7 +15,6 @@ const includeModules = [
     'react-native-webview',
     '@react-native-picker',
     'react-native-modal',
-    'react-native-onyx',
     'react-native-gesture-handler',
     'react-native-flipper',
     'react-native-google-places-autocomplete',

ios/NewExpensify/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.60</string>
+	<string>1.1.70</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.60.3</string>
+	<string>1.1.70.3</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.1.60</string>
+	<string>1.1.70</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.60.3</string>
+	<string>1.1.70.3</string>
 </dict>
 </plist>

ios/Podfile.lock

@@ -435,6 +435,8 @@ PODS:
   - React-jsinspector (0.66.4)
   - React-logger (0.66.4):
     - glog
+  - react-native-cameraroll (4.1.2):
+    - React-Core
   - react-native-config (1.4.5):
     - react-native-config/App (= 1.4.5)
   - react-native-config/App (1.4.5):
@@ -445,7 +447,7 @@ PODS:
     - React-Core
   - react-native-image-picker (4.7.3):
     - React-Core
-  - react-native-netinfo (8.0.0):
+  - react-native-netinfo (8.3.0):
     - React-Core
   - react-native-pdf (6.2.2):
     - React-Core
@@ -535,7 +537,7 @@ PODS:
     - React-Core
   - RNCMaskedView (0.2.4):
     - React-Core
-  - RNCPicker (1.9.11):
+  - RNCPicker (2.3.1):
     - React-Core
   - RNDateTimePicker (3.5.2):
     - React-Core
@@ -659,6 +661,7 @@ DEPENDENCIES:
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
   - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
+  - "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)"
   - react-native-config (from `../node_modules/react-native-config`)
   - react-native-document-picker (from `../node_modules/react-native-document-picker`)
   - react-native-flipper (from `../node_modules/react-native-flipper`)
@@ -787,6 +790,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
   React-logger:
     :path: "../node_modules/react-native/ReactCommon/logger"
+  react-native-cameraroll:
+    :path: "../node_modules/@react-native-community/cameraroll"
   react-native-config:
     :path: "../node_modules/react-native-config"
   react-native-document-picker:
@@ -878,7 +883,7 @@ SPEC CHECKSUMS:
   Airship: 29d674abeac754f783fc46c7d383d6f046687341
   boost: a7c83b31436843459a1961bfd74b96033dc77234
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
-  DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
+  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
   FBLazyVector: e5569e42a1c79ca00521846c223173a57aca1fe1
   FBReactNativeSpec: fe08c1cd7e2e205718d77ad14b34957cce949b58
   Firebase: 54cdc8bc9c9b3de54f43dab86e62f5a76b47034f
@@ -900,7 +905,7 @@ SPEC CHECKSUMS:
   Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
   FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
+  glog: 5337263514dd6f09803962437687240c5dc39aa4
   GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342
   GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940
   GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1
@@ -930,11 +935,12 @@ SPEC CHECKSUMS:
   React-jsiexecutor: 94ce921e1d8ce7023366873ec371f3441383b396
   React-jsinspector: d0374f7509d407d2264168b6d0fad0b54e300b85
   React-logger: 933f80c97c633ee8965d609876848148e3fef438
+  react-native-cameraroll: 60ac50a5209777cbccfe8d7a62d0743a9da87060
   react-native-config: 6502b1879f97ed5ac570a029961fc35ea606cd14
   react-native-document-picker: 772d04a4bc5c35da9abe27b08ac271420ae3f9ef
   react-native-flipper: cd9eabd8917104c1bbdca2621717cdca3b2addef
   react-native-image-picker: ae1202414bd5c37c00b2a701daa5b6194a06b7d9
-  react-native-netinfo: 0124c0695373fce63cea24aeebb97ab2d237947a
+  react-native-netinfo: ebbcd8fbe1a0ce7035e43cd18c5a545dcb93dd08
   react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f
   react-native-performance: 8edfa2bbc9a2af4a02f01d342118e413a95145e0
   react-native-plaid-link-sdk: 9e0ebdaed648a237b36d5f6f6292b5147af92da7
@@ -958,7 +964,7 @@ SPEC CHECKSUMS:
   RNCAsyncStorage: 8324611026e8dc3706f829953aa6e3899f581589
   RNCClipboard: 5e299c6df8e0c98f3d7416b86ae563d3a9f768a3
   RNCMaskedView: 138134c4d8a9421b4f2bf39055a79aa05c2d47b1
-  RNCPicker: 6780c753e9e674065db90d9c965920516402579d
+  RNCPicker: f6c760d4b314585ff35165d8640d7917ae30afb1
   RNDateTimePicker: c9911be59b1f8670b9f244b85af3a7c295e175ed
   RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7
   RNFBAnalytics: 8ba84c2d31c64374d054c8621b998f25145ffddc
@@ -979,4 +985,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 431123d7514c52fa4516724b89c20d02c87ad8c8
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.10.1