Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…
Browse files Browse the repository at this point in the history
…x/47799-loading-behind-background
  • Loading branch information
wildan-m committed Sep 13, 2024
2 parents 99ebfbd + 494065a commit 153a14a
Show file tree
Hide file tree
Showing 237 changed files with 6,560 additions and 2,352 deletions.
7 changes: 7 additions & 0 deletions .eslintrc.pr.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = {
extends: './.eslintrc',
plugins: ['deprecation'],
rules: {
'deprecation/deprecation': 'error',
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ async function run() {
}

// If it's anywhere else in this page, the the prior release is the next item in the page
if (indexOfCurrentRelease > 0) {
if (indexOfCurrentRelease >= 0) {
priorTag = filteredData.at(indexOfCurrentRelease + 1)?.tag_name;
done();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11535,7 +11535,7 @@ async function run() {
return filteredData;
}
// If it's anywhere else in this page, the the prior release is the next item in the page
if (indexOfCurrentRelease > 0) {
if (indexOfCurrentRelease >= 0) {
priorTag = filteredData.at(indexOfCurrentRelease + 1)?.tag_name;
done();
}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,13 @@ jobs:
- name: Upload desktop sourcemaps artifact
uses: actions/upload-artifact@v4
with:
name: ${{ env.SHOULD_DEPLOY_PRODUCTION && 'desktop-sourcemaps-artifact' || 'desktop-staging-sourcemaps-artifact' }}
name: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'desktop-sourcemaps-artifact' || 'desktop-staging-sourcemaps-artifact' }}
path: ./desktop/dist/www/merged-source-map.js.map

- name: Upload desktop build artifact
uses: actions/upload-artifact@v4
with:
name: ${{ env.SHOULD_DEPLOY_PRODUCTION && 'desktop-build-artifact' || 'desktop-staging-build-artifact' }}
name: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'desktop-build-artifact' || 'desktop-staging-build-artifact' }}
path: ./desktop-build/NewExpensify.dmg

iOS:
Expand Down Expand Up @@ -407,7 +407,7 @@ jobs:
- name: Upload web sourcemaps artifact
uses: actions/upload-artifact@v4
with:
name: ${{ env.SHOULD_DEPLOY_PRODUCTION && 'web' || 'web-staging' }}-sourcemaps-artifact
name: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'web' || 'web-staging' }}-sourcemaps-artifact
path: ./dist/merged-source-map.js.map

- name: Compress web build .tar.gz and .zip
Expand All @@ -418,13 +418,13 @@ jobs:
- name: Upload .tar.gz web build artifact
uses: actions/upload-artifact@v4
with:
name: ${{ env.SHOULD_DEPLOY_PRODUCTION && 'web' || 'web-staging' }}-build-tar-gz-artifact
name: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'web' || 'web-staging' }}-build-tar-gz-artifact
path: ./webBuild.tar.gz

- name: Upload .zip web build artifact
uses: actions/upload-artifact@v4
with:
name: ${{ env.SHOULD_DEPLOY_PRODUCTION && 'web' || 'web-staging' }}-build-zip-artifact
name: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'web' || 'web-staging' }}-build-zip-artifact
path: ./webBuild.zip

postSlackMessageOnFailure:
Expand Down Expand Up @@ -591,8 +591,8 @@ jobs:
postSlackMessageOnSuccess:
name: Post a Slack message when all platforms deploy successfully
runs-on: ubuntu-latest
if: ${{ fromJSON(needs.checkDeploymentSuccess.outputs.IS_ALL_PLATFORMS_DEPLOYED) }}
needs: [prep, checkDeploymentSuccess, createPrerelease, finalizeRelease]
if: ${{ always() && fromJSON(needs.checkDeploymentSuccess.outputs.IS_ALL_PLATFORMS_DEPLOYED) }}
needs: [prep, android, desktop, iOS, web, checkDeploymentSuccess, createPrerelease, finalizeRelease]
steps:
- name: 'Announces the deploy in the #announce Slack room'
uses: 8398a7/action-slack@v3
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ jobs:
env:
CI: true

- name: Run ESLint with stricter checks on changed files
run: |
# shellcheck disable=SC2046
npx eslint --config ./.eslintrc.pr.js $(git diff --diff-filter=AM --name-only main -- "*.js" "*.ts" "*.tsx")
- name: Verify there's no Prettier diff
run: |
npm run prettier -- --loglevel silent
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1009003300
versionName "9.0.33-0"
versionCode 1009003500
versionName "9.0.35-0"
// 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"
Expand Down
1 change: 1 addition & 0 deletions assets/images/bookmark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions assets/images/companyCards/card-amex.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions assets/images/companyCards/card-bank_of_america.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions assets/images/companyCards/card-brex.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 42 additions & 0 deletions assets/images/companyCards/card-capital_one.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions assets/images/companyCards/card-chase.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
43 changes: 43 additions & 0 deletions assets/images/companyCards/card-citi.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 153a14a

Please sign in to comment.