diff --git a/packages/extension/src/libs/recently-sent-addresses/index.ts b/packages/extension/src/libs/recently-sent-addresses/index.ts
new file mode 100644
index 000000000..73f9a56ed
--- /dev/null
+++ b/packages/extension/src/libs/recently-sent-addresses/index.ts
@@ -0,0 +1,41 @@
+import { InternalStorageNamespace } from "@/types/provider";
+import BrowserStorage from "../common/browser-storage";
+import { IState, } from "./types";
+import { NetworkNames } from "@enkryptcom/types";
+import { BaseNetwork } from "@/types/base-network";
+
+class RecentlySentAddressesState {
+  #storage: BrowserStorage
+
+  constructor() {
+    this.#storage = new BrowserStorage(
+      InternalStorageNamespace.recentlySentAddresses,
+    );
+  }
+
+  async addRecentlySentAddress(
+    network: Pick<BaseNetwork, 'name' | 'displayAddress'>,
+    address: string,
+  ): Promise<void> {
+    const key = network.name
+    const state: IState | undefined = await this.#storage.get(key)
+    const newState: IState = {
+      ...state,
+      addresses: Array.from(new Set([
+        network.displayAddress(address),
+        ...(state?.addresses ?? []),
+      ])).slice(0, 5),
+    }
+    await this.#storage.set(key, newState)
+  }
+
+  async getRecentlySentAddresses(networkName: NetworkNames): Promise<string[]> {
+    const key = networkName
+    const out: IState | undefined = await this.#storage.get(key)
+    if (!out) return []
+    return out.addresses
+  }
+}
+
+export default RecentlySentAddressesState
+
diff --git a/packages/extension/src/libs/recently-sent-addresses/types.ts b/packages/extension/src/libs/recently-sent-addresses/types.ts
new file mode 100644
index 000000000..44976940a
--- /dev/null
+++ b/packages/extension/src/libs/recently-sent-addresses/types.ts
@@ -0,0 +1,3 @@
+export type IState = {
+  addresses: string[]
+}
diff --git a/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue b/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue
index 43b4e805a..bb8003b1c 100644
--- a/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue
@@ -169,6 +169,7 @@ import { getTxInfo as getBTCTxInfo } from '@/providers/bitcoin/libs/utils';
 import { NFTItem, NFTItemWithCollectionName, NFTType } from '@/types/nft';
 import { trackSendEvents } from '@/libs/metrics';
 import { SendEventType } from '@/libs/metrics/types';
+import RecentlySentAddressesState from '@/libs/recently-sent-addresses';
 
 const props = defineProps({
   network: {
@@ -428,7 +429,14 @@ const selectNFT = (item: NFTItemWithCollectionName) => {
   isOpenSelectNft.value = false;
 };
 
+const recentlySentAddresses = new RecentlySentAddressesState();
+
 const sendAction = async () => {
+  await recentlySentAddresses.addRecentlySentAddress(
+    props.network,
+    addressTo.value,
+  );
+
   const keyring = new PublicKeyRing();
   const fromAccountInfo = await keyring.getAccount(addressFrom.value);
   const currentFee = toBN(
diff --git a/packages/extension/src/providers/common/ui/send-transaction/nft-select-list/components/nft-select-list-item.vue b/packages/extension/src/providers/common/ui/send-transaction/nft-select-list/components/nft-select-list-item.vue
index 06e126c82..4d5f9f9d3 100644
--- a/packages/extension/src/providers/common/ui/send-transaction/nft-select-list/components/nft-select-list-item.vue
+++ b/packages/extension/src/providers/common/ui/send-transaction/nft-select-list/components/nft-select-list-item.vue
@@ -1,22 +1,14 @@
 <template>
   <a class="nft-select-list__token" @click="$emit('selectNft', item)">
     <div class="nft-select-list__token-info">
-      <img :src="item.image" />
+      <img :src="item.image" @error="imageLoadError" />
 
       <div class="nft-select-list__token-info-name">
         <h4>
-          {{
-            item.name.length > 40
-              ? item.name.substring(0, 40) + '...'
-              : item.name
-          }}
+          {{ $filters.truncate(item.name, 25) }}
         </h4>
         <p>
-          {{
-            item.collectionName.length > 50
-              ? item.collectionName.substring(0, 50) + '...'
-              : item.collectionName
-          }}
+          {{ $filters.truncate(item.collectionName, 50) }}
         </p>
       </div>
     </div>
@@ -26,6 +18,7 @@
 <script setup lang="ts">
 import { PropType } from 'vue';
 import { NFTItemWithCollectionName } from '@/types/nft';
+import { imageLoadError } from '@/ui/action/utils/misc';
 
 defineEmits<{
   (e: 'selectNft', data: NFTItemWithCollectionName): void;
diff --git a/packages/extension/src/providers/common/ui/send-transaction/send-address-item.vue b/packages/extension/src/providers/common/ui/send-transaction/send-address-item.vue
index cb940ce1e..8c845e78c 100644
--- a/packages/extension/src/providers/common/ui/send-transaction/send-address-item.vue
+++ b/packages/extension/src/providers/common/ui/send-transaction/send-address-item.vue
@@ -7,7 +7,7 @@
       <img :src="network.identicon(network.displayAddress(account.address))" />
 
       <div class="send-address-item__name">
-        <h4>{{ account.name }}</h4>
+        <h4 v-if="account.name != null">{{ account.name }}</h4>
         <p>
           {{
             $filters.replaceWithEllipsis(
@@ -32,13 +32,17 @@ import { EnkryptAccount } from '@enkryptcom/types';
 const emit = defineEmits<{
   (e: 'selected:account', address: string): void;
 }>();
+
 defineProps({
   network: {
     type: Object as PropType<BaseNetwork>,
     default: () => ({}),
   },
   account: {
-    type: Object as PropType<EnkryptAccount>,
+    type: Object as PropType<{
+      name?: string;
+      address: string;
+    }>,
     default: () => {
       return {};
     },
diff --git a/packages/extension/src/providers/common/ui/send-transaction/send-contacts-list.vue b/packages/extension/src/providers/common/ui/send-transaction/send-contacts-list.vue
index b44d3f578..9826bf675 100644
--- a/packages/extension/src/providers/common/ui/send-transaction/send-contacts-list.vue
+++ b/packages/extension/src/providers/common/ui/send-transaction/send-contacts-list.vue
@@ -9,7 +9,10 @@
         class="send-contacts-list__scroll-area"
         :settings="scrollSettings({ suppressScrollX: true })"
       >
-        <div v-if="!isMyAddress" class="send-contacts-list__block">
+        <div
+          v-if="recentlySentAddresses && !isMyAddress"
+          class="send-contacts-list__block"
+        >
           <div class="send-contacts-list__buttons">
             <base-button title="Send to my address" :click="sendToMyAddress" />
 
@@ -20,7 +23,31 @@
               <paste-icon /> Paste
             </a>
           </div>
-          <h3>Recent</h3>
+          <template v-if="recentlySentAddresses.length">
+            <h3>Recent</h3>
+            <div class="send-contacts-list__list">
+              <send-address-item
+                v-for="(recentAddress, index) in recentlySentAddresses"
+                :key="index"
+                :account="{
+                  address: recentAddress,
+                  name: accountInfo.activeAccounts.find(
+                    account =>
+                      network.displayAddress(account.address) ===
+                      network.displayAddress(recentAddress),
+                  )?.name,
+                }"
+                :network="network"
+                v-bind="$attrs"
+                :is-checked="
+                  !!address &&
+                  network.displayAddress(address) ===
+                    network.displayAddress(recentAddress)
+                "
+              />
+            </div>
+          </template>
+          <h3>My accounts</h3>
           <div class="send-contacts-list__list">
             <send-address-item
               v-for="(account, index) in accountInfo.activeAccounts"
@@ -28,7 +55,11 @@
               :account="account"
               :network="network"
               v-bind="$attrs"
-              :is-checked="address == account.address"
+              :is-checked="
+                !!address &&
+                network.displayAddress(address) ===
+                  network.displayAddress(account.address)
+              "
             />
           </div>
         </div>
@@ -39,7 +70,6 @@
             </a>
             <h4>My accounts</h4>
           </div>
-
           <div class="send-contacts-list__list">
             <send-address-item
               v-for="(account, index) in accountInfo.activeAccounts"
@@ -47,7 +77,11 @@
               :account="account"
               :network="network"
               v-bind="$attrs"
-              :is-checked="address == account.address"
+              :is-checked="
+                !!address &&
+                network.displayAddress(address) ===
+                  network.displayAddress(account.address)
+              "
             />
           </div>
         </div>
@@ -57,7 +91,7 @@
 </template>
 
 <script setup lang="ts">
-import { PropType, ref } from 'vue';
+import { onMounted, PropType, ref } from 'vue';
 import SendAddressItem from './send-address-item.vue';
 import CustomScrollbar from '@action/components/custom-scrollbar/index.vue';
 import BaseButton from '@action/components/base-button/index.vue';
@@ -66,6 +100,7 @@ import scrollSettings from '@/libs/utils/scroll-settings';
 import { BaseNetwork } from '@/types/base-network';
 import PasteIcon from '@action/icons/actions/paste.vue';
 import ArrowBack from '@action/icons/common/arrow-back.vue';
+import RecentlySentAddressesState from '@/libs/recently-sent-addresses';
 
 const emit = defineEmits<{
   (e: 'update:pasteFromClipboard'): void;
@@ -74,7 +109,7 @@ const emit = defineEmits<{
 
 const isMyAddress = ref(false);
 
-defineProps({
+const props = defineProps({
   showAccounts: Boolean,
   accountInfo: {
     type: Object as PropType<AccountsHeaderData>,
@@ -90,6 +125,36 @@ defineProps({
   },
 });
 
+const recentlySentAddressesState = new RecentlySentAddressesState();
+
+const recentlySentAddresses = ref<null | string[]>(null);
+
+onMounted(async function () {
+  let timedOut = false;
+  const timeout = setTimeout(function () {
+    console.error('Timed out getting recently sent addresses');
+    recentlySentAddresses.value = [];
+    timedOut = true;
+  }, 500);
+  try {
+    const addresses = await recentlySentAddressesState.getRecentlySentAddresses(
+      props.network.name,
+    );
+    if (!timedOut) {
+      recentlySentAddresses.value = Array.from(
+        new Set(
+          addresses.map(address => props.network.displayAddress(address)),
+        ),
+      );
+    }
+  } catch (err) {
+    console.error('Error getting recently sent addresses', err);
+    recentlySentAddresses.value = [];
+  } finally {
+    clearTimeout(timeout);
+  }
+});
+
 const close = () => {
   emit('close', false);
 };
diff --git a/packages/extension/src/providers/common/ui/send-transaction/send-nft-select.vue b/packages/extension/src/providers/common/ui/send-transaction/send-nft-select.vue
index 809fcbb3d..82df0bd42 100644
--- a/packages/extension/src/providers/common/ui/send-transaction/send-nft-select.vue
+++ b/packages/extension/src/providers/common/ui/send-transaction/send-nft-select.vue
@@ -2,22 +2,14 @@
   <div class="send-nft-select__wrap">
     <a class="send-nft-select" @click="$emit('toggleSelect', item.id !== '')">
       <div class="send-nft-select__image">
-        <img v-if="item.image !== ''" :src="item.image" alt="" />
+        <img :src="item.image" alt="" @error="imageLoadError" />
       </div>
       <div class="send-nft-select__info">
         <h5>
-          {{
-            item.name.length > 25
-              ? item.name.substring(0, 25) + '...'
-              : item.name
-          }}
+          {{ $filters.truncate(item.name, 25) }}
         </h5>
         <p>
-          {{
-            item.collectionName.length > 50
-              ? item.collectionName.substring(0, 50) + '...'
-              : item.collectionName
-          }}
+          {{ $filters.truncate(item.collectionName, 50) }}
         </p>
       </div>
 
@@ -43,6 +35,7 @@
 import { PropType } from 'vue';
 import SwitchArrow from '@action/icons/header/switch_arrow.vue';
 import { NFTItemWithCollectionName } from '@/types/nft';
+import { imageLoadError } from '@/ui/action/utils/misc';
 
 defineEmits<{
   (e: 'toggleSelect', val: boolean): void;
diff --git a/packages/extension/src/providers/ethereum/networks/arb-nova.ts b/packages/extension/src/providers/ethereum/networks/arb-nova.ts
index 527404a50..7c299eb0d 100644
--- a/packages/extension/src/providers/ethereum/networks/arb-nova.ts
+++ b/packages/extension/src/providers/ethereum/networks/arb-nova.ts
@@ -3,6 +3,7 @@ import { CoingeckoPlatform, NetworkNames } from '@enkryptcom/types';
 import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network';
 import assetsInfoHandler from '@/providers/ethereum/libs/assets-handlers/assetinfo-mew';
 import shNFTHandler from '@/libs/nft-handlers/simplehash';
+import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler';
 
 const arbNovaOptions: EvmNetworkOptions = {
   name: NetworkNames.ArbitrumNova,
@@ -20,7 +21,7 @@ const arbNovaOptions: EvmNetworkOptions = {
   coingeckoPlatform: CoingeckoPlatform.ArbitrumNova,
   assetsInfoHandler,
   NFTHandler: shNFTHandler,
-  activityHandler: () => Promise.resolve([]),
+  activityHandler: wrapActivityHandler(() => Promise.resolve([])),
 };
 
 const arb = new EvmNetwork(arbNovaOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/bsc.ts b/packages/extension/src/providers/ethereum/networks/bsc.ts
index 1c39b730f..7eaebd53c 100644
--- a/packages/extension/src/providers/ethereum/networks/bsc.ts
+++ b/packages/extension/src/providers/ethereum/networks/bsc.ts
@@ -23,7 +23,7 @@ const bscOptions: EvmNetworkOptions = {
   basePath: "m/44'/714'",
   NFTHandler: shNFTHandler,
   assetsInfoHandler,
-  activityHandler: wrapActivityHandler(EtherscanActivity),
+  activityHandler: wrapActivityHandler(() => Promise.resolve([])),
 };
 
 const bsc = new EvmNetwork(bscOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/holesky.ts b/packages/extension/src/providers/ethereum/networks/holesky.ts
index f15cb90cd..cf5eac096 100644
--- a/packages/extension/src/providers/ethereum/networks/holesky.ts
+++ b/packages/extension/src/providers/ethereum/networks/holesky.ts
@@ -1,6 +1,7 @@
 import icon from './icons/eth.svg';
 import { NetworkNames } from '@enkryptcom/types';
 import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network';
+import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler';
 
 const holeskyOptions: EvmNetworkOptions = {
   name: NetworkNames.Holesky,
@@ -14,7 +15,7 @@ const holeskyOptions: EvmNetworkOptions = {
   currencyNameLong: 'Holesky',
   node: 'wss://nodes.mewapi.io/ws/holesky',
   icon,
-  activityHandler: () => Promise.resolve([]),
+  activityHandler: wrapActivityHandler(() => Promise.resolve([])),
 };
 
 const holesky = new EvmNetwork(holeskyOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/op-bnb.ts b/packages/extension/src/providers/ethereum/networks/op-bnb.ts
index 330ad7a63..a76288bac 100644
--- a/packages/extension/src/providers/ethereum/networks/op-bnb.ts
+++ b/packages/extension/src/providers/ethereum/networks/op-bnb.ts
@@ -3,6 +3,7 @@ import { CoingeckoPlatform, NetworkNames } from '@enkryptcom/types';
 import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network';
 import assetsInfoHandler from '@/providers/ethereum/libs/assets-handlers/assetinfo-mew';
 import shNFTHandler from '@/libs/nft-handlers/simplehash';
+import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler';
 
 const opBnbOptions: EvmNetworkOptions = {
   name: NetworkNames.OpBNB,
@@ -20,7 +21,7 @@ const opBnbOptions: EvmNetworkOptions = {
   coingeckoPlatform: CoingeckoPlatform.OpBNB,
   assetsInfoHandler,
   NFTHandler: shNFTHandler,
-  activityHandler: () => Promise.resolve([]),
+  activityHandler: wrapActivityHandler(() => Promise.resolve([])),
 };
 
 const op = new EvmNetwork(opBnbOptions);
diff --git a/packages/extension/src/providers/ethereum/networks/palm.ts b/packages/extension/src/providers/ethereum/networks/palm.ts
index 9b3e66fcf..12f2d37c7 100644
--- a/packages/extension/src/providers/ethereum/networks/palm.ts
+++ b/packages/extension/src/providers/ethereum/networks/palm.ts
@@ -2,6 +2,7 @@ import icon from './icons/palm.svg';
 import { NetworkNames } from '@enkryptcom/types';
 import { EvmNetwork, EvmNetworkOptions } from '../types/evm-network';
 import shNFTHandler from '@/libs/nft-handlers/simplehash';
+import wrapActivityHandler from '@/libs/activity-state/wrap-activity-handler';
 
 // Palm network has an API but it seems broken (DNS won't resolve)
 // @see https://palm.chainlens.com/api/swagger-ui/index.html
@@ -20,7 +21,7 @@ const palmNetworkOptions: EvmNetworkOptions = {
   icon,
   coingeckoID: 'palm-ai',
   NFTHandler: shNFTHandler,
-  activityHandler: () => Promise.resolve([]),
+  activityHandler: wrapActivityHandler(() => Promise.resolve([])),
 };
 
 const palmNetwork = new EvmNetwork(palmNetworkOptions);
diff --git a/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue b/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue
index 5f40f9f28..17a4f0bd6 100644
--- a/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/ethereum/ui/send-transaction/index.vue
@@ -171,6 +171,7 @@ import { GenericNameResolver, CoinType } from '@/libs/name-resolver';
 import { NetworkNames } from '@enkryptcom/types';
 import { trackSendEvents } from '@/libs/metrics';
 import { SendEventType } from '@/libs/metrics/types';
+import RecentlySentAddressesState from '@/libs/recently-sent-addresses';
 
 const props = defineProps({
   network: {
@@ -225,6 +226,18 @@ const hasEnoughBalance = computed(() => {
     return false;
   }
 
+  // check if user has enough balance for fees
+  if (
+    toBN(
+      toBase(
+        gasCostValues.value[selectedFee.value].nativeValue,
+        props.network.decimals,
+      ),
+    ).gt(toBN(nativeBalance.value))
+  ) {
+    return false;
+  }
+
   return toBN(selectedAsset.value.balance ?? '0').gte(
     toBN(toBase(sendAmount.value ?? '0', selectedAsset.value.decimals!)),
   );
@@ -710,7 +723,14 @@ const selectFee = (type: GasPriceTypes) => {
     updateTransactionFees(Tx.value);
 };
 
+const recentlySentAddresses = new RecentlySentAddressesState();
+
 const sendAction = async () => {
+  await recentlySentAddresses.addRecentlySentAddress(
+    props.network,
+    addressTo.value,
+  );
+
   const keyring = new PublicKeyRing();
   const fromAccountInfo = await keyring.getAccount(
     addressFrom.value.toLowerCase(),
diff --git a/packages/extension/src/providers/kadena/ui/send-transaction/index.vue b/packages/extension/src/providers/kadena/ui/send-transaction/index.vue
index 894145ebc..89ac7c7a0 100644
--- a/packages/extension/src/providers/kadena/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/kadena/ui/send-transaction/index.vue
@@ -127,6 +127,7 @@ import getUiPath from '@/libs/utils/get-ui-path';
 import { ProviderName } from '@/types/provider';
 import Browser from 'webextension-polyfill';
 import { ICommandResult } from '@kadena/client';
+import RecentlySentAddressesState from '@/libs/recently-sent-addresses';
 
 const props = defineProps({
   network: {
@@ -466,7 +467,14 @@ const isDisabled = computed(() => {
   );
 });
 
+const recentlySentAddresses = new RecentlySentAddressesState();
+
 const sendAction = async () => {
+  await recentlySentAddresses.addRecentlySentAddress(
+    props.network,
+    addressTo.value,
+  );
+
   const keyring = new PublicKeyRing();
   const fromAccount = await keyring.getAccount(addressFrom.value);
   const networkApi = (await props.network.api()) as KadenaAPI;
diff --git a/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue b/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue
index bae45e7bc..38e6b6320 100644
--- a/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/polkadot/ui/send-transaction/index.vue
@@ -141,6 +141,7 @@ import { GenericNameResolver, CoinType } from '@/libs/name-resolver';
 import { trackSendEvents } from '@/libs/metrics';
 import { SendEventType } from '@/libs/metrics/types';
 import { BNType } from '@/providers/common/types';
+import RecentlySentAddressesState from '@/libs/recently-sent-addresses';
 
 const props = defineProps({
   network: {
@@ -497,7 +498,14 @@ const isDisabled = computed(() => {
   return isDisabled;
 });
 
+const recentlySentAddresses = new RecentlySentAddressesState();
+
 const sendAction = async () => {
+  await recentlySentAddresses.addRecentlySentAddress(
+    props.network,
+    addressTo.value,
+  );
+
   const sendAmount = toBase(amount.value!, selectedAsset.value.decimals!);
 
   const sendOptions: SendOptions | undefined = sendMax.value
diff --git a/packages/extension/src/providers/solana/networks/solana.ts b/packages/extension/src/providers/solana/networks/solana.ts
index b11e8c760..e34d3fe9e 100644
--- a/packages/extension/src/providers/solana/networks/solana.ts
+++ b/packages/extension/src/providers/solana/networks/solana.ts
@@ -25,6 +25,6 @@ const solanaOptions: SolanaNetworkOptions = {
   coingeckoPlatform: CoingeckoPlatform.Solana,
 };
 
-const bitcoin = new SolanaNetwork(solanaOptions);
+const solana = new SolanaNetwork(solanaOptions);
 
-export default bitcoin;
+export default solana;
diff --git a/packages/extension/src/providers/solana/ui/send-transaction/index.vue b/packages/extension/src/providers/solana/ui/send-transaction/index.vue
index 33df4db8b..80acc2c6d 100644
--- a/packages/extension/src/providers/solana/ui/send-transaction/index.vue
+++ b/packages/extension/src/providers/solana/ui/send-transaction/index.vue
@@ -173,7 +173,7 @@ import {
 import getPriorityFees from '../libs/get-priority-fees';
 import bs58 from 'bs58';
 import SolanaAPI from '@/providers/solana/libs/api';
-import { ComputedRefSymbol } from '@vue/reactivity';
+import RecentlySentAddressesState from '@/libs/recently-sent-addresses';
 
 const props = defineProps({
   network: {
@@ -718,7 +718,14 @@ const inputAmount = (inputAmount: string) => {
   }
 };
 
+const recentlySentAddresses = new RecentlySentAddressesState();
+
 const sendAction = async () => {
+  await recentlySentAddresses.addRecentlySentAddress(
+    props.network,
+    addressTo.value,
+  );
+
   const keyring = new PublicKeyRing();
   const fromAccountInfo = await keyring.getAccount(
     addressFrom.value.toLowerCase(),
diff --git a/packages/extension/src/types/provider.ts b/packages/extension/src/types/provider.ts
index a50480a27..4d9adafb4 100644
--- a/packages/extension/src/types/provider.ts
+++ b/packages/extension/src/types/provider.ts
@@ -51,6 +51,7 @@ export enum InternalStorageNamespace {
   tokensState = 'TokensState',
   customNetworksState = 'CustomNetworksState',
   rateState = 'RateState',
+  recentlySentAddresses = 'RecentlySentAddresses',
 }
 export enum EnkryptProviderEventMethods {
   persistentEvents = 'PersistentEvents',
@@ -128,7 +129,7 @@ export abstract class BackgroundProviderInterface extends EventEmitter {
 export abstract class ProviderAPIInterface {
   abstract node: string;
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  constructor(node: string, options?: unknown) {}
+  constructor(node: string, options?: unknown) { }
   abstract init(): Promise<void>;
   abstract getBalance(address: string): Promise<string>;
   abstract getTransactionStatus(
diff --git a/packages/extension/src/ui/action/styles/color.less b/packages/extension/src/ui/action/styles/color.less
index bec40dce8..139ff62c4 100644
--- a/packages/extension/src/ui/action/styles/color.less
+++ b/packages/extension/src/ui/action/styles/color.less
@@ -12,6 +12,7 @@
 @black007: rgba(0, 0, 0, 0.07);
 @black004: rgba(0, 0, 0, 0.04);
 @white: #ffffff;
+@grayPrimary: rgba(95, 99, 104, 1);
 @gray01: rgba(95, 99, 104, 0.1);
 @gray02: rgba(95, 99, 104, 0.2);
 @white07: rgba(255, 255, 255, 0.7);
diff --git a/packages/extension/src/ui/action/types/filters.ts b/packages/extension/src/ui/action/types/filters.ts
index 7033e46bf..bce420d08 100644
--- a/packages/extension/src/ui/action/types/filters.ts
+++ b/packages/extension/src/ui/action/types/filters.ts
@@ -4,6 +4,7 @@ import {
   replaceWithEllipsis,
   formatFiatValue,
   formatFloatingPointValue,
+  truncate
 } from '../utils/filters';
 declare global {
   namespace $filters {
@@ -12,6 +13,7 @@ declare global {
       replaceWithEllipsis,
       formatFiatValue,
       formatFloatingPointValue,
+      truncate
     };
   }
 }
diff --git a/packages/extension/src/ui/action/utils/filters.ts b/packages/extension/src/ui/action/utils/filters.ts
index 017e5ff9f..9cd4a793a 100644
--- a/packages/extension/src/ui/action/utils/filters.ts
+++ b/packages/extension/src/ui/action/utils/filters.ts
@@ -16,6 +16,14 @@ export const replaceWithEllipsis = (
     value.substring(value.length - keepRight, value.length)
   );
 };
+
+
+export const truncate = (value: string, length: number): string => {
+  if (!value) return '';
+  value = value.toString();
+  return value.length > length ? value.substring(0, length) + '...' : value;
+}
+
 export const formatDuration = (
   duration: moment.Duration,
   date: number,
diff --git a/packages/extension/src/ui/action/views/asset-detail-view/index.vue b/packages/extension/src/ui/action/views/asset-detail-view/index.vue
index 1e484a44b..20353f0f7 100644
--- a/packages/extension/src/ui/action/views/asset-detail-view/index.vue
+++ b/packages/extension/src/ui/action/views/asset-detail-view/index.vue
@@ -39,6 +39,7 @@
             <sparkline-down v-if="token.priceChangePercentage < 0" />
 
             {{ token.priceChangePercentage.toFixed(2) }}%
+            <span class="asset-detail-view__last-24">Last 24h</span>
           </p>
         </div>
       </div>
@@ -156,6 +157,14 @@ const close = () => {
   height: auto;
   box-sizing: border-box;
 
+  &__last-24 {
+    font-weight: 400;
+    font-size: 12px;
+    line-height: 16px;
+    letter-spacing: 0.5px;
+    color: @grayPrimary;
+  }
+
   &__wrap {
     background: @white;
     box-shadow:
diff --git a/packages/extension/src/ui/action/views/assets-select-list/components/assets-select-list-item.vue b/packages/extension/src/ui/action/views/assets-select-list/components/assets-select-list-item.vue
index 473a908f3..af3692c3c 100644
--- a/packages/extension/src/ui/action/views/assets-select-list/components/assets-select-list-item.vue
+++ b/packages/extension/src/ui/action/views/assets-select-list/components/assets-select-list-item.vue
@@ -5,7 +5,9 @@
         <img :src="token.icon" @error="imageLoadError" />
       </div>
       <div class="assets-select-list__token-info-name">
-        <h4>{{ token.name }}</h4>
+        <h4>
+          {{ $filters.truncate(token.name, 25) }}
+        </h4>
         <p>
           {{ balance ? $filters.formatFloatingPointValue(balance).value : '~' }}
           <span>{{ token.symbol }}</span>
diff --git a/packages/extension/src/ui/action/views/network-activity/components/network-activity-transaction.vue b/packages/extension/src/ui/action/views/network-activity/components/network-activity-transaction.vue
index 1f81a6f8a..09fd0f0e5 100644
--- a/packages/extension/src/ui/action/views/network-activity/components/network-activity-transaction.vue
+++ b/packages/extension/src/ui/action/views/network-activity/components/network-activity-transaction.vue
@@ -111,11 +111,7 @@
               fromBase(activity.value, activity.token.decimals),
             ).value
           }}
-          <span>{{
-            activity.token.symbol.length > 40
-              ? activity.token.symbol.substring(0, 40) + '...'
-              : activity.token.symbol
-          }}</span>
+          <span>{{ $filters.truncate(activity.token.symbol, 40) }}</span>
         </h4>
         <p>$ {{ $filters.formatFiatValue(getFiatValue).value }}</p>
       </div>
diff --git a/packages/extension/src/ui/action/views/network-assets/index.vue b/packages/extension/src/ui/action/views/network-assets/index.vue
index e3059b847..b95cf1c4c 100644
--- a/packages/extension/src/ui/action/views/network-assets/index.vue
+++ b/packages/extension/src/ui/action/views/network-assets/index.vue
@@ -180,6 +180,28 @@ const addCustomAsset = (asset: AssetsType) => {
   height: 100%;
   box-sizing: border-box;
 
+  &__headers {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 350px;
+    height: 21px;
+    padding: 0 20px 0 65px;
+    margin: 12px 12px 0;
+    font-size: 10px;
+    color: @black06;
+    font-weight: 500;
+    line-height: 11px;
+
+    div {
+      text-align: left;
+    }
+
+    div:nth-child(2) {
+      width: 65px;
+    }
+  }
+
   &__scroll-area {
     position: relative;
     margin: auto;
diff --git a/packages/extension/src/ui/action/views/swap/components/swap-token-amount-input/components/swap-token-amount-input.vue b/packages/extension/src/ui/action/views/swap/components/swap-token-amount-input/components/swap-token-amount-input.vue
index 459434762..b086aa495 100644
--- a/packages/extension/src/ui/action/views/swap/components/swap-token-amount-input/components/swap-token-amount-input.vue
+++ b/packages/extension/src/ui/action/views/swap/components/swap-token-amount-input/components/swap-token-amount-input.vue
@@ -15,6 +15,7 @@
 
 <script setup lang="ts">
 import { computed, ref, onMounted } from 'vue';
+
 const isFocus = ref(false);
 const swapAmountInput = ref(null);
 
@@ -52,12 +53,15 @@ const props = defineProps({
     },
   },
 });
+
 onMounted(() => {
   if (swapAmountInput.value && props.autofocus) {
     (swapAmountInput.value as HTMLInputElement).focus();
   }
 });
+
 const emit = defineEmits(['update:value']);
+
 const textValue = computed({
   get: () => props.value,
   set: value => {
@@ -66,15 +70,24 @@ const textValue = computed({
     emit('update:value', fValue);
   },
 });
+
 const changeFocus = () => {
   isFocus.value = !isFocus.value;
   props.changeFocus(isFocus.value);
 };
+
 const onlyNumber = ($event: KeyboardEvent) => {
   const keyCode = $event.keyCode ? $event.keyCode : $event.which;
-  if ((keyCode < 48 || keyCode > 57) && keyCode !== 46) {
-    $event.preventDefault();
+  // Numeric
+  if (keyCode >= /* 0 */ 48 && keyCode <= /* 9 */ 57) {
+    return;
+  }
+  // Only allow a single period
+  if (keyCode === /* '.' */ 46 && textValue.value.indexOf('.') === -1) {
+    return;
   }
+  // Alphabetical (/non-numeric) or mulitple periods. Don't propagate change
+  $event.preventDefault();
 };
 </script>
 
diff --git a/packages/extension/src/ui/action/views/swap/components/swap-token-select/index.vue b/packages/extension/src/ui/action/views/swap/components/swap-token-select/index.vue
index 6e17c5560..6f1be6c1c 100644
--- a/packages/extension/src/ui/action/views/swap/components/swap-token-select/index.vue
+++ b/packages/extension/src/ui/action/views/swap/components/swap-token-select/index.vue
@@ -4,7 +4,9 @@
       <img :src="token.logoURI" alt="" @error="imageLoadError" />
     </div>
     <div class="swap-token-select__info">
-      <h5>{{ token.name }}</h5>
+      <h5>
+        {{ $filters.truncate(token.name, 25) }}
+      </h5>
       <p>
         {{
           tokenBalance
diff --git a/packages/swap/src/providers/paraswap/index.ts b/packages/swap/src/providers/paraswap/index.ts
index a3ee7f010..0dd39ed94 100644
--- a/packages/swap/src/providers/paraswap/index.ts
+++ b/packages/swap/src/providers/paraswap/index.ts
@@ -198,7 +198,7 @@ class ParaSwap extends ProviderClass {
       .then((res) => res.json())
       .then(async (response: ParaswapResponseType) => {
         if (response.error) {
-          console.error(response.error);
+          console.error("Error in swap response from ParaSwap", response.error);
           return Promise.resolve(null);
         }
         const transactions: EVMTransaction[] = [];
@@ -245,7 +245,7 @@ class ParaSwap extends ProviderClass {
         };
       })
       .catch((e) => {
-        console.error(e);
+        console.error("Error generating swap from ParaSwap", e);
         return Promise.resolve(null);
       });
   }
@@ -283,6 +283,18 @@ class ParaSwap extends ProviderClass {
       .then((j) => j.json())
       .then(async (jsonRes) => {
         if (!jsonRes) return null;
+        // Note: sometimes `jsonRes.priceRoute` is undefined and "error" is set instead
+        if (!jsonRes.priceRoute) {
+          if (jsonRes.error) {
+            // Sometimes ParaSwap returns this error: "No routes found with enough liquidity"
+            throw new Error(`ParaSwap error getting prices: ${jsonRes.error}`);
+          } else {
+            // Didn't have the expected "priceRoute" property
+            throw new Error(
+              `ParaSwap error getting prices, no "priceRoute" property on response: ${JSON.stringify(jsonRes)}`,
+            );
+          }
+        }
         const res: ParaswpQuoteResponse = jsonRes.priceRoute;
         const transactions: EVMTransaction[] = [];
         if (options.fromToken.address !== NATIVE_TOKEN_ADDRESS) {
@@ -320,7 +332,7 @@ class ParaSwap extends ProviderClass {
         return response;
       })
       .catch((e) => {
-        console.error(e);
+        console.error("Error getting quote from ParaSwap", e);
         return Promise.resolve(null);
       });
   }
diff --git a/packages/swap/src/providers/rango/index.ts b/packages/swap/src/providers/rango/index.ts
index aaa4f5651..e4bc0c549 100644
--- a/packages/swap/src/providers/rango/index.ts
+++ b/packages/swap/src/providers/rango/index.ts
@@ -311,6 +311,13 @@ class Rango extends ProviderClass {
   async init(tokenList?: TokenType[]): Promise<void> {
     logger.info(`init: Initialising against ${tokenList?.length} tokens...`);
 
+    if (!Rango.isNetworkSupportedByEnkrypt(this.network)) {
+      logger.info(
+        `init: Enkrypt does not support network on Rango: ${this.network}`,
+      );
+      return;
+    }
+
     const [rangoMeta, swaplist] = await Promise.all([
       rangoClient.meta({
         excludeNonPopulars: true,
@@ -429,10 +436,16 @@ class Rango extends ProviderClass {
     return matchingRangoBlockchain;
   }
 
+  static isNetworkSupportedByEnkrypt(
+    supportedNetworkName: SupportedNetworkName,
+  ): boolean {
+    return supportedNetworkInfoByName.has(supportedNetworkName);
+  }
+
   /**
    * Is this network supported by both enkrypt and rango?
    */
-  static isNetworkSupported(
+  static isNetworkSupportedByEnkryptAndRango(
     supportedNetworkName: SupportedNetworkName,
     rangoBlockchains: ReadonlyArray<BlockchainMeta>,
   ): boolean {
diff --git a/packages/swap/src/providers/rango/supported.ts b/packages/swap/src/providers/rango/supported.ts
index 0b4f5fb10..272300fd6 100644
--- a/packages/swap/src/providers/rango/supported.ts
+++ b/packages/swap/src/providers/rango/supported.ts
@@ -1,4 +1,4 @@
-import { SupportedNetworkName, } from '../../types'
+import { SupportedNetworkName } from "../../types";
 
 export type SupportedNetworkInfo = {
   /** Standard base10 chain ID, can be obtained from `https://chainlist.org` */
@@ -179,4 +179,3 @@ export const supportedNetworkByRangoBlockchain = new Map<
     },
   ]),
 );
-
diff --git a/packages/swap/tests/changelly.test.ts b/packages/swap/tests/changelly.test.ts
index 3f9708c42..b1f9ade80 100644
--- a/packages/swap/tests/changelly.test.ts
+++ b/packages/swap/tests/changelly.test.ts
@@ -51,9 +51,7 @@ describe("Changelly Provider", () => {
       (swap?.transactions[0] as EVMTransaction).data.startsWith("0xa9059cbb"),
     ).to.be.eq(true);
     const status = await changelly.getStatus(
-      (
-        await swap!.getStatusObject({ transactions: [] })
-      ).options,
+      (await swap!.getStatusObject({ transactions: [] })).options,
     );
     expect(status).to.be.eq("pending");
   });