show link vs plane text

bloomwalletio · Feb 21, 2024 · 682b83e · 682b83e
1 parent 837edd3
commit 682b83e
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 6 deletions.
diff --git a/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte b/packages/desktop/components/popup/popups/EvmTransactionFromDappPopup.svelte
@@ -154,6 +154,7 @@
         slot="banner"
         metadata={dapp.metadata}
         {verifiedState}
+        showLink={false}
         classes="bg-surface-1 dark:bg-surface-1-dark pb-4"
     />
 

diff --git a/packages/desktop/components/popup/popups/SignMessagePopup.svelte b/packages/desktop/components/popup/popups/SignMessagePopup.svelte
@@ -72,6 +72,7 @@
         slot="banner"
         metadata={dapp.metadata}
         {verifiedState}
+        showLink={false}
         classes="bg-surface-1 dark:bg-surface-1-dark pb-4"
     />
 

diff --git a/packages/desktop/components/popup/popups/SignTypedDataPopup.svelte b/packages/desktop/components/popup/popups/SignTypedDataPopup.svelte
@@ -75,6 +75,7 @@
         slot="banner"
         metadata={dapp.metadata}
         {verifiedState}
+        showLink={false}
         classes="bg-surface-1 dark:bg-surface-1-dark pb-4"
     />
 

diff --git a/packages/desktop/components/popup/popups/SiwePopup.svelte b/packages/desktop/components/popup/popups/SiwePopup.svelte
@@ -68,7 +68,12 @@
     }}
     busy={isBusy}
 >
-    <DappInfo slot="banner" metadata={dapp.metadata} classes="bg-surface-1 dark:bg-surface-1-dark pb-4" />
+    <DappInfo
+        slot="banner"
+        metadata={dapp.metadata}
+        showLink={false}
+        classes="bg-surface-1 dark:bg-surface-1-dark pb-4"
+    />
 
     <div class="space-y-5">
         <Table

diff --git a/packages/desktop/components/popup/popups/SuccessfulDappInteraction.svelte b/packages/desktop/components/popup/popups/SuccessfulDappInteraction.svelte
@@ -19,7 +19,12 @@
         onClick: closePopup,
     }}
 >
-    <DappInfo slot="banner" metadata={dapp.metadata} classes="bg-surface-1 dark:bg-surface-1-dark pb-4" />
+    <DappInfo
+        slot="banner"
+        metadata={dapp.metadata}
+        showLink={false}
+        classes="bg-surface-1 dark:bg-surface-1-dark pb-4"
+    />
     <div slot="description">
         <div class="flex flex-col items-center justify-between gap-3">
             <SuccessSvg />

diff --git a/packages/shared/src/components/molecules/DappInfo.svelte b/packages/shared/src/components/molecules/DappInfo.svelte
@@ -1,12 +1,14 @@
 <script lang="ts">
     import { DappVerification } from '@auxiliary/wallet-connect/enums'
     import { CoreTypes } from '@walletconnect/types'
-    import { Avatar, Icon, IconName, Text } from '@bloomwalletio/ui'
+    import { Avatar, Icon, IconName, Link, Text } from '@bloomwalletio/ui'
     import { DappVerificationPill } from '@ui'
     import { VERIFICATION_ICONS } from '@auxiliary/wallet-connect/constants/verification-icons.constant'
+    import { openUrlInBrowser } from '@core/app/utils'
 
     export let metadata: CoreTypes.Metadata
     export let verifiedState: DappVerification | undefined = undefined
+    export let showLink: boolean = true
     export let classes: string = ''
 </script>
 
@@ -27,9 +29,13 @@
                     {@const { color, icon } = VERIFICATION_ICONS[verifiedState]}
                     <Icon name={icon} size="xs" textColor={color} />
                 {/if}
-                <Text type="sm" textColor="secondary" truncate>
-                    {metadata.url}
-                </Text>
+                {#if showLink}
+                    <Link text={metadata?.url} on:click={() => openUrlInBrowser(metadata.url)} />
+                {:else}
+                    <Text type="sm" textColor="secondary" truncate>
+                        {metadata.url}
+                    </Text>
+                {/if}
             </div>
         {/if}
     </div>