Merge branch 'develop' into generate-diff-2024-06-28

bloomwalletio · Jul 2, 2024 · ba331e9 · ba331e9
2 parents 8ea3db6 + 64c196e
commit ba331e9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 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
@@ -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">

diff --git 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}
                 <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}

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

diff --git 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}?"
-Original file line number
+Diff line change
@@ Expand Up / @@ -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>
@@ Expand Down @@