Merge branch 'main' into arrow-feature-signed

Expensify · Dec 8, 2022 · 4dd29c6 · 4dd29c6
2 parents a895d00 + 5501ff5
commit 4dd29c6
Show file tree

Hide file tree

Showing 94 changed files with 1,406 additions and 1,028 deletions.
diff --git a/.github/scripts/validateActionsAndWorkflows.sh b/.github/scripts/validateActionsAndWorkflows.sh
@@ -52,7 +52,7 @@ for ((i=0; i < ${#WORKFLOWS[@]}; i++)); do
 done
 
 # Wait for the background builds to finish
-for PID in ${ASYNC_PROCESSES[*]}; do
+for PID in "${ASYNC_PROCESSES[@]}"; do
   wait $PID
   RESULT=$?
   if [[ $RESULT != 0 ]]; then

diff --git a/.github/scripts/verifyActions.sh b/.github/scripts/verifyActions.sh
@@ -23,6 +23,6 @@ if [[ EXIT_CODE -eq 0 ]]; then
     exit 0
 else
     echo -e "${RED}Error: Diff found when Github Actions were rebuilt. Did you forget to run \`npm run gh-actions-build\` after a clean install (\`rm -rf node_modules && npm i\`)? Do you need to merge main?${NC}"
-    echo "$DIFF_OUTPUT" | $LIB_PATH/diff-so-fancy | less --tabs=4 -RFX
+    echo "$DIFF_OUTPUT" | "$LIB_PATH/diff-so-fancy" | less --tabs=4 -RFX
     exit 1
 fi
diff --git a/.github/scripts/verifyPodfile.sh b/.github/scripts/verifyPodfile.sh
@@ -10,7 +10,7 @@ podfileLockSha=$(awk '/PODFILE CHECKSUM: /{print $3}' ios/Podfile.lock)
 echo "Podfile: $podfileSha"
 echo "Podfile.lock: $podfileLockSha"
 
-if [ $podfileSha == $podfileLockSha ]; then
+if [ "$podfileSha" == "$podfileLockSha" ]; then
     echo -e "${GREEN}Podfile verified!${NC}"
     exit 0
 else

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,4 +1,4 @@
-name: Lint JavaScript
+name: Lint code
 
 on:
   workflow_call:
@@ -11,13 +11,14 @@ jobs:
     if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
     runs-on: ubuntu-latest
     steps:
-      # This action checks-out the repository, so the workflow can access it.
       - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
-        with:
-          fetch-depth: 0
 
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
-      - run: npm run lint
+      - name: Lint JavaScript with ESLint
+        run: npm run lint
         env:
           CI: true
+
+      - name: Lint shell scripts with ShellCheck
+        run: npm run shellcheck
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 1001023602
-        versionName "1.2.36-2"
+        versionCode 1001023604
+        versionName "1.2.36-4"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

diff --git a/assets/images/drag-and-drop.svg b/assets/images/drag-and-drop.svg
diff --git a/assets/images/expensify-wordmark.svg b/assets/images/expensify-wordmark.svg
diff --git a/assets/images/simple-illustrations/simple-illustration__shield.svg b/assets/images/simple-illustrations/simple-illustration__shield.svg
diff --git a/...icles/send-money/Everything-About-Chat.md → docs/articles/other/Everything-About-Chat.md b/...icles/send-money/Everything-About-Chat.md → docs/articles/other/Everything-About-Chat.md
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -144,6 +144,7 @@ platform :ios do
         workspace: "./ios/NewExpensify.xcworkspace",
         skip_profile_detection: true,
         scheme: "NewExpensify",
+        xcargs: { :PROVISIONING_PROFILE_SPECIFIER => "chat_expensify_adhoc", },
         export_method: "ad-hoc",
         export_options: {
             method: "ad-hoc",

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.36.2</string>
+	<string>1.2.36.4</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.36.2</string>
+	<string>1.2.36.4</string>
 </dict>
 </plist>