Merge pull request #3394 from Expensify/main

Expensify · Jun 7, 2021 · 8c55edb · 8c55edb
2 parents ec621e5 + 268f688
commit 8c55edb
Show file tree

Hide file tree

Showing 45 changed files with 1,875 additions and 110 deletions.
diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml
@@ -100,20 +100,25 @@ jobs:
           USER: OSBotify
           TITLE_REGEX: Update version to ${{ env.NEW_VERSION }}
 
-      - name: Cherry-pick the merge commits to new branch
-        id: cherryPick
+      - name: Cherry-pick the version-bump to new branch
         run: |
           git fetch
-          git cherry-pick ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }} ${{ steps.getVersionBumpMergeCommit.outputs.MERGE_COMMIT_SHA }} --mainline 1
-        continue-on-error: true
+          git cherry-pick -x --mainline 1 --strategy=recursive -Xtheirs ${{ steps.getVersionBumpMergeCommit.outputs.MERGE_COMMIT_SHA }}
 
-      # If there is a merge conflict, we'll just commit what we have,
-      # and the PR will be auto-assigned for someone to manually resolve the conflicts.
-      - name: If there is a merge conflict...
-        if: ${{ steps.cherryPick.outcome == 'failure' }}
+      - name: Cherry-pick the merge commit of target PR to new branch
+        id: cherryPick
         run: |
-          git add -A
-          git cherry-pick --continue
+          echo "Attempting to cherry-pick ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }}"
+          if git cherry-pick -x --mainline 1 ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }}; then
+            echo "🎉 No conflicts! CP was a success, PR can be automerged 🎉"
+            echo "::set-output name=SHOULD_AUTOMERGE::true"
+          else
+            echo "😞 PR can't be automerged, there are merge conflicts in the following files:"
+            git --no-pager diff --name-only --diff-filter=U
+            git add .
+            GIT_MERGE_AUTOEDIT=no git cherry-pick --continue
+            echo "::set-output name=SHOULD_AUTOMERGE::false"
+          fi
 
       - name: Create Pull Request
         id: createPullRequest
@@ -135,7 +140,7 @@ jobs:
           PULL_REQUEST_NUMBER: ${{ steps.createPullRequest.outputs.pr_number }}
 
       - name: Auto-assign PR if there are merge conflicts
-        if: ${{ steps.cherryPick.outcome == 'failure' || steps.isPullRequestMergeable.outputs.IS_MERGEABLE == 'false' }}
+        if: ${{ steps.cherryPick.outputs.SHOULD_AUTOMERGE == 'false' || steps.isPullRequestMergeable.outputs.IS_MERGEABLE == 'false' }}
         uses: actions-ecosystem/action-add-labels@a8ae047fee0ca28235f9764e1c478d2136dc15c1
         with:
           number: ${{ steps.createPullRequest.outputs.pr_number }}
@@ -144,7 +149,7 @@ jobs:
             Hourly
 
       - name: If PR has merge conflicts, comment with instructions for assignee
-        if: ${{ steps.cherryPick.outcome == 'failure' || steps.isPullRequestMergeable.outputs.IS_MERGEABLE == 'false' }}
+        if: ${{ steps.cherryPick.outputs.SHOULD_AUTOMERGE == 'false' || steps.isPullRequestMergeable.outputs.IS_MERGEABLE == 'false' }}
         uses: actions-ecosystem/action-create-comment@cd098164398331c50e7dfdd0dfa1b564a1873fac
         with:
           github_token: ${{ secrets.OS_BOTIFY_TOKEN }}
@@ -157,7 +162,7 @@ jobs:
       # TODO: Once https://github.com/hmarr/auto-approve-action/pull/186 is merged, point back at the non-forked repo
       - name: Check for an auto approve
         # Important: only auto-approve if there was no merge conflict!
-        if: ${{ steps.cherryPick.outcome == 'success' && steps.isPullRequestMergeable.outputs.IS_MERGEABLE == 'true' }}
+        if: ${{ steps.cherryPick.outputs.SHOULD_AUTOMERGE == 'true' && steps.isPullRequestMergeable.outputs.IS_MERGEABLE == 'true' }}
         # Version: 2.0.0
         uses: roryabraham/auto-approve-action@6bb4a3dcf07664d0131e1c74a4bc6d0d8c849978
         with:
@@ -166,7 +171,7 @@ jobs:
 
       - name: Check for an auto merge
         # Important: only auto-merge if there was no merge conflict!
-        if: ${{ steps.cherryPick.outcome == 'success' && steps.isPullRequestMergeable.outputs.IS_MERGEABLE == 'true' }}
+        if: ${{ steps.cherryPick.outputs.SHOULD_AUTOMERGE == 'true' && steps.isPullRequestMergeable.outputs.IS_MERGEABLE == 'true' }}
         # Version: 0.12.0
         uses: pascalgn/automerge-action@39d831e1bb389bd242626bc25d4060064a97181c
         env:

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -13,13 +13,14 @@ jobs:
     steps:
       - name: Get merged pull request
         id: getMergedPullRequest
-        uses: actions-ecosystem/action-get-merged-pull-request@59afe90821bb0b555082ce8ff1e36b03f91553d9
+        # TODO: Point back action actions-ecosystem after https://github.com/actions-ecosystem/action-get-merged-pull-request/pull/223 is merged
+        uses: roryabraham/action-get-merged-pull-request@7a7a194f6ff8f3eef58c822083695a97314ebec1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Check if merged pull request was an automatic version bump PR
         id: isAutomatedPullRequest
-        run: echo "::set-output name=IS_AUTOMERGE_PR::${{ github.actor == 'OSBotify' }}"
+        run: echo "::set-output name=IS_AUTOMERGE_PR::${{ steps.getMergedPullRequest.outputs.author == 'OSBotify' }}"
 
   deployStaging:
     runs-on: ubuntu-latest

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001006300
-        versionName "1.0.63-0"
+        versionCode 1001006301
+        versionName "1.0.63-1"
     }
     splits {
         abi {

diff --git a/android/build.gradle b/android/build.gradle
@@ -25,6 +25,8 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url "https://dl.bintray.com/onfido/maven" }
+
         mavenLocal()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm

diff --git a/apple-app-site-association b/apple-app-site-association
@@ -12,6 +12,7 @@
                     "/v/*",
                     "/add-bank-account/*",
                     "/iou/*",
+                    "/enable-payments/*",
                 ]
             }
         ]

diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
@@ -122,6 +122,10 @@ const webpackConfig = {
                     },
                 ],
             },
+            {
+                test: /\.css$/i,
+                use: ['style-loader', 'css-loader'],
+            },
         ],
     },
     resolve: {

diff --git a/ios/ExpensifyCash.xcodeproj/project.pbxproj b/ios/ExpensifyCash.xcodeproj/project.pbxproj
@@ -507,11 +507,13 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-ExpensifyCash-ExpensifyCashTests/Pods-ExpensifyCash-ExpensifyCashTests-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Onfido/Onfido.framework/Onfido",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/LinkKit/LinkKit.framework/LinkKit",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Onfido.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LinkKit.framework",
 			);
@@ -537,11 +539,13 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-ExpensifyCash/Pods-ExpensifyCash-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Onfido/Onfido.framework/Onfido",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/LinkKit/LinkKit.framework/LinkKit",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Onfido.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LinkKit.framework",
 			);

diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.63.0</string>
+	<string>1.0.63.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
@@ -64,9 +64,11 @@
 		</dict>
 	</dict>
 	<key>NSCameraUsageDescription</key>
-	<string>Your camera is used to create chat attachments.</string>
+	<string>Your camera is used to create chat attachments, documents, and facial capture.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Your location is used to determine your default currency.</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>Required for video capture</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
 	<string>Your camera roll is used to store chat attachments.</string>
 	<key>NSPhotoLibraryUsageDescription</key>

diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.63.0</string>
+	<string>1.0.63.1</string>
 </dict>
 </plist>
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -150,6 +150,10 @@ PODS:
     - nanopb/encode (= 1.30906.0)
   - nanopb/decode (1.30906.0)
   - nanopb/encode (1.30906.0)
+  - Onfido (20.1.0)
+  - onfido-react-native-sdk (1.3.3):
+    - Onfido (= 20.1.0)
+    - React
   - OpenSSL-Universal (1.1.180)
   - Permission-LocationAccuracy (3.0.1):
     - RNPermissions
@@ -473,6 +477,7 @@ DEPENDENCIES:
   - FlipperKit/SKIOSNetworkPlugin (= 0.75.1)
   - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
+  - "onfido-react-native-sdk (from `../node_modules/@onfido/react-native-sdk`)"
   - Permission-LocationAccuracy (from `../node_modules/react-native-permissions/ios/LocationAccuracy`)
   - Permission-LocationAlways (from `../node_modules/react-native-permissions/ios/LocationAlways`)
   - Permission-LocationWhenInUse (from `../node_modules/react-native-permissions/ios/LocationWhenInUse`)
@@ -549,6 +554,7 @@ SPEC REPOS:
     - GoogleUtilities
     - libevent
     - nanopb
+    - Onfido
     - OpenSSL-Universal
     - Plaid
     - PromisesObjC
@@ -565,6 +571,8 @@ EXTERNAL SOURCES:
     :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
   glog:
     :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
+  onfido-react-native-sdk:
+    :path: "../node_modules/@onfido/react-native-sdk"
   Permission-LocationAccuracy:
     :path: "../node_modules/react-native-permissions/ios/LocationAccuracy"
   Permission-LocationAlways:
@@ -691,6 +699,8 @@ SPEC CHECKSUMS:
   GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc
+  Onfido: 116a268e4cb8b767c15285e8071c2e8304673cdf
+  onfido-react-native-sdk: b8f1b7cbe1adab6479d735275772390161630dcd
   OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
   Permission-LocationAccuracy: e8adff9ede1b23b43b7054a4500113d515fc87a8
   Permission-LocationAlways: 7f7f373d086af7a81b2f4f20d65d29266ca2043b
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ @@
                         "/v/*",
                         "/add-bank-account/*",
                         "/iou/*",
+                        "/enable-payments/*",
                     ]
                 }
             ]
@@ Expand Down @@