Merge remote-tracking branch 'origin/main' into maria-offline-signout…

…-warning # Conflicts: # src/languages/en.js # src/languages/es.js
Expensify · Nov 23, 2022 · 0d50a4f · 0d50a4f
2 parents 5cb9403 + ece97e2
commit 0d50a4f
Show file tree

Hide file tree

Showing 75 changed files with 1,271 additions and 854 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -68,7 +68,6 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
     - [ ] I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
     - [ ] I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
     - [ ] I tested this PR with a [High Traffic account](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#high-traffic-accounts) against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
-
 - [ ] I included screenshots or videos for tests on [all platforms](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms)
 - [ ] I ran the tests on **all platforms** & verified they passed on:
     - [ ] iOS / native
@@ -167,23 +166,45 @@ The reviewer will copy/paste it into a new comment and complete it after the aut
 
 </details>
 
-### Screenshots
-<!-- Add screenshots for all platforms tested. Pull requests won't be merged unless the screenshots show the app was tested on all platforms.-->
+### Screenshots/Videos
+<details>
+<summary>Web</summary>
+
+<!-- add screenshots or videos here -->
+
+</details>
+
+<details>
+<summary>Mobile Web - Chrome</summary>
+
+<!-- add screenshots or videos here -->
+
+</details>
+
+<details>
+<summary>Mobile Web - Safari</summary>
+
+<!-- add screenshots or videos here -->
+
+</details>
+
+<details>
+<summary>Desktop</summary>
+
+<!-- add screenshots or videos here -->
 
-#### Web
-<!-- Insert screenshots of your changes on the web platform-->
+</details>
+
+<details>
+<summary>iOS</summary>
 
-#### Mobile Web - Chrome
-<!-- Insert screenshots of your changes on the web platform (from chrome mobile browser)-->
+<!-- add screenshots or videos here -->
 
-#### Mobile Web - Safari
-<!-- Insert screenshots of your changes on the web platform (from safari mobile browser)-->
+</details>
 
-#### Desktop
-<!-- Insert screenshots of your changes on the desktop platform-->
+<details>
+<summary>Android</summary>
 
-#### iOS
-<!-- Insert screenshots of your changes on the iOS platform-->
+<!-- add screenshots or videos here -->
 
-#### Android
-<!-- Insert screenshots of your changes on the Android platform-->
+</details>
diff --git a/.github/actions/javascript/reviewerChecklist/index.js b/.github/actions/javascript/reviewerChecklist/index.js
@@ -66,7 +66,7 @@ function checkIssueForCompletedChecklist(numberOfChecklistItems) {
             for (let i = 0; i < combinedComments.length; i++) {
                 // Skip all other comments if we already found the reviewer checklist
                 if (foundReviewerChecklist) {
-                    return;
+                    break;
                 }
 
                 const whitespace = /([\n\r])/gm;

diff --git a/.github/actions/javascript/reviewerChecklist/reviewerChecklist.js b/.github/actions/javascript/reviewerChecklist/reviewerChecklist.js
@@ -56,7 +56,7 @@ function checkIssueForCompletedChecklist(numberOfChecklistItems) {
             for (let i = 0; i < combinedComments.length; i++) {
                 // Skip all other comments if we already found the reviewer checklist
                 if (foundReviewerChecklist) {
-                    return;
+                    break;
                 }
 
                 const whitespace = /([\n\r])/gm;

diff --git a/.github/workflows/warnCPLabel.yml b/.github/workflows/warnCPLabel.yml
@@ -16,9 +16,9 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           body: |
-            :warning: :warning: **Heads up! This pull request has the `CP Staging` label.** :warning: :warning:
-            Merging it will cause it to be immediately deployed to staging, _even if the [open `StagingDeployCash` deploy checklist](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3AStagingDeployCash) is locked._
-
+            :warning: :warning: **Heads up! This pull request has the `CP Staging` label** :warning: :warning:
+            If you applied the `CP Staging` label before the PR was merged, the PR will be be immediately deployed to staging even if the [open `StagingDeployCash` deploy checklist](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3AStagingDeployCash) is locked.
+            However if you applied the `CP Staging` after the PR was merged it's possible it won't be CP'ed automatically. If you need it to be CP'ed to staging, tag a member of @Expensify/mobile-deployers to CP it manually, otherwise you can wait for it to go out with the next deploy.
       - if: ${{ failure() }}
         uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main
         with:

diff --git a/README.md b/README.md
@@ -293,7 +293,7 @@ export default withOnyx({
 This application is built with the following principles.
 1. **Data Flow** - Ideally, this is how data flows through the app:
     1. Server pushes data to the disk of any client (Server -> Pusher event -> Action listening to pusher event -> Onyx).
-    >**Note:** Currently the code only does this with report comments. Until we make more server changes, this steps is actually done by the client requesting data from the server via XHR and then storing the response in Onyx.
+    >**Note:** Currently the code only does this with report comments. Until we make more server changes, this step is actually done by the client requesting data from the server via XHR and then storing the response in Onyx.
     2. Disk pushes data to the UI (Onyx -> withOnyx() -> React component).
     3. UI pushes data to people's brains (React component -> device screen).
     4. Brain pushes data into UI inputs (Device input -> React component).

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001022906
-        versionName "1.2.29-6"
+        versionCode 1001023000
+        versionName "1.2.30-0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj
@@ -766,7 +766,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -791,6 +791,7 @@
 				);
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -827,7 +828,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -844,6 +845,7 @@
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = NO;
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};

diff --git a/ios/NewExpensify.xcworkspace/contents.xcworkspacedata b/ios/NewExpensify.xcworkspace/contents.xcworkspacedata
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.29</string>
+	<string>1.2.30</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.29.6</string>
+	<string>1.2.30.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.29</string>
+	<string>1.2.30</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.29.6</string>
+	<string>1.2.30.0</string>
 </dict>
 </plist>