From 64c196e2913f1cdff7eb275537cf0167cb341833 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Tue, 2 Jul 2024 05:17:20 +0200 Subject: [PATCH 1/4] show dapp details for expired dapps (#2652) Co-authored-by: Jean Ribeiro --- .../dashboard/drawers/dapp-config/components/DappCard.svelte | 2 -- .../drawers/dapp-config/views/ConnectedDappsDrawer.svelte | 2 +- .../drawers/dapp-config/views/DappDetailsDrawer.svelte | 2 ++ packages/shared/src/locales/en.json | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte index 55bc76db15..1e010c3a9b 100644 --- a/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte +++ b/packages/desktop/views/dashboard/drawers/dapp-config/components/DappCard.svelte @@ -8,7 +8,6 @@ import { activeProfileId } from '@core/profile/stores' export let dapp: IConnectedDapp - export let disabled: boolean = false export let onClick: (() => unknown) | undefined = undefined $: networkIds = Object.values( @@ -22,7 +21,6 @@
diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectedDappsDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectedDappsDrawer.svelte index 0871b46747..45383023a6 100644 --- a/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectedDappsDrawer.svelte +++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectedDappsDrawer.svelte @@ -64,7 +64,7 @@ {#if displayedDapps.length}
{#each displayedDapps as dapp} - onDappCardClick(dapp)} /> + onDappCardClick(dapp)} /> {/each}
{:else} diff --git a/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte b/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte index 4bfb7d3d96..bfd3a5d4ff 100644 --- a/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte +++ b/packages/desktop/views/dashboard/drawers/dapp-config/views/DappDetailsDrawer.svelte @@ -50,6 +50,8 @@ onEditNetworksClick={() => drawerRouter.goTo(DappConfigRoute.EditNetworks)} onEditAccountsClick={() => drawerRouter.goTo(DappConfigRoute.EditAccounts)} /> + {:else} + {localize(`${localeKey}.notConnectedToProfile`)} {/if}
diff --git a/packages/shared/src/locales/en.json b/packages/shared/src/locales/en.json index ea0b970d63..3ff2eed0bd 100644 --- a/packages/shared/src/locales/en.json +++ b/packages/shared/src/locales/en.json @@ -625,6 +625,7 @@ "description": "Description", "url": "URL", "verifyUrl": "Verify URL", + "notConnectedToProfile": "Not connected to this profile", "disconnect": { "title": "Disconnect", "description": "Do you want to disconnect from {dappName}?" From 870b2e0fde2c251b5bd9f79a881f1f4dcba653b9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 03:20:50 +0000 Subject: [PATCH 2/4] Generated diff for 2024-06-28 (#2677) Co-authored-by: Jean Ribeiro --- firefly.diff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firefly.diff b/firefly.diff index 317b26901c..2c78fd3596 100644 --- 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%) From c2a2b6f77f6f0a3a8cc4b9d7296e1a6d5aea6d1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 03:34:46 +0000 Subject: [PATCH 3/4] chore(deps-dev): bump css-loader in /packages/desktop (#2694) Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 7.1.1 to 7.1.2. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v7.1.1...v7.1.2) --- updated-dependencies: - dependency-name: css-loader dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jean Ribeiro --- packages/desktop/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 7d75022e34..88062f03d8 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -51,7 +51,7 @@ "autoprefixer": "10.4.16", "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", - "css-loader": "7.1.1", + "css-loader": "7.1.2", "electron": "30.0.9", "electron-builder": "24.13.3", "@electron/notarize": "2.3.0", diff --git a/yarn.lock b/yarn.lock index 3dff0f2cd9..2350ff825b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4494,10 +4494,10 @@ crypto-js@4.2.0: resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631" integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q== -css-loader@7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-7.1.1.tgz#de4163c0cb765c03d7957eb9e0a49c7f354948c7" - integrity sha512-OxIR5P2mjO1PSXk44bWuQ8XtMK4dpEqpIyERCx3ewOo3I8EmbcxMPUc5ScLtQfgXtOojoMv57So4V/C02HQLsw== +css-loader@7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-7.1.2.tgz#64671541c6efe06b0e22e750503106bdd86880f8" + integrity sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA== dependencies: icss-utils "^5.1.0" postcss "^8.4.33" From ba8e64b0f626efc42adbf734c20f51b554a74303 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 03:42:18 +0000 Subject: [PATCH 4/4] chore(deps): bump svelte from 4.2.17 to 4.2.18 in /packages/shared (#2691) Bumps [svelte](https://github.com/sveltejs/svelte/tree/HEAD/packages/svelte) from 4.2.17 to 4.2.18. - [Release notes](https://github.com/sveltejs/svelte/releases) - [Changelog](https://github.com/sveltejs/svelte/blob/svelte@4.2.18/packages/svelte/CHANGELOG.md) - [Commits](https://github.com/sveltejs/svelte/commits/svelte@4.2.18/packages/svelte) --- updated-dependencies: - dependency-name: svelte dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jean Ribeiro --- packages/shared/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/shared/package.json b/packages/shared/package.json index 9c5e969668..6e4646dd23 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -25,7 +25,7 @@ "qrious": "4.0.2", "sanitize-html": "2.13.0", "sha3": "2.1.4", - "svelte": "4.2.17", + "svelte": "4.2.18", "svelte-i18n": "4.0.0", "web3": "4.8.0", "zxcvbn": "4.4.2" diff --git a/yarn.lock b/yarn.lock index 2350ff825b..5428a2d9ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10242,10 +10242,10 @@ svelte-preprocess@^5.0.4: sorcery "^0.11.0" strip-indent "^3.0.0" -svelte@4.2.17: - version "4.2.17" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-4.2.17.tgz#e8f4d70be8cac6bf4dbfa89ca2fcb1a99445933f" - integrity sha512-N7m1YnoXtRf5wya5Gyx3TWuTddI4nAyayyIWFojiWV5IayDYNV5i2mRp/7qNGol4DtxEYxljmrbgp1HM6hUbmQ== +svelte@4.2.18: + version "4.2.18" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-4.2.18.tgz#33dbce74e83eb6dcc54dbea25f9758b1d8e8bb78" + integrity sha512-d0FdzYIiAePqRJEb90WlJDkjUEx42xhivxN8muUBmfZnP+tzUgz12DJ2hRJi8sIHCME7jeK1PTMgKPSfTd8JrA== dependencies: "@ampproject/remapping" "^2.2.1" "@jridgewell/sourcemap-codec" "^1.4.15"