Merge commit 'ba8e64b0f626efc42adbf734c20f51b554a74303' into fix/fix-…

…signed-data-popup

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%)

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",

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 @@
 
 <ClickableTile
     classes="bg-surface-0 dark:bg-surface-0-dark border border-solid border-stroke dark:border-stroke-dark"
-    {disabled}
     {onClick}
 >
     <div class="w-full flex flex-row justify-between items-center p-2 gap-3">

packages/desktop/views/dashboard/drawers/dapp-config/views/ConnectedDappsDrawer.svelte

@@ -64,7 +64,7 @@
             {#if displayedDapps.length}
                 <div class="h-full flex flex-col scrollable px-6 items-start gap-3">
                     {#each displayedDapps as dapp}
-                        <DappCard {dapp} disabled={selectedIndex === 1} onClick={() => onDappCardClick(dapp)} />
+                        <DappCard {dapp} onClick={() => onDappCardClick(dapp)} />
                     {/each}
                 </div>
             {:else}

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}
+                    <Text type="body2" align="center">{localize(`${localeKey}.notConnectedToProfile`)}</Text>
                 {/if}
             </div>
         </div>

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"

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}?"

yarn.lock

@@ -4494,10 +4494,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631"
   integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==
 
-[email protected].1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-7.1.1.tgz#de4163c0cb765c03d7957eb9e0a49c7f354948c7"
-  integrity sha512-OxIR5P2mjO1PSXk44bWuQ8XtMK4dpEqpIyERCx3ewOo3I8EmbcxMPUc5ScLtQfgXtOojoMv57So4V/C02HQLsw==
+[email protected].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"
@@ -10242,10 +10242,10 @@ svelte-preprocess@^5.0.4:
     sorcery "^0.11.0"
     strip-indent "^3.0.0"
 
-[email protected].17:
-  version "4.2.17"
-  resolved "https://registry.yarnpkg.com/svelte/-/svelte-4.2.17.tgz#e8f4d70be8cac6bf4dbfa89ca2fcb1a99445933f"
-  integrity sha512-N7m1YnoXtRf5wya5Gyx3TWuTddI4nAyayyIWFojiWV5IayDYNV5i2mRp/7qNGol4DtxEYxljmrbgp1HM6hUbmQ==
+[email protected].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"