Merge remote-tracking branch 'origin/main' into feat/validate-code-modal

rayane-djouah · Sep 7, 2024 · 5296333 · 5296333
2 parents d88b0c3 + 4af620b
commit 5296333
Show file tree

Hide file tree

Showing 110 changed files with 3,584 additions and 1,130 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -117,14 +117,14 @@ jobs:
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         uses: actions/upload-artifact@v4
         with:
-          name: android-sourcemaps
+          name: android-sourcemaps-artifact
           path: ./android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map
 
       - name: Upload Android build artifact
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         uses: actions/upload-artifact@v4
         with:
-          name: android-build
+          name: android-build-artifact
           path: ./android/app/build/outputs/bundle/productionRelease/app-production-release.aab
 
       - name: Set current App version in Env
@@ -185,13 +185,13 @@ jobs:
       - name: Upload desktop sourcemaps artifact
         uses: actions/upload-artifact@v4
         with:
-          name: desktop-sourcemaps
+          name: desktop-sourcemaps-artifact
           path: ./desktop/dist/www/merged-source-map.js.map
 
       - name: Upload desktop build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: desktop-build
+          name: desktop-build-artifact
           path: ./desktop-build/NewExpensify.dmg
 
   iOS:
@@ -282,14 +282,14 @@ jobs:
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         uses: actions/upload-artifact@v4
         with:
-          name: ios-sourcemaps
+          name: ios-sourcemaps-artifact
           path: ./main.jsbundle.map
 
       - name: Upload iOS build artifact
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         uses: actions/upload-artifact@v4
         with:
-          name: ios-build
+          name: ios-build-artifact
           path: /Users/runner/work/App/App/New\ Expensify.ipa
 
       - name: Warn deployers if iOS production deploy failed
@@ -389,7 +389,7 @@ jobs:
       - name: Upload web sourcemaps artifact
         uses: actions/upload-artifact@v4
         with:
-          name: web-sourcemaps
+          name: web-sourcemaps-artifact
           path: ./dist/merged-source-map.js.map
 
       - name: Compress web build .tar.gz and .zip
@@ -400,13 +400,13 @@ jobs:
       - name: Upload .tar.gz web build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: web-build-tar-gz
+          name: web-build-tar-gz-artifact
           path: ./webBuild.tar.gz
 
       - name: Upload .zip web build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: web-build-zip
+          name: web-build-zip-artifact
           path: ./webBuild.zip
 
   postSlackMessageOnFailure:
@@ -490,18 +490,23 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
+      - name: Rename web and desktop sourcemaps artifacts before assets upload in order to have unique ReleaseAsset.name
+        run: |
+          mv ./desktop-sourcemaps-artifact/merged-source-map.js.map ./desktop-sourcemaps-artifact/desktop-merged-source-map.js.map
+          mv ./web-sourcemaps-artifact/merged-source-map.js.map ./web-sourcemaps-artifact/web-merged-source-map.js.map
+
       - name: Upload artifacts to GitHub Release
         run: |
           gh release upload ${{ env.STAGING_VERSION }} \
-            ./android-sourcemaps/index.android.bundle.map#android-sourcemap-${{ env.STAGING_VERSION }} \
-            ./android-build/app-production-release.aab \
-            ./desktop-sourcemaps/merged-source-map.js.map#desktop-sourcemap-${{ env.STAGING_VERSION }} \
-            ./desktop-build/NewExpensify.dmg \
-            ./ios-sourcemaps/main.jsbundle.map#ios-sourcemap-${{ env.STAGING_VERSION }} \
-            ./ios-build/New\ Expensify.ipa \
-            ./web-sourcemaps/merged-source-map.js.map#web-sourcemap-${{ env.STAGING_VERSION }} \
-            ./web-build-tar-gz/webBuild.tar.gz \
-            ./web-build-zip/webBuild.zip
+            ./android-sourcemaps-artifact/index.android.bundle.map#android-sourcemap-${{ env.STAGING_VERSION }} \
+            ./android-build-artifact/app-production-release.aab \
+            ./desktop-sourcemaps-artifact/desktop-merged-source-map.js.map#desktop-sourcemap-${{ env.STAGING_VERSION }} \
+            ./desktop-build-artifact/NewExpensify.dmg \
+            ./ios-sourcemaps-artifact/main.jsbundle.map#ios-sourcemap-${{ env.STAGING_VERSION }} \
+            ./ios-build-artifact/New\ Expensify.ipa \
+            ./web-sourcemaps-artifact/web-merged-source-map.js.map#web-sourcemap-${{ env.STAGING_VERSION }} \
+            ./web-build-tar-gz-artifact/webBuild.tar.gz \
+            ./web-build-zip-artifact/webBuild.zip
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
@@ -528,20 +533,28 @@ jobs:
     if: ${{ github.ref == 'refs/heads/production' && fromJSON(needs.checkDeploymentSuccess.outputs.IS_AT_LEAST_ONE_PLATFORM_DEPLOYED) }}
     needs: [checkDeploymentSuccess]
     steps:
-      - uses: actions/checkout@v4
-        name: Checkout
+      - name: Checkout production branch
+        uses: actions/checkout@v4
 
       - name: Get current app version
         run: echo "PRODUCTION_VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
 
+      - name: Download all workflow run artifacts
+        uses: actions/download-artifact@v4
+
+      - name: Rename web and desktop sourcemaps artifacts before assets upload in order to have unique ReleaseAsset.name
+        run: |
+          mv ./desktop-sourcemaps-artifact/merged-source-map.js.map ./desktop-sourcemaps-artifact/desktop-merged-source-map.js.map
+          mv ./web-sourcemaps-artifact/merged-source-map.js.map ./web-sourcemaps-artifact/web-merged-source-map.js.map
+
       - name: Upload artifacts to GitHub Release
         run: |
           gh release upload ${{ env.STAGING_VERSION }} \
-            ./desktop-sourcemaps/merged-source-map.js.map#desktop-sourcemap-${{ env.STAGING_VERSION }} \
-            ./desktop-build/NewExpensify.dmg \
-            ./web-sourcemaps/merged-source-map.js.map#web-sourcemap-${{ env.STAGING_VERSION }} \
-            ./web-build-tar-gz/webBuild.tar.gz \
-            ./web-build-zip/webBuild.zip
+            ./desktop-sourcemaps-artifact/desktop-merged-source-map.js.map#desktop-sourcemap-${{ env.STAGING_VERSION }} \
+            ./desktop-build-artifact/NewExpensify.dmg \
+            ./web-sourcemaps-artifact/web-merged-source-map.js.map#web-sourcemap-${{ env.STAGING_VERSION }} \
+            ./web-build-tar-gz-artifact/webBuild.tar.gz \
+            ./web-build-zip-artifact/webBuild.zip
         env:
           GITHUB_TOKEN: ${{ github.token }}
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009003009
-        versionName "9.0.30-9"
+        versionCode 1009003015
+        versionName "9.0.30-15"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

diff --git a/assets/images/simple-illustrations/simple-illustration__commentbubbles_blue.svg b/assets/images/simple-illustrations/simple-illustration__commentbubbles_blue.svg
diff --git a/...sic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills.md b/...sic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills.md