Merge branch 'develop' into dependabot/npm_and_yarn/swc/core-1.6.6

bloomwalletio · Jul 3, 2024 · 3175416 · 3175416
2 parents 69cfa44 + 3739454
commit 3175416
Show file tree

Hide file tree

Showing 24 changed files with 305 additions and 243 deletions.
diff --git a/.github/workflows/ci.lint.yml b/.github/workflows/ci.lint.yml
@@ -11,10 +11,10 @@ jobs:
         name: Format
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - name: Setup Node.js
-              uses: actions/setup-node@v3
+              uses: actions/setup-node@v4
               with:
                   node-version: 20.10.0
 
@@ -33,10 +33,10 @@ jobs:
         name: Lint
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - name: Setup Node.js
-              uses: actions/setup-node@v3
+              uses: actions/setup-node@v4
               with:
                   node-version: 20.10.0
 

diff --git a/.github/workflows/ci.snyk.yml b/.github/workflows/ci.snyk.yml
@@ -1,23 +1,23 @@
 name: Snyk
 
 on:
-  push:
-    branches:
-      - 'develop'
+    push:
+        branches:
+            - 'develop'
 
 jobs:
-  test:
-    name: Test
-    # Only run on push events or PRs from bloomwalletio/bloom, skip on PRs from forks
-    # Secret variables cannot be exposed to PRs from forks
-    if: github.event_name == 'push'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
+    test:
+        name: Test
+        # Only run on push events or PRs from bloomwalletio/bloom, skip on PRs from forks
+        # Secret variables cannot be exposed to PRs from forks
+        if: github.event_name == 'push'
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
 
-      - name: Check vulnerabilities
-        uses: snyk/actions/[email protected]
-        env:
-          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-        with:
-          args: --yarn-workspaces --severity-threshold=high --strict-out-of-sync=false --detection-depth=5 --dev
+            - name: Check vulnerabilities
+              uses: snyk/actions/[email protected]
+              env:
+                  SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+              with:
+                  args: --yarn-workspaces --severity-threshold=high --strict-out-of-sync=false --detection-depth=5 --dev
diff --git a/.github/workflows/ci.test.yml b/.github/workflows/ci.test.yml
@@ -11,10 +11,10 @@ jobs:
         name: Shared
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - name: Setup Node.js
-              uses: actions/setup-node@v3
+              uses: actions/setup-node@v4
               with:
                   node-version: 20.10.0
 

diff --git a/.github/workflows/ci.ts.yml b/.github/workflows/ci.ts.yml
@@ -11,10 +11,10 @@ jobs:
         name: Check
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - name: Setup Node.js
-              uses: actions/setup-node@v3
+              uses: actions/setup-node@v4
               with:
                   node-version: 20.10.0
 

diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml
@@ -1,29 +1,29 @@
 name: Crowdin
 
 on:
-  schedule:
-    # Weekly on Wednesday at 18:00 UTC
-    - cron: '0 18 * * WED'
-  workflow_dispatch:
+    schedule:
+        # Weekly on Wednesday at 18:00 UTC
+        - cron: '0 18 * * WED'
+    workflow_dispatch:
 
 jobs:
-  sync:
-    name: Sync
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
+    sync:
+        name: Sync
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
 
-      - name: Sync translations from Crowdin
-        uses: crowdin/[email protected]
-        with:
-          upload_sources: true
-          download_translations: true
-          localization_branch_name: 'l10n_develop'
-          pull_request_title: 'New translations [ci skip]'
-          crowdin_branch_name: 'develop'
-          config: 'crowdin.yml'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+            - name: Sync translations from Crowdin
+              uses: crowdin/[email protected]
+              with:
+                  upload_sources: true
+                  download_translations: true
+                  localization_branch_name: 'l10n_develop'
+                  pull_request_title: 'New translations [ci skip]'
+                  crowdin_branch_name: 'develop'
+                  config: 'crowdin.yml'
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+                  CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
diff --git a/.github/workflows/reusable_build.yml b/.github/workflows/reusable_build.yml
@@ -30,10 +30,10 @@ jobs:
             STAGE: ${{ inputs.stage }}
             NODE_OPTIONS: '--max-old-space-size=12288' # Set the desired heap size here
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
 
             - name: Setup NodeJS
-              uses: actions/setup-node@v1
+              uses: actions/setup-node@v4
               with:
                   node-version: 20.10.0
 
@@ -50,15 +50,15 @@ jobs:
                   profile: minimal
 
             - name: Install LLVM and Clang (Windows) # required for bindgen to work, see https://github.com/rust-lang/rust-bindgen/issues/1797
-              uses: KyleMayes/install-llvm-action@32c4866ebb71e0949e8833eb49beeebed48532bd
-              if: inputs.os == 'windows-2022'
+              uses: KyleMayes/install-llvm-action@v1
+              if: ${{ inputs.os == 'windows-2022' }}
               with:
                   version: '11.0'
                   directory: ${{ runner.temp }}/llvm
 
             - name: Set LIBCLANG_PATH (Windows)
               run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV
-              if: inputs.os == 'windows-2022'
+              if: ${{ inputs.os == 'windows-2022' }}
 
             - name: Set up certificate (Windows)
               if: ${{ inputs.sign && inputs.os == 'windows-2022' }}
@@ -95,27 +95,27 @@ jobs:
 
             - name: Set deployment target (MacOS)
               run: echo "MACOSX_DEPLOYMENT_TARGET=10.14" >> $GITHUB_ENV # TODO: set this to 10.12 once rocksDB issue is fixed
-              if: inputs.os == 'macos-12'
+              if: ${{ inputs.os == 'macos-12' }}
 
             - name: Verify ditto accessibility
               run: ditto package.json package.json.copy
-              if: inputs.os == 'macos-12'
+              if: ${{ inputs.os == 'macos-12' }}
 
             - name: Install required packages (Linux)
               run: |
                   sudo apt update
                   sudo apt install -y gcc-multilib g++-multilib build-essential libssl-dev rpm libsecret-1-dev \
                     software-properties-common apt-transport-https libudev-dev libusb-1.0-0-dev \
                     llvm-dev libclang-dev clang
-              if: inputs.os == 'ubuntu-20.04'
+              if: ${{ inputs.os == 'ubuntu-20.04' }}
 
             - name: Enable verbose output for electron-builder (macOS/Linux)
               run: echo "DEBUG=electron-builder" >> $GITHUB_ENV
-              if: inputs.os != 'windows-2022'
+              if: ${{ inputs.os != 'windows-2022' }}
 
             - name: Enable verbose output for electron-builder (Windows)
               run: echo "DEBUG=electron-builder" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-              if: inputs.os == 'windows-2022'
+              if: ${{ inputs.os == 'windows-2022' }}
 
             - name: Set Transak API key
               shell: bash
@@ -165,7 +165,7 @@ jobs:
                   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                   MACOS_SKIP_NOTARIZATION: true
               working-directory: packages/desktop
-              if: ${{ ! inputs.sign && inputs.os == 'macos-12' }}
+              if: ${{ !inputs.sign && inputs.os == 'macos-12' }}
 
             - name: Build signed Electron app (Windows)
               run: yarn compile:${env:STAGE}:win
@@ -182,48 +182,49 @@ jobs:
                   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                   SIGN: false
               working-directory: packages/desktop
-              if: ${{ ! inputs.sign && inputs.os == 'windows-2022' }}
+              if: ${{ !inputs.sign && inputs.os == 'windows-2022' }}
 
             - name: Build Electron app (Linux)
               run: yarn compile:${STAGE}:linux
               working-directory: packages/desktop
-              if: inputs.os == 'ubuntu-20.04'
+              if: ${{ inputs.os == 'ubuntu-20.04' }}
               env:
                   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
             - name: Import GPG key (Linux)
               run: |
                   echo "$GPG_PRIVATE_KEY" | base64 -d > /tmp/private.key && \
                   echo "$GPG_PASSPHRASE" | gpg --batch --yes --passphrase-fd 0 --import /tmp/private.key
               env:
                   GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
                   GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-              if: inputs.sign && inputs.os == 'ubuntu-20.04'
+              if: ${{ inputs.sign && inputs.os == 'ubuntu-20.04' }}
 
             - name: Sign AppImage (Linux)
               run: echo "$GPG_PASSPHRASE" | gpg --pinentry-mode loopback --batch --passphrase-fd 0 --armor --detach-sign --local-user 5CB8BB19 bloom-desktop*.AppImage
               working-directory: packages/desktop/out
               env:
                   GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-              if: inputs.sign && inputs.os == 'ubuntu-20.04'
+              if: ${{ inputs.sign && inputs.os == 'ubuntu-20.04' }}
 
             - name: Compute checksums (Linux)
               run: for i in `ls | grep 'bloom-desktop-*'` ; do sha256sum $i | awk {'print $1'} > $i.sha256 ; done
               working-directory: packages/desktop/out
-              if: inputs.os == 'ubuntu-20.04'
+              if: ${{ inputs.os == 'ubuntu-20.04' }}
 
             - name: Compute checksums (MacOS)
               run: for i in `ls | grep 'bloom-desktop-*'` ; do shasum -a 256 $i | awk {'print $1'} > $i.sha256 ; done
               working-directory: packages/desktop/out
-              if: inputs.os == 'macos-12'
+              if: ${{ inputs.os == 'macos-12' }}
 
             - name: Compute checksums (Windows)
               run: Get-ChildItem "." -Filter bloom-desktop-* | Foreach-Object { $(Get-FileHash -Path $_.FullName -Algorithm SHA256).Hash | Set-Content ($_.FullName + '.sha256') }
               working-directory: packages/desktop/out
-              if: inputs.os == 'windows-2022'
+              if: ${{ inputs.os == 'windows-2022' }}
 
             - name: Upload artifacts
-              if: inputs.upload
-              uses: actions/upload-artifact@v2
+              if: ${{ inputs.upload }}
+              uses: actions/upload-artifact@v4
               with:
                   name: bloom-desktop-${{ inputs.os }}
                   path: |

diff --git a/.github/workflows/reusable_release.yml b/.github/workflows/reusable_release.yml
@@ -26,22 +26,22 @@ jobs:
             - run: echo ${{ github.ref }}
 
             - name: Checkout code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
-            - name: Downloading artifacts
-              uses: actions/download-artifact@v2
+            - name: Downloading artifacts (Windows)
+              uses: actions/download-artifact@v4
               with:
                   name: bloom-desktop-windows-2022
                   path: assets
 
-            - name: Downloading artifacts
-              uses: actions/download-artifact@v2
+            - name: Downloading artifacts (macOS)
+              uses: actions/download-artifact@v4
               with:
                   name: bloom-desktop-macos-12
                   path: assets
 
-            - name: Downloading artifacts
-              uses: actions/download-artifact@v2
+            - name: Downloading artifacts (Linux)
+              uses: actions/download-artifact@v4
               with:
                   name: bloom-desktop-ubuntu-20.04
                   path: assets

diff --git a/firefly.diff b/firefly.diff
@@ -154,6 +154,7 @@
  delete mode 100644 packages/desktop/electron/electronApi.js
  delete mode 100644 packages/desktop/electron/ledgerApi.js
  delete mode 100644 packages/desktop/electron/lib/aboutPreload.js
+ delete mode 100644 packages/desktop/electron/lib/analytics.js
  delete mode 100644 packages/desktop/electron/lib/appUpdater.js
  delete mode 100644 packages/desktop/electron/lib/deepLinkManager.js
  delete mode 100644 packages/desktop/electron/lib/diagnostics.js
@@ -175,7 +176,6 @@
  rename packages/desktop/lib/auxiliary/popup/{helpers => actions}/modifyPopupState.ts (67%)
  delete mode 100644 packages/desktop/lib/auxiliary/popup/helpers/index.ts
  rename packages/desktop/lib/{electron.ts => electron/index.ts} (54%)
- rename packages/desktop/{electron/lib/analytics.js => lib/electron/utils/analytics.utils.ts} (82%)
  rename packages/desktop/{electron/lib/errorHandling.js => lib/electron/utils/error.utils.ts} (69%)
  delete mode 100644 packages/desktop/lib/routers/actions/openSettings.ts
  delete mode 100644 packages/desktop/lib/routers/enums/index.ts
@@ -1903,7 +1903,7 @@
  rename packages/shared/{ => src}/lib/core/market/constants/index.ts (100%)
  rename packages/shared/{ => src}/lib/core/market/constants/market-poll-interval.constant.ts (100%)
  rename packages/shared/{ => src}/lib/core/market/constants/market-simple-price-endpoint.constant.ts (100%)
- rename packages/shared/{ => src}/lib/core/market/enums/market-coin-id.enum.ts (73%)
+ rename packages/shared/{ => src}/lib/core/market/enums/market-coin-id.enum.ts (54%)
  rename packages/shared/{ => src}/lib/core/market/enums/market-currency.enum.ts (94%)
  rename packages/shared/{lib/auxiliary/icon => src/lib/core/market}/index.ts (77%)
  rename packages/shared/{ => src}/lib/core/market/interfaces/simple-prices-query-parameters.interface.ts (100%)