diff --git a/.github/workflows/build-and-release-desktop.yml b/.github/workflows/build-and-release-desktop.yml index aceeb5c7311..f0e8d9f4273 100644 --- a/.github/workflows/build-and-release-desktop.yml +++ b/.github/workflows/build-and-release-desktop.yml @@ -57,7 +57,7 @@ jobs: needs: [setup] strategy: matrix: - os: [ubuntu-20.04, macos-11, windows-2019] + os: [ubuntu-20.04, macos-12, windows-2019] fail-fast: true env: VERSION: ${{ needs.setup.outputs.version }} @@ -96,7 +96,7 @@ 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: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' - name: Install required packages (Linux) run: | @@ -146,7 +146,7 @@ jobs: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} working-directory: packages/desktop - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' - name: Build Electron app (Windows) run: yarn compile:${env:STAGE}:win @@ -185,7 +185,7 @@ jobs: - name: Compute checksums (macOS) run: for i in `ls | grep 'firefly-*'` ; do shasum -a 256 $i | awk {'print $1'} > $i.sha256 ; done working-directory: packages/desktop/out - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' - name: Compute checksums (Windows) run: Get-ChildItem "." -Filter firefly-* | Foreach-Object { $(Get-FileHash -Path $_.FullName -Algorithm SHA256).Hash | Set-Content ($_.FullName + '.sha256') } @@ -224,7 +224,7 @@ jobs: - name: Downloading artifacts uses: actions/download-artifact@v2 with: - name: firefly-desktop-macos-11 + name: firefly-desktop-macos-12 path: assets - name: Downloading artifacts diff --git a/.github/workflows/build-desktop-test.v1.yml b/.github/workflows/build-desktop-test.v1.yml index 7376868642d..46dfd772a54 100644 --- a/.github/workflows/build-desktop-test.v1.yml +++ b/.github/workflows/build-desktop-test.v1.yml @@ -11,7 +11,7 @@ jobs: if: ${{ always() }} strategy: matrix: - os: [ubuntu-18.04, macos-11, windows-2019] + os: [ubuntu-18.04, macos-12, windows-2019] fail-fast: true env: VERSION: '1.7.2-test' @@ -51,7 +51,7 @@ jobs: - name: Set deployment target (macOS) run: echo "MACOSX_DEPLOYMENT_TARGET=10.12" >> $GITHUB_ENV - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' - name: Install required packages (Linux) run: | @@ -83,7 +83,7 @@ jobs: - name: Install Sentry CLI # Yarn has issues putting binaries in the PATH on Windows run: npm i -g @sentry/cli - if: ${{ startsWith(github.ref, 'refs/tags/desktop') && matrix.os != 'macos-11' }} + if: ${{ startsWith(github.ref, 'refs/tags/desktop') && matrix.os != 'macos-12' }} # - name: Strip backend debug info and upload to Sentry (Linux) # run: | @@ -131,7 +131,7 @@ jobs: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} working-directory: packages/desktop - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' - name: Build Electron app (Windows) run: yarn compile:${env:STAGE}:win @@ -170,7 +170,7 @@ jobs: - name: Compute checksums (macOS) run: for i in `ls | grep 'firefly-desktop*'` ; do shasum -a 256 $i | awk {'print $1'} > $i.sha256 ; done working-directory: packages/desktop/out - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' - name: Compute checksums (Windows) run: Get-ChildItem "." -Filter firefly-desktop* | Foreach-Object { $(Get-FileHash -Path $_.FullName -Algorithm SHA256).Hash | Set-Content ($_.FullName + '.sha256') } diff --git a/.github/workflows/build-desktop-test.v2.yml b/.github/workflows/build-desktop-test.v2.yml index 77f91e98f97..93a3b7749ae 100644 --- a/.github/workflows/build-desktop-test.v2.yml +++ b/.github/workflows/build-desktop-test.v2.yml @@ -11,7 +11,7 @@ jobs: if: ${{ always() }} strategy: matrix: - os: [ ubuntu-20.04, macos-11, windows-2019 ] + os: [ ubuntu-20.04, macos-12, windows-2019 ] fail-fast: true env: VERSION: '2.1.3-test' @@ -50,7 +50,7 @@ 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: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' - name: Install required packages (Linux) run: | @@ -100,7 +100,7 @@ jobs: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} working-directory: packages/desktop - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' - name: Build Electron app (Windows) run: yarn compile:${env:STAGE}:win diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index 7caf6a0bd3d..9250391c63b 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -11,7 +11,7 @@ on: required: true type: choice options: - - macos-11 + - macos-12 - ubuntu-20.04 - windows-2019 stage: @@ -68,7 +68,7 @@ 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: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' - name: Install required packages (Linux) run: | @@ -118,7 +118,7 @@ jobs: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} working-directory: packages/desktop - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' - name: Build Electron app (Windows) run: yarn compile:${env:STAGE}:win @@ -157,7 +157,7 @@ jobs: - name: Compute checksums (macOS) run: for i in `ls | grep 'firefly-*'` ; do shasum -a 256 $i | awk {'print $1'} > $i.sha256 ; done working-directory: packages/desktop/out - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' - name: Compute checksums (Windows) run: Get-ChildItem "." -Filter firefly-* | Foreach-Object { $(Get-FileHash -Path $_.FullName -Algorithm SHA256).Hash | Set-Content ($_.FullName + '.sha256') } diff --git a/package.json b/package.json index 63c61c87398..7ebc39e22bb 100644 --- a/package.json +++ b/package.json @@ -5,10 +5,10 @@ "packages/shared" ], "devDependencies": { - "@babel/eslint-parser": "^7.22.15", + "@babel/eslint-parser": "^7.24.7", "@types/node": "^18.15.11", "@typescript-eslint/eslint-plugin": "^5.58.0", - "@typescript-eslint/parser": "^5.57.1", + "@typescript-eslint/parser": "^5.62.0", "eslint": "^8.42.0", "eslint-plugin-security": "^1.4.0", "eslint-plugin-svelte3": "^4.0.0", diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 9623658ae92..1934593d374 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Firefly IOTA", - "version": "2.0.11", + "version": "2.0.12", "description": "Official wallet application of Shimmer", "main": "public/build/main.js", "repository": "git@github.com:iotaledger/firefly.git", @@ -44,10 +44,10 @@ "devDependencies": { "@sentry/webpack-plugin": "^2.8.0", "@tsconfig/svelte": "^4.0.1", - "@types/webpack": "^5.28.1", - "copy-webpack-plugin": "^11.0.0", + "@types/webpack": "^5.28.5", + "copy-webpack-plugin": "^12.0.2", "cross-env": "^7.0.2", - "css-loader": "^6.7.3", + "css-loader": "^7.1.1", "electron": "27.0.2", "electron-builder": "^24.6.4", "esbuild-loader": "^4.0.2", @@ -56,10 +56,10 @@ "node-loader": "^2.0.0", "npm-run-all": "^4.1.5", "postcss-url": "^10.1.2", - "ts-node": "^10.9.1", + "ts-node": "^10.9.2", "typescript": "^5.0.3", - "webpack": "^5.82.0", + "webpack": "^5.89.0", "webpack-cli": "^5.1.4", - "webpack-dev-server": "^4.0.0" + "webpack-dev-server": "^5.0.4" } } diff --git a/packages/shared/components/labels/TogglableAssetBalanceLabel.svelte b/packages/shared/components/labels/TogglableAssetBalanceLabel.svelte index 831aa4f7fb5..d754a2da49b 100644 --- a/packages/shared/components/labels/TogglableAssetBalanceLabel.svelte +++ b/packages/shared/components/labels/TogglableAssetBalanceLabel.svelte @@ -3,12 +3,15 @@ import { formatTokenAmountBestMatch, IAsset } from '@core/wallet' import { formatCurrency, localize } from '@core/i18n' import { getMarketAmountFromAssetValue } from '@core/market/utils' + import { NetworkId } from '@core/network' + import { activeProfile } from '@core/profile' export let asset: IAsset $: availableMarketValue = getMarketAmountFromAssetValue(asset?.balance?.available, asset) $: totalMarketValue = getMarketAmountFromAssetValue(asset?.balance?.total, asset) $: disabled = Number.isNaN(totalMarketValue) || Number.isNaN(availableMarketValue) + $: isCustomNetwork = $activeProfile?.network?.id === NetworkId.Custom let isToggled = false function toggle(): void { @@ -20,16 +23,17 @@