diff --git a/src/lib/components/CoinBalance.svelte b/src/lib/components/CoinBalance.svelte
index 2b9452907..f297bd575 100644
--- a/src/lib/components/CoinBalance.svelte
+++ b/src/lib/components/CoinBalance.svelte
@@ -22,7 +22,6 @@
             // Get the cursor's position relative to the viewport
             const x = event.clientX
             const y = event.clientY
-            console.log(x, y)
             WalletStore.openWallet([y, x])
         }
     }
diff --git a/src/lib/components/wallet/CurrencySelector.svelte b/src/lib/components/wallet/CurrencySelector.svelte
index bb4807f6b..2d8e20a0c 100644
--- a/src/lib/components/wallet/CurrencySelector.svelte
+++ b/src/lib/components/wallet/CurrencySelector.svelte
@@ -15,9 +15,11 @@
     }
 
     function selectCurrency(currency: Currency) {
-        selectedCurrency = currency
-        showCurrencyOptions = false
-        dispatch("currencySelected", currency)
+        if (currency.enabled) {
+            selectedCurrency = currency
+            showCurrencyOptions = false
+            dispatch("currencySelected", currency)
+        }
     }
 
     function handleClickOutside(event: MouseEvent) {
@@ -34,6 +36,13 @@
     onDestroy(() => {
         document.removeEventListener("click", handleClickOutside)
     })
+
+    // Sort currencies: enabled first, then disabled
+    $: sortedCurrencies = currencies.slice().sort((a, b) => {
+        if (a.enabled === b.enabled) return 0
+        if (a.enabled) return -1
+        return 1
+    })
 </script>
 
 <!-- svelte-ignore a11y-click-events-have-key-events -->
@@ -47,9 +56,9 @@
     {#if showCurrencyOptions}
         <ul class="options-list">
             <!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
-            {#each currencies as currency}
+            {#each sortedCurrencies as currency}
                 <!-- svelte-ignore a11y-click-events-have-key-events -->
-                <li class="option" on:click={() => selectCurrency(currency)}>
+                <li class="option {currency.enabled ? '' : 'disabled'}" on:click={() => selectCurrency(currency)}>
                     <Icon icon={currency.icon} filled />
                     <span>{currency.name}</span>
                 </li>
@@ -110,6 +119,11 @@
                     background-color: var(--primary-color);
                 }
             }
+
+            .disabled {
+                opacity: 0.5;
+                pointer-events: none;
+            }
         }
 
         :global(.svg-icon) {
diff --git a/src/lib/components/wallet/Wallet.svelte b/src/lib/components/wallet/Wallet.svelte
index 303e177f7..20331be24 100644
--- a/src/lib/components/wallet/Wallet.svelte
+++ b/src/lib/components/wallet/Wallet.svelte
@@ -12,6 +12,7 @@
     import Label from "$lib/elements/Label.svelte"
     import { WalletStore } from "$lib/state/wallet"
     import EthereumRpc from "$lib/components/wallet/platforms/ethereum/EthereumRPC.svelte"
+    import Switch from "$lib/elements/Switch.svelte"
 
     export let position = { top: 50, left: 50 } // Initial position
 
@@ -32,6 +33,7 @@
         icon: Shape
         balance: number
         address: string
+        enabled: boolean
     }
 
     let currencies: Currency[] = [
@@ -40,18 +42,42 @@
             icon: Shape.Starlight,
             balance: 12345,
             address: "z6MkqMZNLYTzkkr5JYr8jEyzKuiQmrDvjK5MZ4boECc51Nf4",
+            enabled: true,
         },
         {
             name: "Ethereum",
             icon: Shape.Ethereum,
             balance: 10.5678,
             address: "eth-address-456",
+            enabled: true,
         },
         {
             name: "Bitcoin",
             icon: Shape.Bitcoin,
             balance: 10.5678,
             address: "btc-address-789",
+            enabled: false,
+        },
+        {
+            name: "Tether (USDT)",
+            icon: Shape.Tether,
+            balance: 10.5678,
+            address: "usdt-address-000",
+            enabled: false,
+        },
+        {
+            name: "Litecoin",
+            icon: Shape.Litecoin,
+            balance: 420.69,
+            address: "ltc-address-420",
+            enabled: false,
+        },
+        {
+            name: "Solana",
+            icon: Shape.Solana,
+            balance: 44312,
+            address: "sol-address-34f",
+            enabled: false,
         },
     ]
 
@@ -95,9 +121,46 @@
         }
     }
 
+    // Adjust position to keep the wallet within viewport bounds
+    function adjustPosition() {
+        if (!container) return
+
+        // Get the wallet's dimensions
+        const walletRect = container.getBoundingClientRect()
+
+        // Get viewport dimensions
+        const viewportWidth = window.innerWidth
+        const viewportHeight = window.innerHeight
+
+        // Calculate new position if necessary
+        let newTop = position.top
+        let newLeft = position.left
+
+        if (walletRect.right > viewportWidth) {
+            newLeft = viewportWidth - walletRect.width
+            if (newLeft < 0) newLeft = 0
+        }
+
+        if (walletRect.bottom > viewportHeight) {
+            newTop = viewportHeight - walletRect.height
+            if (newTop < 0) newTop = 0
+        }
+
+        // Update position if it has changed
+        if (newTop !== position.top || newLeft !== position.left) {
+            position.top = newTop
+            position.left = newLeft
+        }
+    }
+
     onMount(() => {
-        // Delay adding the event listener to the next event loop tick
+        // Adjust position after the component has been rendered
         setTimeout(() => {
+            adjustPosition()
+
+            // Add event listener for window resize to adjust position dynamically
+            window.addEventListener("resize", adjustPosition)
+
             if (!outsideClickListenerAdded) {
                 document.addEventListener("mousedown", handleClickOutside)
                 outsideClickListenerAdded = true
@@ -111,10 +174,12 @@
             document.removeEventListener("mousedown", handleClickOutside)
             outsideClickListenerAdded = false
         }
+
+        window.removeEventListener("resize", adjustPosition)
     })
 </script>
 
-<div bind:this={container} data-cy="wallet" class="wallet" style="top: {position.top}px; left: {position.left}px; position: absolute;">
+<div bind:this={container} data-cy="wallet" class="wallet" style="top: {position.top}px; left: {position.left}px;">
     <!-- Toolbar -->
     <Toolbar bind:walletPosition={position} />
 
@@ -125,9 +190,17 @@
             <Icon icon={Shape.History} />
         </Button>
     </div>
+
     <EthereumRpc />
 
     <BalanceDisplay selectedCurrency={selectedCurrency} />
+
+    <div class="show-on-profile">
+        <Label text={`Display ${selectedCurrency.name} on profile`} />
+
+        <Switch small />
+    </div>
+
     <ActionButtons on:send={handleSend} on:receive={handleReceive} activeButton={currentView} />
 
     {#if currentView === ViewMode.Receive}
@@ -179,6 +252,13 @@
             gap: var(--gap);
             align-items: center;
         }
+
+        .show-on-profile {
+            display: inline-flex;
+            align-items: center;
+            justify-content: center;
+            gap: var(--gap);
+        }
     }
 
     .scanned-result {
diff --git a/src/lib/components/wallet/platforms/ethereum/EthereumRPC.svelte b/src/lib/components/wallet/platforms/ethereum/EthereumRPC.svelte
index 0c481ed3c..0c1bf83cc 100644
--- a/src/lib/components/wallet/platforms/ethereum/EthereumRPC.svelte
+++ b/src/lib/components/wallet/platforms/ethereum/EthereumRPC.svelte
@@ -16,10 +16,8 @@
     async function initializeProvider() {
         if (typeof ethereum === "undefined") {
             console.log("MetaMask not installed; using read-only defaults")
-            provider = ethers.getDefaultProvider()
         } else {
             browserProvider = new BrowserProvider(ethereum)
-            provider = browserProvider
 
             try {
                 await ethereum.request({ method: "eth_requestAccounts" })
diff --git a/src/lib/types/wallet.ts b/src/lib/types/wallet.ts
index ab3b63648..d152e0713 100644
--- a/src/lib/types/wallet.ts
+++ b/src/lib/types/wallet.ts
@@ -5,4 +5,5 @@ export interface Currency {
     icon: Shape
     balance: number
     address: string
+    enabled: boolean
 }