Merge pull request #9 from zed-io/rebase/1.88.x

Rebase/1.88.x
zed-io · Jun 17, 2024 · 07f9ab9 · 07f9ab9
2 parents 094c743 + 95d94b2
commit 07f9ab9
Show file tree

Hide file tree

Showing 245 changed files with 12,338 additions and 4,276 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,6 +1,6 @@
 module.exports = {
   extends: ['@valora/eslint-config-typescript'],
-  plugins: ['@jambit/typed-redux-saga'],
+  plugins: ['@jambit/typed-redux-saga', 'jsx-expressions'],
   parserOptions: {
     project: './tsconfig.eslint.json',
   },
@@ -17,6 +17,7 @@ module.exports = {
       excludedFiles: ['./**/*.test.ts', './**/*.test.tsx'],
       rules: {
         '@jambit/typed-redux-saga/use-typed-effects': 'error',
+        'jsx-expressions/strict-logical-expressions': 'error',
       },
     },
   ],

diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md
@@ -10,8 +10,6 @@ assignees: ''
 
 Have an issue that needs support, e.g. transaction issues specific to an account? Contact our support team in-app, the preferred method, by shaking your device or navigating to: ☰ > (?) Help > Contact. Alternatively, contact support from our website 👉 https://valoraapp.com/support
 
-Have a question about development? Join our Discord 👉 https://discord.gg/7tKnCbHv5j
-
 As an open source project - it may take some time for your issue to be addressed. Please be patient and we will respond as soon as we can. 🙏 -->
 
 ### Current behavior

diff --git a/.github/actions/yarn-install/action.yml b/.github/actions/yarn-install/action.yml
@@ -3,12 +3,12 @@ description: 'Runs setup node + cache + yarn install'
 runs:
   using: 'composite'
   steps:
-    - uses: actions/setup-node@v3
+    - uses: actions/setup-node@v4
       id: setup-node
       with:
         node-version-file: 'package.json'
         check-latest: true
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: |
           node_modules

diff --git a/.github/workflows/automerge-crowdin.yml b/.github/workflows/automerge-crowdin.yml
@@ -14,18 +14,18 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: google-github-actions/auth@v1
+      - uses: google-github-actions/auth@v2
         with:
           project_id: celo-mobile-mainnet
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
       - name: Google Secrets
         id: google-secrets
-        uses: google-github-actions/get-secretmanager-secrets@v1.0.1
+        uses: google-github-actions/get-secretmanager-secrets@v2.1.3
         with:
           secrets: |-
             VALORA_BOT_TOKEN:projects/1027349420744/secrets/VALORA_BOT_TOKEN
-      - uses: actions/checkout@v3
-      - uses: actions/github-script@v5
+      - uses: actions/checkout@v4
+      - uses: actions/github-script@v7
         with:
           github-token: ${{ steps.google-secrets.outputs.VALORA_BOT_TOKEN }}
           script: |

diff --git a/.github/workflows/automerge-translation.yml b/.github/workflows/automerge-translation.yml
@@ -13,18 +13,18 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: google-github-actions/auth@v1
+      - uses: google-github-actions/auth@v2
         with:
           project_id: celo-mobile-mainnet
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
       - name: Google Secrets
         id: google-secrets
-        uses: google-github-actions/get-secretmanager-secrets@v1.0.1
+        uses: google-github-actions/get-secretmanager-secrets@v2.1.3
         with:
           secrets: |-
             VALORA_BOT_TOKEN:projects/1027349420744/secrets/VALORA_BOT_TOKEN
-      - uses: actions/checkout@v3
-      - uses: actions/github-script@v5
+      - uses: actions/checkout@v4
+      - uses: actions/github-script@v7
         with:
           github-token: ${{ steps.google-secrets.outputs.VALORA_BOT_TOKEN }}
           script: |

diff --git a/.github/workflows/bump-app-version.yml b/.github/workflows/bump-app-version.yml
@@ -10,34 +10,34 @@ on:
 jobs:
   bump-app-version:
     # this job uses the pre-deploy script and agvtool which is only available on macos
-    runs-on: macos-11
+    runs-on: macos-14
     permissions:
       pull-requests: write
     env:
       BRANCH_NAME: valora-bot/bump-app-version
     steps:
-      - uses: google-github-actions/auth@v1
+      - uses: google-github-actions/auth@v2
         with:
           project_id: celo-mobile-mainnet
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
       - name: Google Secrets
         id: google-secrets
-        uses: google-github-actions/get-secretmanager-secrets@v1.0.1
+        uses: google-github-actions/get-secretmanager-secrets@v2.1.3
         with:
           secrets: |-
             BOT_SSH_KEY:projects/1027349420744/secrets/BOT_SSH_PRIVATE_KEY
             VALORA_BOT_TOKEN:projects/1027349420744/secrets/VALORA_BOT_TOKEN
-      - uses: webfactory/ssh-agent@v0.8.0
+      - uses: webfactory/ssh-agent@v0.9.0
         with:
           ssh-private-key: ${{ steps.google-secrets.outputs.BOT_SSH_KEY }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: main
       - uses: ./.github/actions/yarn-install
       - run: yarn ts-node .github/scripts/createAppVersionPr.ts
         env:
           VALORA_BOT_TOKEN: ${{ steps.google-secrets.outputs.VALORA_BOT_TOKEN }}
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v7
         with:
           script: |
             const allowedUpdatedFiles = [
@@ -48,7 +48,7 @@ jobs:
             ]
             const script = require('.github/scripts/autoApprovePr.js')
             await script({github, context, core, allowedUpdatedFiles})
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v7
         with:
           github-token: ${{ steps.google-secrets.outputs.VALORA_BOT_TOKEN }}
           script: |

diff --git a/.github/workflows/check-translation-files-pr.yml b/.github/workflows/check-translation-files-pr.yml
@@ -15,10 +15,10 @@ jobs:
   check-translation-files:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v44
         with:
           files: |
             locales/*/translation.json

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -25,15 +25,15 @@ jobs:
     name: Vulnerabilities
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       - run: ./scripts/ci_check_vulnerabilities.sh
 
   lint:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       - run: yarn run format:check
       - run: yarn run lint
@@ -42,28 +42,28 @@ jobs:
     name: 'yarn.lock Up-to-date'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       - run: git diff --exit-code
   licenses:
     name: Licenses
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       - run: yarn check-licenses
   knip-depcheck:
     name: Dependencies
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       - run: yarn knip:depcheck
   knip-regression:
     name: Knip Regression
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 2
       - uses: ./.github/actions/yarn-install

diff --git a/.github/workflows/e2e-android.yml b/.github/workflows/e2e-android.yml
@@ -17,7 +17,7 @@ jobs:
     # If it takes longer it usually fails, so no need to pay for more
     timeout-minutes: 25
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set env
         run: |
           ANDROID_HOME="$HOME/android-tools"
@@ -88,19 +88,19 @@ jobs:
           --device-boot-args="-snapshot ci_boot"
       - name: Publish Android JUnit Report
         if: always()
-        uses: mikepenz/action-junit-report@v3
+        uses: mikepenz/action-junit-report@v4
         with:
           check_name: Android (${{ inputs.android-api-level }}) e2e Test Report
           report_paths: 'e2e/test-results/junit.xml'
       - name: 'Upload Android E2E Artifacts'
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: android-${{ inputs.android-api-level }}-e2e-artifact
           path: e2e/artifacts
       - name: 'Upload Android E2E HTML Report'
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: android-${{ inputs.android-api-level }}-e2e-test-report
           path: e2e/test-results
diff --git a/.github/workflows/e2e-faucet-balance.yml b/.github/workflows/e2e-faucet-balance.yml
@@ -17,7 +17,7 @@ jobs:
     name: balance-and-fund
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       - name: Create E2E Fund .env File
         env:

diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
@@ -16,19 +16,19 @@ jobs:
     name: iOS (${{ inputs.ios-version  }})
     runs-on: ios-e2e-group
     steps:
-      - uses: google-github-actions/auth@v1
+      - uses: google-github-actions/auth@v2
         if: ${{ env.SECRETS_AVAILABLE }}
         with:
           project_id: celo-mobile-mainnet
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
       - name: Google Secrets
         if: ${{ env.SECRETS_AVAILABLE }}
         id: google-secrets
-        uses: google-github-actions/get-secretmanager-secrets@v1.0.1
+        uses: google-github-actions/get-secretmanager-secrets@v2.1.3
         with:
           secrets: |-
             EMERGE_API_TOKEN:projects/1027349420744/secrets/EMERGE_API_TOKEN
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       # Since the e2e runners have access to the Valora branding,
       # This check ensures there are no type errors there.
@@ -76,19 +76,19 @@ jobs:
         timeout-minutes: 45
       - name: Publish iOS JUnit Report
         if: always()
-        uses: mikepenz/action-junit-report@v3
+        uses: mikepenz/action-junit-report@v4
         with:
           check_name: iOS (${{ inputs.ios-version }}) e2e Test Report
           report_paths: 'e2e/test-results/junit.xml'
       - name: 'Upload iOS E2E Artifacts'
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ios-${{ inputs.ios-version }}-e2e-artifact
           path: e2e/artifacts
       - name: 'Upload iOS E2E HTML Report'
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ios-${{ inputs.ios-version }}-test-report
           path: e2e/test-results

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,7 +20,7 @@ jobs:
     name: Mobile
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       - name: Build
         run: yarn build
@@ -33,10 +33,10 @@ jobs:
           mkdir -p test-results/jest
           yarn test:ci
       - name: Upload Coverage Report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: coverage/lcov-report
       - name: 'Upload to Codecov'
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/update-licenses-disclaimer.yml b/.github/workflows/update-licenses-disclaimer.yml
@@ -16,32 +16,32 @@ jobs:
     env:
       BRANCH_NAME: valora-bot/update-licenses-disclaimer
     steps:
-      - uses: google-github-actions/auth@v1
+      - uses: google-github-actions/auth@v2
         with:
           project_id: celo-mobile-mainnet
           credentials_json: ${{ secrets.MAINNET_SERVICE_ACCOUNT_KEY }}
       - name: Google Secrets
         id: google-secrets
-        uses: google-github-actions/get-secretmanager-secrets@v1.0.1
+        uses: google-github-actions/get-secretmanager-secrets@v2.1.3
         with:
           secrets: |-
             BOT_SSH_KEY:projects/1027349420744/secrets/BOT_SSH_PRIVATE_KEY
             VALORA_BOT_TOKEN:projects/1027349420744/secrets/VALORA_BOT_TOKEN
-      - uses: webfactory/ssh-agent@v0.8.0
+      - uses: webfactory/ssh-agent@v0.9.0
         with:
           ssh-private-key: ${{ steps.google-secrets.outputs.BOT_SSH_KEY }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/yarn-install
       - run: yarn ts-node .github/scripts/createLicenseDisclaimerPr.ts
         env:
           VALORA_BOT_TOKEN: ${{ steps.google-secrets.outputs.VALORA_BOT_TOKEN }}
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v7
         with:
           script: |
             const script = require('.github/scripts/autoApprovePr.js')
             const allowedUpdatedFiles = ['src/account/LicenseDisclaimer.txt']
             await script({github, context, core, allowedUpdatedFiles})
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v7
         with:
           github-token: ${{ steps.google-secrets.outputs.VALORA_BOT_TOKEN }}
           script: |

diff --git a/__mocks__/react-i18next.js b/__mocks__/react-i18next.js
@@ -2,10 +2,10 @@
 const React = require('react')
 const reactI18next = require('react-i18next')
 
-const renderTrans = ({ i18nKey, tOptions, children }) => {
+const renderTrans = ({ i18nKey, tOptions, context, children }) => {
   return (
     <React.Fragment>
-      {translationFunction(i18nKey, tOptions)}
+      {translationFunction(i18nKey, { ...(context && { context }), ...tOptions })}
       {children}
     </React.Fragment>
   )

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -150,7 +150,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode appVersionCode
-        versionName "1.84.1"
+        versionName "1.88.0"
         multiDexEnabled true
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -281,7 +281,7 @@ dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
 
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
 
     implementation 'com.clevertap.android:clevertap-android-sdk:5.2.2'
     //For CleverTap Android SDK v3.6.4 and above add the following -
@@ -292,7 +292,7 @@ dependencies {
     implementation 'com.google.android.exoplayer:exoplayer-hls:2.17.1'
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.17.1'
     implementation 'com.github.bumptech.glide:glide:4.11.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'androidx.viewpager:viewpager:1.0.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.core:core:1.4.0'

diff --git a/branding/celo/src/brandingConfig.ts b/branding/celo/src/brandingConfig.ts
@@ -20,3 +20,4 @@ export const INVITE_REWARDS_NFTS_LEARN_MORE =
   'https://valoraapp.com/support/invite-rewards-nfts-learn-more'
 export const INVITE_REWARDS_STABLETOKEN_LEARN_MORE =
   'https://valoraapp.com/support/invite-rewards-stabletoken-learn-more'
+export const EARN_STABLECOINS_LEARN_MORE = 'https://valoraapp.com/support/earn-on-your-stablecoins'
diff --git a/branding/celo/src/images/points-illustration.png b/branding/celo/src/images/points-illustration.png