From 74be68de8a035374add8d55ccc5ed55592c65aa9 Mon Sep 17 00:00:00 2001
From: ltminhthu <ltminhthu.209@gmail.com>
Date: Tue, 21 May 2024 13:40:52 +0700
Subject: [PATCH 01/35] sync

---
 apps/wallet/src/engine/runners/tezos/index.ts | 46 +++++++++++++++++--
 apps/wallet/src/engine/runners/tezos/token.ts |  5 ++
 2 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 apps/wallet/src/engine/runners/tezos/token.ts

diff --git a/apps/wallet/src/engine/runners/tezos/index.ts b/apps/wallet/src/engine/runners/tezos/index.ts
index ba66f6892..8beca0fea 100644
--- a/apps/wallet/src/engine/runners/tezos/index.ts
+++ b/apps/wallet/src/engine/runners/tezos/index.ts
@@ -1,13 +1,53 @@
+import { TezosToolkit } from '@taquito/taquito';
+import {} from '@taquito/tzip16';
+import { Networks } from '@walless/core';
+import type { PublicKeyDocument } from '@walless/store';
+import { selectors } from '@walless/store';
+import { storage } from 'utils/storage';
+
 import type { EngineConfig, Runner } from '../../types';
 
 export type TezosContext = {
-	connection: unknown;
+	connection: TezosToolkit;
 };
 
+const MAIN_NET = 'https://api.tez.ie/rpc/mainnet';
+const GHOST_NET = 'https://ghostnet.ecadinfra.com';
+
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-export const createTezosRunner = (config: EngineConfig): Runner => {
+export const createTezosRunner = async (
+	config: EngineConfig,
+): Promise<Runner> => {
+	const { networkClusters } = config;
+	const cluster = networkClusters[Networks.tezos];
+	const rpc = cluster === 'mainnet' ? MAIN_NET : GHOST_NET;
+	const ghost = GHOST_NET;
+
+	const keysResult = await storage.find<PublicKeyDocument>(selectors.tezosKeys);
+	const keys = keysResult.docs;
+
 	return {
-		start() {},
+		async start() {
+			const tokensPromises = keys.map(async (key) => {
+				const owner = key._id;
+				const connection = new TezosToolkit(rpc);
+				const tzBalance = await connection.tz.getBalance(owner);
+				const tokens = await fetch('https://api.tzkt.io/v1/tokens');
+				const balances = await fetch(
+					'https://stage.tzpro.io/v1/wallets/{address}/balances',
+				);
+				const tokensJson = await tokens.json();
+				const balancesJson = await balances.json();
+				console.log(balancesJson);
+				console.log(tokensJson);
+				console.log(tzBalance);
+
+				return tzBalance;
+			});
+			await Promise.all(tokensPromises).catch((e) => {
+				console.error(e);
+			});
+		},
 		stop() {},
 		getContext: (): TezosContext => {
 			return {} as TezosContext;
diff --git a/apps/wallet/src/engine/runners/tezos/token.ts b/apps/wallet/src/engine/runners/tezos/token.ts
new file mode 100644
index 000000000..b94901ec1
--- /dev/null
+++ b/apps/wallet/src/engine/runners/tezos/token.ts
@@ -0,0 +1,5 @@
+const constructTezosTokenDocument = async (
+	token: Token,
+	network: Network,
+	tokenMetadata: TokenMetadata,
+) => {};

From 9a2f579b9e6a7ea1edbabb662c5d509022ff11eb Mon Sep 17 00:00:00 2001
From: ltminhthu <ltminhthu.209@gmail.com>
Date: Sat, 25 May 2024 16:33:30 +0700
Subject: [PATCH 02/35] query fungible token on tezos

---
 apps/wallet/src/engine/runners/tezos/index.ts | 69 ++++++++++++++++---
 apps/wallet/src/engine/runners/tezos/token.ts | 56 +++++++++++++--
 apps/wallet/src/engine/runners/tezos/utils.ts |  7 ++
 packages/core/utils/assets.ts                 | 18 +++++
 4 files changed, 134 insertions(+), 16 deletions(-)
 create mode 100644 apps/wallet/src/engine/runners/tezos/utils.ts

diff --git a/apps/wallet/src/engine/runners/tezos/index.ts b/apps/wallet/src/engine/runners/tezos/index.ts
index 8beca0fea..113c7e50b 100644
--- a/apps/wallet/src/engine/runners/tezos/index.ts
+++ b/apps/wallet/src/engine/runners/tezos/index.ts
@@ -1,12 +1,17 @@
 import { TezosToolkit } from '@taquito/taquito';
 import {} from '@taquito/tzip16';
+import type { TezosToken } from '@walless/core';
 import { Networks } from '@walless/core';
-import type { PublicKeyDocument } from '@walless/store';
+import type { PublicKeyDocument, TokenDocument } from '@walless/store';
 import { selectors } from '@walless/store';
-import { storage } from 'utils/storage';
+import { getTokenQuote } from 'utils/api';
+import { addTokenToStorage, storage } from 'utils/storage';
 
 import type { EngineConfig, Runner } from '../../types';
 
+import { constructTezosTokenDocument, XTZ } from './token';
+import { convertTezosImageUriToUrl } from './utils';
+
 export type TezosContext = {
 	connection: TezosToolkit;
 };
@@ -14,6 +19,9 @@ export type TezosContext = {
 const MAIN_NET = 'https://api.tez.ie/rpc/mainnet';
 const GHOST_NET = 'https://ghostnet.ecadinfra.com';
 
+const TZKT_API_MAINNET = 'https://api.tzkt.io/v1';
+const TZKT_API_GHOSTNET = 'https://api.ghostnet.tzkt.io/v1';
+
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export const createTezosRunner = async (
 	config: EngineConfig,
@@ -21,7 +29,7 @@ export const createTezosRunner = async (
 	const { networkClusters } = config;
 	const cluster = networkClusters[Networks.tezos];
 	const rpc = cluster === 'mainnet' ? MAIN_NET : GHOST_NET;
-	const ghost = GHOST_NET;
+	const tzktAPI = cluster === 'mainnet' ? TZKT_API_MAINNET : TZKT_API_GHOSTNET;
 
 	const keysResult = await storage.find<PublicKeyDocument>(selectors.tezosKeys);
 	const keys = keysResult.docs;
@@ -32,15 +40,54 @@ export const createTezosRunner = async (
 				const owner = key._id;
 				const connection = new TezosToolkit(rpc);
 				const tzBalance = await connection.tz.getBalance(owner);
-				const tokens = await fetch('https://api.tzkt.io/v1/tokens');
-				const balances = await fetch(
-					'https://stage.tzpro.io/v1/wallets/{address}/balances',
+
+				const tokenBalances = await fetch(
+					`${tzktAPI}/tokens/balances?account=${owner}`,
 				);
-				const tokensJson = await tokens.json();
-				const balancesJson = await balances.json();
-				console.log(balancesJson);
-				console.log(tokensJson);
-				console.log(tzBalance);
+				const tokenBalancesJson = await tokenBalances.json();
+
+				const tzDocument = constructTezosTokenDocument({
+					...XTZ,
+					owner: key._id,
+					cluster,
+					amount: tzBalance.toString(),
+					balance: parseFloat(tzBalance.toString()) / 10 ** XTZ.decimals,
+				} as TezosToken);
+
+				const tokenDocuments: TokenDocument<TezosToken>[] = [tzDocument];
+
+				tokenBalancesJson.forEach((tokenBalance) => {
+					const tokenDocument = constructTezosTokenDocument({
+						owner: key._id,
+						network: Networks.tezos,
+						cluster,
+						tokenId: tokenBalance.token.tokenId,
+						contract: tokenBalance.token.contract,
+						tokenType: tokenBalance.token.standard,
+						decimals: tokenBalance.token.metadata.decimals,
+						symbol: tokenBalance.token.metadata.symbol,
+						name: tokenBalance.token.metadata.name,
+						amount: tokenBalance.balance,
+						balance:
+							parseFloat(tokenBalance.balance) /
+							10 ** tokenBalance.token.metadata.decimals,
+						image: convertTezosImageUriToUrl(
+							tokenBalance.token.metadata.thumbnailUri,
+						),
+					} as TezosToken);
+
+					tokenDocuments.push(tokenDocument);
+				});
+
+				for (const tokenDocument of tokenDocuments) {
+					const responseQuotes = await getTokenQuote({
+						address: `${tokenDocument.contract?.address}`,
+						network: tokenDocument.network,
+					});
+					tokenDocument.quotes = responseQuotes?.quotes;
+
+					await addTokenToStorage<TokenDocument<TezosToken>>(tokenDocument);
+				}
 
 				return tzBalance;
 			});
diff --git a/apps/wallet/src/engine/runners/tezos/token.ts b/apps/wallet/src/engine/runners/tezos/token.ts
index b94901ec1..819f7d8be 100644
--- a/apps/wallet/src/engine/runners/tezos/token.ts
+++ b/apps/wallet/src/engine/runners/tezos/token.ts
@@ -1,5 +1,51 @@
-const constructTezosTokenDocument = async (
-	token: Token,
-	network: Network,
-	tokenMetadata: TokenMetadata,
-) => {};
+import type { TezosToken } from '@walless/core';
+import { NetworkClusters, Networks, TezosTokenTypes } from '@walless/core';
+import type { TokenDocument } from '@walless/store';
+
+import { convertTezosImageUriToUrl } from './utils';
+
+export const constructTezosTokenDocument = (
+	token: TezosToken,
+): TokenDocument<TezosToken> => {
+	let image = convertTezosImageUriToUrl(token.image);
+	if (token.symbol === 'tzBTC') {
+		image = 'https://tzbtc.io/wp-content/uploads/2020/03/tzbtc_logo_single.svg';
+	}
+
+	const tokenDocument = {
+		_id: `${token.owner}/token/${token.contract.address}/${token.tokenId}`,
+		type: 'Token',
+		network: Networks.tezos,
+		cluster: token.cluster,
+		owner: token.owner,
+		balance: token.balance,
+		amount: token.amount,
+		decimals: token.decimals,
+		symbol: token.symbol,
+		name: token.name,
+		image: image,
+		contract: token.contract,
+		tokenType: token.tokenType,
+		tokenId: token.tokenId,
+	} as TokenDocument<TezosToken>;
+
+	return tokenDocument;
+};
+
+export const XTZ = {
+	tokenId: '0',
+	network: Networks.tezos,
+	owner: '',
+	cluster: NetworkClusters.mainnet,
+	balance: 0,
+	amount: '0',
+	decimals: 6,
+	symbol: 'XTZ',
+	name: 'XTZ',
+	image: 'https://s2.coinmarketcap.com/static/img/coins/200x200/2011.png',
+	contract: {
+		address: 'KT1VYsVfmobT7rsMVivvZ4J8i3bPiqz12NaH',
+		alias: 'XTZ',
+	},
+	tokenType: TezosTokenTypes.FA12,
+};
diff --git a/apps/wallet/src/engine/runners/tezos/utils.ts b/apps/wallet/src/engine/runners/tezos/utils.ts
new file mode 100644
index 000000000..59ab3c586
--- /dev/null
+++ b/apps/wallet/src/engine/runners/tezos/utils.ts
@@ -0,0 +1,7 @@
+export const convertTezosImageUriToUrl = (uri: string) => {
+	if (!uri) return '';
+	if (!uri.startsWith('ipfs://')) return uri;
+	const path = uri.replaceAll('ipfs://', '');
+
+	return `https://ipfs.io/ipfs/${path}`;
+};
diff --git a/packages/core/utils/assets.ts b/packages/core/utils/assets.ts
index 3a93563bf..0c1de26f0 100644
--- a/packages/core/utils/assets.ts
+++ b/packages/core/utils/assets.ts
@@ -80,3 +80,21 @@ export type SuiToken = Token & {
 	previousTransaction: string;
 	decimals: number;
 };
+
+export enum TezosTokenTypes {
+	FA12 = 'FA1.2',
+	FA2 = 'FA2',
+}
+
+export type TezosContract = {
+	address: string;
+	alias?: string;
+};
+
+export type TezosToken = Token & {
+	tokenId: string;
+	tokenType: TezosTokenTypes;
+	contract: TezosContract;
+	decimals: number;
+	amount: string;
+};

From 43ed3a815f8afd3156fe2cb56fdf513f3e383e8e Mon Sep 17 00:00:00 2001
From: ltminhthu <ltminhthu.209@gmail.com>
Date: Mon, 3 Jun 2024 10:51:30 +0700
Subject: [PATCH 03/35] update small details of utils in fetching on tezos

---
 apps/wallet/src/engine/runners/tezos/index.ts | 21 +++++++------------
 apps/wallet/src/engine/runners/tezos/utils.ts | 20 ++++++++++++++++++
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/apps/wallet/src/engine/runners/tezos/index.ts b/apps/wallet/src/engine/runners/tezos/index.ts
index 113c7e50b..cd8cb7676 100644
--- a/apps/wallet/src/engine/runners/tezos/index.ts
+++ b/apps/wallet/src/engine/runners/tezos/index.ts
@@ -1,4 +1,4 @@
-import { TezosToolkit } from '@taquito/taquito';
+import type { TezosToolkit } from '@taquito/taquito';
 import {} from '@taquito/tzip16';
 import type { TezosToken } from '@walless/core';
 import { Networks } from '@walless/core';
@@ -10,26 +10,20 @@ import { addTokenToStorage, storage } from 'utils/storage';
 import type { EngineConfig, Runner } from '../../types';
 
 import { constructTezosTokenDocument, XTZ } from './token';
-import { convertTezosImageUriToUrl } from './utils';
+import { convertTezosImageUriToUrl, getTezosContext } from './utils';
 
 export type TezosContext = {
 	connection: TezosToolkit;
+	tzktApi: string;
 };
 
-const MAIN_NET = 'https://api.tez.ie/rpc/mainnet';
-const GHOST_NET = 'https://ghostnet.ecadinfra.com';
-
-const TZKT_API_MAINNET = 'https://api.tzkt.io/v1';
-const TZKT_API_GHOSTNET = 'https://api.ghostnet.tzkt.io/v1';
-
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export const createTezosRunner = async (
 	config: EngineConfig,
 ): Promise<Runner> => {
 	const { networkClusters } = config;
 	const cluster = networkClusters[Networks.tezos];
-	const rpc = cluster === 'mainnet' ? MAIN_NET : GHOST_NET;
-	const tzktAPI = cluster === 'mainnet' ? TZKT_API_MAINNET : TZKT_API_GHOSTNET;
+	const { connection, tzktApi } = getTezosContext(config);
 
 	const keysResult = await storage.find<PublicKeyDocument>(selectors.tezosKeys);
 	const keys = keysResult.docs;
@@ -38,11 +32,10 @@ export const createTezosRunner = async (
 		async start() {
 			const tokensPromises = keys.map(async (key) => {
 				const owner = key._id;
-				const connection = new TezosToolkit(rpc);
 				const tzBalance = await connection.tz.getBalance(owner);
 
 				const tokenBalances = await fetch(
-					`${tzktAPI}/tokens/balances?account=${owner}`,
+					`${tzktApi}/tokens/balances?account=${owner}`,
 				);
 				const tokenBalancesJson = await tokenBalances.json();
 
@@ -76,6 +69,8 @@ export const createTezosRunner = async (
 						),
 					} as TezosToken);
 
+					console.log(tokenDocument);
+
 					tokenDocuments.push(tokenDocument);
 				});
 
@@ -97,7 +92,7 @@ export const createTezosRunner = async (
 		},
 		stop() {},
 		getContext: (): TezosContext => {
-			return {} as TezosContext;
+			return { connection, tzktApi } as TezosContext;
 		},
 		restart: () => {},
 	};
diff --git a/apps/wallet/src/engine/runners/tezos/utils.ts b/apps/wallet/src/engine/runners/tezos/utils.ts
index 59ab3c586..ca8ca837e 100644
--- a/apps/wallet/src/engine/runners/tezos/utils.ts
+++ b/apps/wallet/src/engine/runners/tezos/utils.ts
@@ -1,3 +1,23 @@
+import { TezosToolkit } from '@taquito/taquito';
+import { Networks } from '@walless/core';
+import type { EngineConfig } from 'engine/types';
+
+const MAIN_NET = 'https://api.tez.ie/rpc/mainnet';
+const GHOST_NET = 'https://ghostnet.ecadinfra.com';
+
+const TZKT_API_MAINNET = 'https://api.tzkt.io/v1';
+const TZKT_API_GHOSTNET = 'https://api.ghostnet.tzkt.io/v1';
+
+export const getTezosContext = (config: EngineConfig) => {
+	const { networkClusters } = config;
+	const cluster = networkClusters[Networks.tezos];
+	const rpc = cluster === 'mainnet' ? MAIN_NET : GHOST_NET;
+
+	const connection = new TezosToolkit(rpc);
+	const tzktApi = cluster === 'mainnet' ? TZKT_API_MAINNET : TZKT_API_GHOSTNET;
+	return { connection, tzktApi };
+};
+
 export const convertTezosImageUriToUrl = (uri: string) => {
 	if (!uri) return '';
 	if (!uri.startsWith('ipfs://')) return uri;

From 628d9c9225adf21efdb1dad2d7db3866c5f27dc0 Mon Sep 17 00:00:00 2001
From: ltminhthu <ltminhthu.209@gmail.com>
Date: Mon, 3 Jun 2024 11:55:40 +0700
Subject: [PATCH 04/35] chore: edit function name, add comments, etc.

---
 apps/wallet/src/engine/runners/tezos/index.ts | 20 +++++++++----------
 apps/wallet/src/engine/runners/tezos/utils.ts |  2 +-
 packages/core/utils/assets.ts                 |  1 +
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/wallet/src/engine/runners/tezos/index.ts b/apps/wallet/src/engine/runners/tezos/index.ts
index cd8cb7676..5ef94daf3 100644
--- a/apps/wallet/src/engine/runners/tezos/index.ts
+++ b/apps/wallet/src/engine/runners/tezos/index.ts
@@ -10,7 +10,7 @@ import { addTokenToStorage, storage } from 'utils/storage';
 import type { EngineConfig, Runner } from '../../types';
 
 import { constructTezosTokenDocument, XTZ } from './token';
-import { convertTezosImageUriToUrl, getTezosContext } from './utils';
+import { convertTezosImageUriToUrl, createContext } from './utils';
 
 export type TezosContext = {
 	connection: TezosToolkit;
@@ -23,7 +23,7 @@ export const createTezosRunner = async (
 ): Promise<Runner> => {
 	const { networkClusters } = config;
 	const cluster = networkClusters[Networks.tezos];
-	const { connection, tzktApi } = getTezosContext(config);
+	const { connection, tzktApi } = createContext(config);
 
 	const keysResult = await storage.find<PublicKeyDocument>(selectors.tezosKeys);
 	const keys = keysResult.docs;
@@ -47,9 +47,15 @@ export const createTezosRunner = async (
 					balance: parseFloat(tzBalance.toString()) / 10 ** XTZ.decimals,
 				} as TezosToken);
 
-				const tokenDocuments: TokenDocument<TezosToken>[] = [tzDocument];
+				const responseQuotes = await getTokenQuote({
+					address: `${tzDocument.contract?.address}`,
+					network: tzDocument.network,
+				});
+				tzDocument.quotes = responseQuotes?.quotes;
+
+				await addTokenToStorage<TokenDocument<TezosToken>>(tzDocument);
 
-				tokenBalancesJson.forEach((tokenBalance) => {
+				for (const tokenBalance of tokenBalancesJson) {
 					const tokenDocument = constructTezosTokenDocument({
 						owner: key._id,
 						network: Networks.tezos,
@@ -69,12 +75,6 @@ export const createTezosRunner = async (
 						),
 					} as TezosToken);
 
-					console.log(tokenDocument);
-
-					tokenDocuments.push(tokenDocument);
-				});
-
-				for (const tokenDocument of tokenDocuments) {
 					const responseQuotes = await getTokenQuote({
 						address: `${tokenDocument.contract?.address}`,
 						network: tokenDocument.network,
diff --git a/apps/wallet/src/engine/runners/tezos/utils.ts b/apps/wallet/src/engine/runners/tezos/utils.ts
index ca8ca837e..e26621ead 100644
--- a/apps/wallet/src/engine/runners/tezos/utils.ts
+++ b/apps/wallet/src/engine/runners/tezos/utils.ts
@@ -8,7 +8,7 @@ const GHOST_NET = 'https://ghostnet.ecadinfra.com';
 const TZKT_API_MAINNET = 'https://api.tzkt.io/v1';
 const TZKT_API_GHOSTNET = 'https://api.ghostnet.tzkt.io/v1';
 
-export const getTezosContext = (config: EngineConfig) => {
+export const createContext = (config: EngineConfig) => {
 	const { networkClusters } = config;
 	const cluster = networkClusters[Networks.tezos];
 	const rpc = cluster === 'mainnet' ? MAIN_NET : GHOST_NET;
diff --git a/packages/core/utils/assets.ts b/packages/core/utils/assets.ts
index 0c1de26f0..4f6f14c8e 100644
--- a/packages/core/utils/assets.ts
+++ b/packages/core/utils/assets.ts
@@ -81,6 +81,7 @@ export type SuiToken = Token & {
 	decimals: number;
 };
 
+// There are 2 standards of tokens in Tezos, they are FA1.2 and FA2
 export enum TezosTokenTypes {
 	FA12 = 'FA1.2',
 	FA2 = 'FA2',

From 3f472ba0cf3d675cbc6bec4cc75133e0012781aa Mon Sep 17 00:00:00 2001
From: ltminhthu <ltminhthu.209@gmail.com>
Date: Wed, 5 Jun 2024 08:43:27 +0700
Subject: [PATCH 05/35] chore: adjust code syntax

---
 apps/wallet/src/engine/runners/tezos/index.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/wallet/src/engine/runners/tezos/index.ts b/apps/wallet/src/engine/runners/tezos/index.ts
index 5ef94daf3..aa59e5106 100644
--- a/apps/wallet/src/engine/runners/tezos/index.ts
+++ b/apps/wallet/src/engine/runners/tezos/index.ts
@@ -86,9 +86,7 @@ export const createTezosRunner = async (
 
 				return tzBalance;
 			});
-			await Promise.all(tokensPromises).catch((e) => {
-				console.error(e);
-			});
+			await Promise.all(tokensPromises).catch(console.error);
 		},
 		stop() {},
 		getContext: (): TezosContext => {

From 738ecec4b62238b1af95b1f60ce4595cfc647d26 Mon Sep 17 00:00:00 2001
From: ltminhthu <ltminhthu.209@gmail.com>
Date: Tue, 11 Jun 2024 16:25:10 +0700
Subject: [PATCH 06/35] fix: navigation for new explorer screen

---
 apps/wallet/src/features/Explorer/Header.tsx  | 2 +-
 apps/wallet/src/features/Loyalty/internal.tsx | 6 ++++--
 apps/wallet/src/stacks/Explorer/index.tsx     | 8 +++++++-
 apps/wallet/src/utils/navigation/index.ts     | 8 +++++++-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/apps/wallet/src/features/Explorer/Header.tsx b/apps/wallet/src/features/Explorer/Header.tsx
index bc8dce078..f2dec292e 100644
--- a/apps/wallet/src/features/Explorer/Header.tsx
+++ b/apps/wallet/src/features/Explorer/Header.tsx
@@ -27,7 +27,7 @@ const Header = () => {
 	return (
 		<View style={styles.container}>
 			<View style={styles.balanceContainer}>
-				<Text style={styles.helloText}>Hi👋, your balance today:</Text>
+				<Text style={styles.helloText}>Hi 👋, your balance today:</Text>
 				<View style={styles.tokenValuationContainer}>
 					<Hoverable
 						onPress={() => {
diff --git a/apps/wallet/src/features/Loyalty/internal.tsx b/apps/wallet/src/features/Loyalty/internal.tsx
index f954718f8..a054f8ef1 100644
--- a/apps/wallet/src/features/Loyalty/internal.tsx
+++ b/apps/wallet/src/features/Loyalty/internal.tsx
@@ -141,7 +141,8 @@ export const navigateInternalByCta = (cta: string) => {
 				params: {
 					screen: 'Widget',
 					params: {
-						id: 'pixeverse',
+						screen: 'Default',
+						params: { id: 'pixeverse' },
 					},
 				},
 			});
@@ -160,7 +161,8 @@ export const navigateInternalByCta = (cta: string) => {
 				params: {
 					screen: 'Widget',
 					params: {
-						id: 'solana',
+						screen: 'Default',
+						params: { id: 'solana' },
 					},
 				},
 			});
diff --git a/apps/wallet/src/stacks/Explorer/index.tsx b/apps/wallet/src/stacks/Explorer/index.tsx
index fe45af5c6..64f8f90ff 100644
--- a/apps/wallet/src/stacks/Explorer/index.tsx
+++ b/apps/wallet/src/stacks/Explorer/index.tsx
@@ -39,7 +39,13 @@ export const ExplorerStack = () => {
 				goBack: () =>
 					navigate('Dashboard', {
 						screen: 'Explore',
-						params: { screen: 'Widget', params: {} },
+						params: {
+							screen: 'Widget',
+							params: {
+								screen: 'Default',
+								params: { id: 'explorer' },
+							},
+						},
 					}),
 			}),
 		[],
diff --git a/apps/wallet/src/utils/navigation/index.ts b/apps/wallet/src/utils/navigation/index.ts
index fe3e399c2..8a1a13c7c 100644
--- a/apps/wallet/src/utils/navigation/index.ts
+++ b/apps/wallet/src/utils/navigation/index.ts
@@ -51,7 +51,13 @@ export const linking: LinkingOptions<RootParamList> = {
 					Explore: {
 						path: '/explore',
 						screens: {
-							Widget: '/widget/:id',
+							Widget: {
+								path: '/widget',
+								screens: {
+									Default: '/:id',
+									Setting: '/setting',
+								},
+							},
 							Collection: {
 								path: '/collection',
 								screens: {

From 91e8cddd3b3744660eb8086c124367c992dec674 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Wed, 12 Jun 2024 11:22:36 +0700
Subject: [PATCH 07/35] feat: transparent status bar on android

---
 apps/wallet/src/index.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/wallet/src/index.tsx b/apps/wallet/src/index.tsx
index 949f05986..c180eca9b 100644
--- a/apps/wallet/src/index.tsx
+++ b/apps/wallet/src/index.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useRef } from 'react';
 import type { StyleProp, ViewStyle } from 'react-native';
-import { StyleSheet, View } from 'react-native';
+import { Platform, StatusBar, StyleSheet, View } from 'react-native';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 import { NavigationContainer } from '@react-navigation/native';
 import { modalActions, ModalManager, themeState } from '@walless/gui';
@@ -31,6 +31,12 @@ export const AppStack = () => {
 
 	useNotifications();
 	useEffect(() => modalActions.setContainerRef(modalContainerRef), []);
+	useEffect(() => {
+		if (Platform.OS === 'android') {
+			StatusBar.setTranslucent(true);
+			StatusBar.setBackgroundColor('transparent');
+		}
+	}, []);
 
 	return (
 		<SafeAreaProvider>

From 9d5f3a1803607bb399d201a3cc24bcbc565f66fd Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Wed, 12 Jun 2024 12:37:39 +0700
Subject: [PATCH 08/35] chore: use svg logo

---
 apps/wallet/src/components/Logo.tsx           | 92 +++++++++++++++++++
 .../Invitation/InvitationHeader.tsx           | 19 ++--
 .../Authentication/Invitation/index.tsx       |  7 +-
 .../Authentication/Login/SignInHeader.tsx     | 14 +--
 .../Authentication/Login/SignInInner.tsx      |  7 +-
 .../screens/Authentication/Login/index.tsx    |  3 +-
 .../src/screens/Authentication/Recovery.tsx   | 15 +--
 7 files changed, 123 insertions(+), 34 deletions(-)
 create mode 100644 apps/wallet/src/components/Logo.tsx

diff --git a/apps/wallet/src/components/Logo.tsx b/apps/wallet/src/components/Logo.tsx
new file mode 100644
index 000000000..7b25922ff
--- /dev/null
+++ b/apps/wallet/src/components/Logo.tsx
@@ -0,0 +1,92 @@
+import type { FC } from 'react';
+import {
+	ClipPath,
+	Defs,
+	G,
+	LinearGradient,
+	Path,
+	Rect,
+	Stop,
+	Svg,
+} from 'react-native-svg';
+
+type Props = {
+	size?: number;
+};
+
+export const Logo: FC<Props> = ({ size = 118 }) => {
+	const width = size;
+	const height = (width * 62) / 118;
+
+	return (
+		<Svg width={width} height={height} viewBox="0 0 118 62" fill="none">
+			<G clipPath="url(#clip0_5230_9556)">
+				<Path
+					d="M51.0644 55.0649C47.8055 57.8308 46.3745 55.0649 46.3745 55.0649L38.4255 31.0542L32.5908 15.8607L27.7808 3.02468C27.0976 1.27051 25.4173 0.119629 23.5524 0.119629H2.87226C0.942725 0.119629 -0.386715 2.0687 0.314934 3.87856L20.5889 56.8748C21.6783 59.6963 22.3061 61.9424 27.4023 61.5618H45.7744C45.7744 61.5618 48.5533 61.172 49.3196 58.9909C50.5013 56.3272 51.0644 55.0649 51.0644 55.0649Z"
+					fill="#7667AE"
+				/>
+				<Path
+					d="M51.0644 55.0649C47.8055 57.8308 46.3745 55.0649 46.3745 55.0649L38.4255 31.0542L32.5908 15.8607L27.7808 3.02468C27.0976 1.27051 25.4173 0.119629 23.5524 0.119629H2.87226C0.942725 0.119629 -0.386715 2.0687 0.314934 3.87856L20.5889 56.8748C21.6783 59.6963 22.3061 61.9424 27.4023 61.5618H45.7744C45.7744 61.5618 48.5533 61.172 49.3196 58.9909C50.5013 56.3272 51.0644 55.0649 51.0644 55.0649Z"
+					fill="url(#paint0_linear_5230_9556)"
+				/>
+				<Path
+					d="M114.99 0H94.3187C92.4446 0 90.7643 1.15088 90.0903 2.90505L84.9757 15.8525L82.1045 23.3332L78.4577 14.8965C77.673 13.0866 75.9004 11.9172 73.934 11.9172H47.3359L58.2669 36.5405L57.1959 36.7354C57.1959 36.7354 53.9462 39 53.6692 39.5662C53.4015 40.1231 52.7552 42.332 52.9122 43.0931C53.0784 43.8542 54.2693 46.1838 54.2693 46.1838L54.8602 46.5086C54.8602 46.5086 55.885 43.9841 58.7285 43.9841C59.3655 44.0305 61.3504 44.0212 62.5506 46.2116L62.9661 47.149L68.2192 58.9827C68.45 59.5303 68.7824 59.9851 69.244 60.3656C69.3086 60.4213 69.364 60.4584 69.4286 60.5141C69.4379 60.5141 69.4379 60.5234 69.4471 60.5234C70.0934 61.0246 70.6842 61.2659 71.072 61.3773C71.0812 61.3773 71.0997 61.3865 71.1089 61.3865C71.1458 61.3958 71.1643 61.4051 71.2012 61.4144C71.2382 61.4237 71.2751 61.4329 71.3028 61.4422C71.3305 61.4515 71.3582 61.4515 71.3766 61.4608C71.7921 61.5443 72.1798 61.5629 72.1798 61.5629H73.1585H73.1769C73.26 61.5629 73.3431 61.5629 73.4539 61.5629H90.1457H91.7614C93.7094 61.6186 95.3158 60.6255 96.0359 59.1683C96.1651 58.8992 96.3313 58.6021 96.4052 58.3144L98.7963 52.1238L117.547 3.75893C118.239 1.94907 116.919 0 114.99 0Z"
+					fill="url(#paint1_linear_5230_9556)"
+				/>
+				<Path
+					d="M46.4047 55.0184C46.4047 55.0184 47.8357 57.7842 51.0946 55.0184L70.2515 11.8789H43.6627C41.6962 11.8789 39.9237 13.0484 39.1389 14.8582L35.4922 23.2949L46.4047 55.0184Z"
+					fill="#B0B0B0"
+				/>
+				<Path
+					d="M43.6322 11.9277C41.6658 11.9277 39.8932 13.0972 39.1084 14.907L26.7188 43.5306L23.1921 51.4754C22.749 52.2364 21.8811 52.5891 20.9764 52.5891C20.0716 52.5891 19.0468 52.1622 18.5391 51.4939L21.1518 58.3157C21.2256 58.6034 21.3918 58.9004 21.5211 59.1696C21.6411 59.4109 21.7888 59.6429 21.955 59.8564C21.955 59.8564 22.9982 61.6013 25.7217 61.6013C26.9404 61.5827 30.1994 61.5827 30.1994 61.5827L30.1532 61.5549H44.0754C44.1862 61.5549 44.2693 61.5549 44.3523 61.5549H44.3708H44.8047C45.0725 61.5827 46.328 61.6755 47.1128 61.165C47.4728 60.9794 48.8392 60.7103 49.5686 58.4085L70.2118 11.9092H43.6322V11.9277Z"
+					fill="url(#paint2_linear_5230_9556)"
+				/>
+			</G>
+			<Defs>
+				<LinearGradient
+					id="paint0_linear_5230_9556"
+					x1="16.9936"
+					y1="22.7641"
+					x2="44.7031"
+					y2="56.9768"
+					gradientUnits="userSpaceOnUse"
+				>
+					<Stop stopColor="#19A3E1" />
+					<Stop offset="1" stopColor="#003393" />
+				</LinearGradient>
+				<LinearGradient
+					id="paint1_linear_5230_9556"
+					x1="112.406"
+					y1="18.5246"
+					x2="45.1108"
+					y2="38.3967"
+					gradientUnits="userSpaceOnUse"
+				>
+					<Stop stopColor="#19A3E1" />
+					<Stop offset="1" stopColor="#0A5AA2" />
+				</LinearGradient>
+				<LinearGradient
+					id="paint2_linear_5230_9556"
+					x1="53.8269"
+					y1="12.0535"
+					x2="37.6778"
+					y2="67.3536"
+					gradientUnits="userSpaceOnUse"
+				>
+					<Stop stopColor="#8FC5BE" />
+					<Stop offset="1" stopColor="#1BA0DA" />
+				</LinearGradient>
+				<ClipPath id="clip0_5230_9556">
+					<Rect
+						width="117.6"
+						height="61.6"
+						fill="white"
+						transform="translate(0.132812)"
+					/>
+				</ClipPath>
+			</Defs>
+		</Svg>
+	);
+};
+
+export default Logo;
diff --git a/apps/wallet/src/screens/Authentication/Invitation/InvitationHeader.tsx b/apps/wallet/src/screens/Authentication/Invitation/InvitationHeader.tsx
index 6ce36de6c..ee3380f8b 100644
--- a/apps/wallet/src/screens/Authentication/Invitation/InvitationHeader.tsx
+++ b/apps/wallet/src/screens/Authentication/Invitation/InvitationHeader.tsx
@@ -1,22 +1,20 @@
 import type { FC } from 'react';
-import type { ImageSourcePropType, ViewStyle } from 'react-native';
-import { Image, StyleSheet } from 'react-native';
+import type { ViewStyle } from 'react-native';
+import { StyleSheet } from 'react-native';
 import { Text, View } from '@walless/gui';
+import Logo from 'components/Logo';
 
 interface Props {
-	logoSrc: ImageSourcePropType;
 	logoSize: number;
 	style?: ViewStyle;
 }
 
-const InvitationHeader: FC<Props> = ({ logoSrc, logoSize, style }) => {
-	const logoStyle = {
-		width: logoSize,
-		height: logoSize,
-	};
+const InvitationHeader: FC<Props> = ({ logoSize, style }) => {
 	return (
 		<View style={[styles.container, style]}>
-			<Image style={logoStyle} source={logoSrc} resizeMode="cover" />
+			<View style={styles.logoContainer}>
+				<Logo size={logoSize} />
+			</View>
 			<Text style={styles.greetingText}>Welcome to Walless</Text>
 			<Text style={styles.reminderText}>
 				You’ll need to enter invitation code to access{'\n'}Private Beta.
@@ -31,6 +29,9 @@ const styles = StyleSheet.create({
 	container: {
 		alignItems: 'center',
 	},
+	logoContainer: {
+		marginVertical: 14,
+	},
 	greetingText: {
 		fontSize: 20,
 		fontWeight: '600',
diff --git a/apps/wallet/src/screens/Authentication/Invitation/index.tsx b/apps/wallet/src/screens/Authentication/Invitation/index.tsx
index 01330e5bd..d7f6128e3 100644
--- a/apps/wallet/src/screens/Authentication/Invitation/index.tsx
+++ b/apps/wallet/src/screens/Authentication/Invitation/index.tsx
@@ -14,7 +14,6 @@ import {
 import { Anchor, Button, Input, Text, View } from '@walless/gui';
 import { showError } from 'modals/Error';
 import { appState } from 'state/app';
-import assets from 'utils/assets';
 import { validateInvitationCode } from 'utils/auth';
 import { useSafeAreaInsets, useSnapshot } from 'utils/hooks';
 import { navigate } from 'utils/navigation';
@@ -86,11 +85,7 @@ export const InvitationScreen: FC = () => {
 				<View />
 
 				<KeyboardAvoidingView style={styles.upperContainer} behavior="padding">
-					<InvitationHeader
-						logoSrc={assets.misc.walless}
-						logoSize={logoSize}
-						style={styles.logoContainer}
-					/>
+					<InvitationHeader logoSize={logoSize} style={styles.logoContainer} />
 					<Input
 						autoFocus={autoFocus}
 						inputStyle={styles.codeInput}
diff --git a/apps/wallet/src/screens/Authentication/Login/SignInHeader.tsx b/apps/wallet/src/screens/Authentication/Login/SignInHeader.tsx
index 88f8853b8..ab2e07bf8 100644
--- a/apps/wallet/src/screens/Authentication/Login/SignInHeader.tsx
+++ b/apps/wallet/src/screens/Authentication/Login/SignInHeader.tsx
@@ -1,20 +1,15 @@
 import type { FC } from 'react';
-import type { ImageSourcePropType } from 'react-native';
-import { Image, StyleSheet } from 'react-native';
+import { StyleSheet } from 'react-native';
 import { Text, View } from '@walless/gui';
+import Logo from 'components/Logo';
 
 interface Props {
-	logoSrc: ImageSourcePropType;
 	logoSize?: number;
 }
-const SignInHeader: FC<Props> = ({ logoSrc, logoSize }) => {
-	const logoStyle = {
-		width: logoSize,
-		height: logoSize,
-	};
+const SignInHeader: FC<Props> = ({ logoSize }) => {
 	return (
 		<View style={styles.container}>
-			<Image style={logoStyle} source={logoSrc} resizeMode="cover" />
+			<Logo size={logoSize} />
 			<Text style={styles.title}>Sign in to continue</Text>
 		</View>
 	);
@@ -27,6 +22,7 @@ const styles = StyleSheet.create({
 		alignItems: 'center',
 		justifyContent: 'center',
 		paddingTop: 48,
+		gap: 10,
 	},
 	title: {
 		fontSize: 20,
diff --git a/apps/wallet/src/screens/Authentication/Login/SignInInner.tsx b/apps/wallet/src/screens/Authentication/Login/SignInInner.tsx
index 398eb7d8b..f995479e9 100644
--- a/apps/wallet/src/screens/Authentication/Login/SignInInner.tsx
+++ b/apps/wallet/src/screens/Authentication/Login/SignInInner.tsx
@@ -14,7 +14,9 @@ const SignInInner: FC<Props> = ({ onGoogleSignIn, loading }) => {
 		<View style={styles.container}>
 			<View style={styles.commandContainer}>
 				{loading ? (
-					<ActivityIndicator color="white" />
+					<View style={styles.loadingContainer}>
+						<ActivityIndicator color="white" />
+					</View>
 				) : (
 					<Button style={styles.signInButton} onPress={onGoogleSignIn}>
 						<Google />
@@ -51,6 +53,9 @@ const styles = StyleSheet.create({
 	commandContainer: {
 		justifyContent: 'center',
 	},
+	loadingContainer: {
+		paddingVertical: 13,
+	},
 	signInButton: {
 		flexDirection: 'row',
 		backgroundColor: '#0694D3',
diff --git a/apps/wallet/src/screens/Authentication/Login/index.tsx b/apps/wallet/src/screens/Authentication/Login/index.tsx
index 9408ea1f6..e292b78ce 100644
--- a/apps/wallet/src/screens/Authentication/Login/index.tsx
+++ b/apps/wallet/src/screens/Authentication/Login/index.tsx
@@ -3,7 +3,6 @@ import { useState } from 'react';
 import { StyleSheet } from 'react-native';
 import { Anchor, Text, View } from '@walless/gui';
 import { appState } from 'state/app';
-import assets from 'utils/assets';
 import { useSafeAreaInsets, useSnapshot } from 'utils/hooks';
 
 import { signIn } from './internal';
@@ -29,7 +28,7 @@ export const LoginScreen: FC = () => {
 	return (
 		<View style={[styles.container, containerStyle]}>
 			<View />
-			<SignInHeader logoSrc={assets.misc.walless} logoSize={logoSize} />
+			<SignInHeader logoSize={logoSize} />
 			<SignInInner onGoogleSignIn={handleGoogleSignIn} loading={loading} />
 			<View style={styles.footerContainer}>
 				<View style={styles.helpContainer}>
diff --git a/apps/wallet/src/screens/Authentication/Recovery.tsx b/apps/wallet/src/screens/Authentication/Recovery.tsx
index f176e68ab..f27ef08dc 100644
--- a/apps/wallet/src/screens/Authentication/Recovery.tsx
+++ b/apps/wallet/src/screens/Authentication/Recovery.tsx
@@ -88,7 +88,6 @@ export const RecoveryScreen: FC = () => {
 
 export default RecoveryScreen;
 
-const logoSize = 120;
 const styles = StyleSheet.create({
 	container: {
 		flex: 1,
@@ -97,15 +96,17 @@ const styles = StyleSheet.create({
 		gap: 40,
 		paddingBottom: 24,
 	},
-	logo: {
-		marginTop: 48,
-		width: logoSize,
-		height: logoSize,
-	},
 	headerContainer: {
+		marginTop: 48,
 		gap: 8,
 		alignItems: 'center',
 	},
+	logoContainer: {
+		marginVertical: 14,
+	},
+	loadingContainer: {
+		paddingVertical: 16,
+	},
 	title: {
 		fontSize: 20,
 		fontWeight: '400',
@@ -128,7 +129,7 @@ const styles = StyleSheet.create({
 		fontWeight: '600',
 	},
 	continueButton: {
-		height: 52,
+		paddingVertical: 16,
 	},
 	reminderText: {
 		fontSize: 12,

From 52920a33dc728f61923c74e7aad17fd311f11e97 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Wed, 12 Jun 2024 12:38:16 +0700
Subject: [PATCH 09/35] chore: loading when proceed recover account

---
 .../src/screens/Authentication/Recovery.tsx   | 63 ++++++++++++-------
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/apps/wallet/src/screens/Authentication/Recovery.tsx b/apps/wallet/src/screens/Authentication/Recovery.tsx
index f27ef08dc..7919e64f2 100644
--- a/apps/wallet/src/screens/Authentication/Recovery.tsx
+++ b/apps/wallet/src/screens/Authentication/Recovery.tsx
@@ -2,17 +2,18 @@ import type { FC } from 'react';
 import { useState } from 'react';
 import type { ViewStyle } from 'react-native';
 import {
-	Image,
+	ActivityIndicator,
 	KeyboardAvoidingView,
 	Linking,
 	StyleSheet,
 	TouchableWithoutFeedback,
 } from 'react-native';
 import { Button, Input, Text, View } from '@walless/gui';
+import Logo from 'components/Logo';
 import { showError } from 'modals/Error';
-import assets from 'utils/assets';
+import { appState } from 'state/app';
 import { recoverByEmergencyKey } from 'utils/auth';
-import { useUniversalInsets } from 'utils/hooks';
+import { useSnapshot, useUniversalInsets } from 'utils/hooks';
 import { navigate } from 'utils/navigation';
 import { hideNativeKeyboard } from 'utils/system';
 
@@ -20,7 +21,9 @@ const WALLESS_EMAIL = 'hello@walless.io';
 
 export const RecoveryScreen: FC = () => {
 	const [recoveryKey, setRecoveryKey] = useState('');
+	const [loading, setLoading] = useState(false);
 	const insets = useUniversalInsets();
+	const { config } = useSnapshot(appState);
 
 	const containerStyle: ViewStyle = {
 		marginTop: insets.top,
@@ -28,12 +31,14 @@ export const RecoveryScreen: FC = () => {
 	};
 
 	const handlePressContinue = async () => {
+		setLoading(true);
 		const key = recoveryKey.trim();
 		if (key && (await recoverByEmergencyKey(key))) {
 			navigate('Authentication', { screen: 'CreatePasscode' });
 		} else {
 			showError({ errorText: 'Wrong recovery key' });
 		}
+		setLoading(false);
 	};
 
 	const handlePressEmail = async () => {
@@ -46,11 +51,9 @@ export const RecoveryScreen: FC = () => {
 				<View />
 
 				<View style={styles.headerContainer}>
-					<Image
-						source={assets.misc.walless}
-						style={styles.logo}
-						resizeMode="cover"
-					/>
+					<View style={styles.logoContainer}>
+						<Logo />
+					</View>
 					<Text style={styles.title}>Recovery your account</Text>
 					<Text style={styles.subText}>
 						Enter your Secret key to get going again
@@ -64,23 +67,35 @@ export const RecoveryScreen: FC = () => {
 						textAlign="center"
 						onChangeText={setRecoveryKey}
 					/>
-					<Button
-						style={[styles.continueButton]}
-						titleStyle={styles.continueButtonTitle}
-						title="Continue"
-						onPress={handlePressContinue}
-						disabled={!recoveryKey.trim()}
-					/>
+					{loading ? (
+						<View style={styles.loadingContainer}>
+							<ActivityIndicator color={'white'} />
+						</View>
+					) : (
+						<Button
+							style={[styles.continueButton]}
+							titleStyle={styles.continueButtonTitle}
+							title="Continue"
+							onPress={handlePressContinue}
+							disabled={!recoveryKey.trim()}
+						/>
+					)}
 				</KeyboardAvoidingView>
 
 				<View />
-				<Text style={styles.reminderText}>
-					Upon sign-up, your Secret Key is sent in the Walless Emergency Kit to
-					your registered email. If forgotten, contact us at{' '}
-					<Text style={styles.email} onPress={handlePressEmail}>
-						{WALLESS_EMAIL}
+
+				<View>
+					<Text style={styles.reminderText}>
+						Upon sign-up, your Secret Key is sent in the Walless Emergency Kit
+						to your registered email. If forgotten, contact us at{' '}
+						<Text style={styles.email} onPress={handlePressEmail}>
+							{WALLESS_EMAIL}
+						</Text>
+					</Text>
+					<Text style={styles.poweredText}>
+						Powered by walless.io, version@{config.version}
 					</Text>
-				</Text>
+				</View>
 			</View>
 		</TouchableWithoutFeedback>
 	);
@@ -140,4 +155,10 @@ const styles = StyleSheet.create({
 	email: {
 		color: '#19A3E1',
 	},
+	poweredText: {
+		fontSize: 12,
+		color: '#5D6A73',
+		marginTop: 6,
+		textAlign: 'center',
+	},
 });

From 4d3b14ebd84a954ed5dc19c639f96a4d9ebdb2d6 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Wed, 12 Jun 2024 13:44:27 +0700
Subject: [PATCH 10/35] chore: resolve typescript version to use Object.groupBy

---
 package.json                        |  2 +-
 packages/eslint-config/package.json |  2 +-
 yarn.lock                           | 28 ++++++++++++++++++++++++----
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 285040f6e..a786a5dbd 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "ts-jest": "^29.0.5",
     "tsconfig-paths-webpack-plugin": "^4.0.1",
     "turbo": "latest",
-    "typescript": "^5.2.2",
+    "typescript": "^5.4.0",
     "webpack": "^5.89.0"
   },
   "engines": {
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
index e1ea44587..73ce5de85 100644
--- a/packages/eslint-config/package.json
+++ b/packages/eslint-config/package.json
@@ -29,6 +29,6 @@
   "devDependencies": {
     "eslint": "^8.51.0",
     "prettier": "^3.0.3",
-    "typescript": "5.3.3"
+    "typescript": "*"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 5f3196187..28442f1ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11687,7 +11687,7 @@ __metadata:
     eslint-plugin-react-hooks: "npm:^4.6.0"
     eslint-plugin-simple-import-sort: "npm:^10.0.0"
     prettier: "npm:^3.0.3"
-    typescript: "npm:5.3.3"
+    typescript: "npm:*"
   peerDependencies:
     eslint: ">=8"
     prettier: ">=3"
@@ -27051,7 +27051,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:5.3.3, typescript@npm:^5.0.4, typescript@npm:^5.2.2":
+"typescript@npm:*, typescript@npm:^5.4.0":
+  version: 5.4.5
+  resolution: "typescript@npm:5.4.5"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10/d04a9e27e6d83861f2126665aa8d84847e8ebabcea9125b9ebc30370b98cb38b5dff2508d74e2326a744938191a83a69aa9fddab41f193ffa43eabfdf3f190a5
+  languageName: node
+  linkType: hard
+
+"typescript@npm:5.3.3, typescript@npm:^5.0.4":
   version: 5.3.3
   resolution: "typescript@npm:5.3.3"
   bin:
@@ -27061,7 +27071,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.2.2#optional!builtin<compat/typescript>":
+"typescript@patch:typescript@npm%3A*#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.4.0#optional!builtin<compat/typescript>":
+  version: 5.4.5
+  resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin<compat/typescript>::version=5.4.5&hash=5adc0c"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10/760f7d92fb383dbf7dee2443bf902f4365db2117f96f875cf809167f6103d55064de973db9f78fe8f31ec08fff52b2c969aee0d310939c0a3798ec75d0bca2e1
+  languageName: node
+  linkType: hard
+
+"typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.0.4#optional!builtin<compat/typescript>":
   version: 5.3.3
   resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>::version=5.3.3&hash=e012d7"
   bin:
@@ -27633,7 +27653,7 @@ __metadata:
     ts-jest: "npm:^29.0.5"
     tsconfig-paths-webpack-plugin: "npm:^4.0.1"
     turbo: "npm:latest"
-    typescript: "npm:^5.2.2"
+    typescript: "npm:^5.4.0"
     webpack: "npm:^5.89.0"
   languageName: unknown
   linkType: soft

From 19b79ec11379165ec2552cf690a96c5d1d340f14 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Wed, 12 Jun 2024 14:03:58 +0700
Subject: [PATCH 11/35] chore: use SOLANA_CLUSTER_URL as default from env for
 solana devnet and testnet

---
 apps/wallet/src/engine/runners/solana/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/wallet/src/engine/runners/solana/index.ts b/apps/wallet/src/engine/runners/solana/index.ts
index 6a9658ba5..abccabee7 100644
--- a/apps/wallet/src/engine/runners/solana/index.ts
+++ b/apps/wallet/src/engine/runners/solana/index.ts
@@ -16,8 +16,8 @@ import { getParsedTokenAccountsByOwner, queryTokens } from './tokens';
 import type { SolanaContext } from './types';
 
 const endpointUrl: Record<string, string> = {
-	devnet: clusterApiUrl('devnet'),
-	testnet: clusterApiUrl('testnet'),
+	devnet: environment.SOLANA_CLUSTER_URL || clusterApiUrl('devnet'),
+	testnet: environment.SOLANA_CLUSTER_URL || clusterApiUrl('testnet'),
 	mainnet: environment.SOLANA_CLUSTER_URL,
 };
 

From 0b9095c4ee816c37d1f011779a7bd9abfbccef00 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Wed, 12 Jun 2024 14:30:58 +0700
Subject: [PATCH 12/35] fix: add random id to prevent conflicting fill color
 url (color broken) from GradientLinear

---
 apps/wallet/src/components/Logo.tsx | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/wallet/src/components/Logo.tsx b/apps/wallet/src/components/Logo.tsx
index 7b25922ff..8ffc01012 100644
--- a/apps/wallet/src/components/Logo.tsx
+++ b/apps/wallet/src/components/Logo.tsx
@@ -1,4 +1,4 @@
-import type { FC } from 'react';
+import { type FC, useMemo } from 'react';
 import {
 	ClipPath,
 	Defs,
@@ -17,6 +17,9 @@ type Props = {
 export const Logo: FC<Props> = ({ size = 118 }) => {
 	const width = size;
 	const height = (width * 62) / 118;
+	const id = useMemo(() => {
+		return Math.random();
+	}, []);
 
 	return (
 		<Svg width={width} height={height} viewBox="0 0 118 62" fill="none">
@@ -27,11 +30,11 @@ export const Logo: FC<Props> = ({ size = 118 }) => {
 				/>
 				<Path
 					d="M51.0644 55.0649C47.8055 57.8308 46.3745 55.0649 46.3745 55.0649L38.4255 31.0542L32.5908 15.8607L27.7808 3.02468C27.0976 1.27051 25.4173 0.119629 23.5524 0.119629H2.87226C0.942725 0.119629 -0.386715 2.0687 0.314934 3.87856L20.5889 56.8748C21.6783 59.6963 22.3061 61.9424 27.4023 61.5618H45.7744C45.7744 61.5618 48.5533 61.172 49.3196 58.9909C50.5013 56.3272 51.0644 55.0649 51.0644 55.0649Z"
-					fill="url(#paint0_linear_5230_9556)"
+					fill={`url(#paint0_linear_5230_9556_${id})`}
 				/>
 				<Path
 					d="M114.99 0H94.3187C92.4446 0 90.7643 1.15088 90.0903 2.90505L84.9757 15.8525L82.1045 23.3332L78.4577 14.8965C77.673 13.0866 75.9004 11.9172 73.934 11.9172H47.3359L58.2669 36.5405L57.1959 36.7354C57.1959 36.7354 53.9462 39 53.6692 39.5662C53.4015 40.1231 52.7552 42.332 52.9122 43.0931C53.0784 43.8542 54.2693 46.1838 54.2693 46.1838L54.8602 46.5086C54.8602 46.5086 55.885 43.9841 58.7285 43.9841C59.3655 44.0305 61.3504 44.0212 62.5506 46.2116L62.9661 47.149L68.2192 58.9827C68.45 59.5303 68.7824 59.9851 69.244 60.3656C69.3086 60.4213 69.364 60.4584 69.4286 60.5141C69.4379 60.5141 69.4379 60.5234 69.4471 60.5234C70.0934 61.0246 70.6842 61.2659 71.072 61.3773C71.0812 61.3773 71.0997 61.3865 71.1089 61.3865C71.1458 61.3958 71.1643 61.4051 71.2012 61.4144C71.2382 61.4237 71.2751 61.4329 71.3028 61.4422C71.3305 61.4515 71.3582 61.4515 71.3766 61.4608C71.7921 61.5443 72.1798 61.5629 72.1798 61.5629H73.1585H73.1769C73.26 61.5629 73.3431 61.5629 73.4539 61.5629H90.1457H91.7614C93.7094 61.6186 95.3158 60.6255 96.0359 59.1683C96.1651 58.8992 96.3313 58.6021 96.4052 58.3144L98.7963 52.1238L117.547 3.75893C118.239 1.94907 116.919 0 114.99 0Z"
-					fill="url(#paint1_linear_5230_9556)"
+					fill={`url(#paint1_linear_5230_9556_${id})`}
 				/>
 				<Path
 					d="M46.4047 55.0184C46.4047 55.0184 47.8357 57.7842 51.0946 55.0184L70.2515 11.8789H43.6627C41.6962 11.8789 39.9237 13.0484 39.1389 14.8582L35.4922 23.2949L46.4047 55.0184Z"
@@ -39,12 +42,12 @@ export const Logo: FC<Props> = ({ size = 118 }) => {
 				/>
 				<Path
 					d="M43.6322 11.9277C41.6658 11.9277 39.8932 13.0972 39.1084 14.907L26.7188 43.5306L23.1921 51.4754C22.749 52.2364 21.8811 52.5891 20.9764 52.5891C20.0716 52.5891 19.0468 52.1622 18.5391 51.4939L21.1518 58.3157C21.2256 58.6034 21.3918 58.9004 21.5211 59.1696C21.6411 59.4109 21.7888 59.6429 21.955 59.8564C21.955 59.8564 22.9982 61.6013 25.7217 61.6013C26.9404 61.5827 30.1994 61.5827 30.1994 61.5827L30.1532 61.5549H44.0754C44.1862 61.5549 44.2693 61.5549 44.3523 61.5549H44.3708H44.8047C45.0725 61.5827 46.328 61.6755 47.1128 61.165C47.4728 60.9794 48.8392 60.7103 49.5686 58.4085L70.2118 11.9092H43.6322V11.9277Z"
-					fill="url(#paint2_linear_5230_9556)"
+					fill={`url(#paint2_linear_5230_9556_${id})`}
 				/>
 			</G>
 			<Defs>
 				<LinearGradient
-					id="paint0_linear_5230_9556"
+					id={`paint0_linear_5230_9556_${id}`}
 					x1="16.9936"
 					y1="22.7641"
 					x2="44.7031"
@@ -55,7 +58,7 @@ export const Logo: FC<Props> = ({ size = 118 }) => {
 					<Stop offset="1" stopColor="#003393" />
 				</LinearGradient>
 				<LinearGradient
-					id="paint1_linear_5230_9556"
+					id={`paint1_linear_5230_9556_${id}`}
 					x1="112.406"
 					y1="18.5246"
 					x2="45.1108"
@@ -66,7 +69,7 @@ export const Logo: FC<Props> = ({ size = 118 }) => {
 					<Stop offset="1" stopColor="#0A5AA2" />
 				</LinearGradient>
 				<LinearGradient
-					id="paint2_linear_5230_9556"
+					id={`paint2_linear_5230_9556_${id}`}
 					x1="53.8269"
 					y1="12.0535"
 					x2="37.6778"

From e3755f48ef50f1305d6627b7a79110c227ac7152 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Wed, 12 Jun 2024 14:43:51 +0700
Subject: [PATCH 13/35] chore: cont sync bottom padding with powertext

---
 .../Authentication/CreatePasscode/index.tsx   | 19 +++++++++++++++++--
 .../screens/Authentication/Login/index.tsx    |  4 ++--
 .../src/screens/Authentication/Recovery.tsx   |  7 +++----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/apps/wallet/src/screens/Authentication/CreatePasscode/index.tsx b/apps/wallet/src/screens/Authentication/CreatePasscode/index.tsx
index 4a85d61b9..935529eb2 100644
--- a/apps/wallet/src/screens/Authentication/CreatePasscode/index.tsx
+++ b/apps/wallet/src/screens/Authentication/CreatePasscode/index.tsx
@@ -10,11 +10,15 @@ import {
 import { logger } from '@walless/core';
 import { Passcode, Text, View } from '@walless/gui';
 import { showError } from 'modals/Error';
-import { appActions } from 'state/app';
+import { appActions, appState } from 'state/app';
 import assets from 'utils/assets';
 import { makeProfile, setProfile, signInWithPasscode } from 'utils/auth';
 import { auth } from 'utils/firebase';
-import { useBiometricStatus, useSafeAreaInsets } from 'utils/hooks';
+import {
+	useBiometricStatus,
+	useSafeAreaInsets,
+	useSnapshot,
+} from 'utils/hooks';
 import { hydrateEncryptionKey } from 'utils/native';
 import { navigate, ResetAnchors, resetRoute } from 'utils/navigation';
 
@@ -22,6 +26,7 @@ import BiometricIcon from '../BiometricIcon';
 
 export const CreatePasscodeScreen: FC = () => {
 	const biometricStatus = useBiometricStatus();
+	const { config } = useSnapshot(appState);
 	const [passcode, setPasscode] = useState('');
 	const [confirmation, setConfirmation] = useState(false);
 	const [passcodeError, setPasscodeError] = useState<string>();
@@ -128,6 +133,10 @@ export const CreatePasscodeScreen: FC = () => {
 					</View>
 				</TouchableOpacity>
 			</View>
+
+			<Text style={styles.poweredText}>
+				Powered by walless.io, version@{config.version}
+			</Text>
 		</View>
 	);
 };
@@ -173,4 +182,10 @@ export const styles = StyleSheet.create({
 	link: {
 		color: '#19A3E1',
 	},
+	poweredText: {
+		fontSize: 12,
+		color: '#5D6A73',
+		textAlign: 'center',
+		marginTop: 6,
+	},
 });
diff --git a/apps/wallet/src/screens/Authentication/Login/index.tsx b/apps/wallet/src/screens/Authentication/Login/index.tsx
index e292b78ce..4ad4d5997 100644
--- a/apps/wallet/src/screens/Authentication/Login/index.tsx
+++ b/apps/wallet/src/screens/Authentication/Login/index.tsx
@@ -15,7 +15,7 @@ export const LoginScreen: FC = () => {
 	const { invitationCode, config } = useSnapshot(appState);
 	const containerStyle = {
 		paddingTop: insets.top,
-		paddingBottom: insets.bottom,
+		paddingBottom: Math.max(insets.bottom, 24),
 	};
 	const logoSize = 120;
 
@@ -52,7 +52,6 @@ const styles = StyleSheet.create({
 	},
 	footerContainer: {
 		alignItems: 'center',
-		paddingBottom: 24,
 	},
 	helpContainer: {
 		flexDirection: 'row',
@@ -60,6 +59,7 @@ const styles = StyleSheet.create({
 	poweredText: {
 		fontSize: 12,
 		color: '#5D6A73',
+		textAlign: 'center',
 		marginTop: 6,
 	},
 });
diff --git a/apps/wallet/src/screens/Authentication/Recovery.tsx b/apps/wallet/src/screens/Authentication/Recovery.tsx
index 7919e64f2..92285a60a 100644
--- a/apps/wallet/src/screens/Authentication/Recovery.tsx
+++ b/apps/wallet/src/screens/Authentication/Recovery.tsx
@@ -26,8 +26,8 @@ export const RecoveryScreen: FC = () => {
 	const { config } = useSnapshot(appState);
 
 	const containerStyle: ViewStyle = {
-		marginTop: insets.top,
-		marginBottom: Math.max(insets.bottom, 24),
+		paddingTop: insets.top,
+		paddingBottom: Math.max(insets.bottom, 24),
 	};
 
 	const handlePressContinue = async () => {
@@ -82,7 +82,7 @@ export const RecoveryScreen: FC = () => {
 					)}
 				</KeyboardAvoidingView>
 
-				<View />
+				{/* <View /> */}
 
 				<View>
 					<Text style={styles.reminderText}>
@@ -109,7 +109,6 @@ const styles = StyleSheet.create({
 		justifyContent: 'space-around',
 		paddingHorizontal: 36,
 		gap: 40,
-		paddingBottom: 24,
 	},
 	headerContainer: {
 		marginTop: 48,

From 8eb6447572f694b555c92ef3d2f3900bf2386bfa Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Wed, 12 Jun 2024 14:47:21 +0700
Subject: [PATCH 14/35] fix: token turns to undefined after clean send modal

---
 apps/wallet/src/features/Send/TransactionResult/Token.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wallet/src/features/Send/TransactionResult/Token.tsx b/apps/wallet/src/features/Send/TransactionResult/Token.tsx
index f45adc2ab..c3b1fee9b 100644
--- a/apps/wallet/src/features/Send/TransactionResult/Token.tsx
+++ b/apps/wallet/src/features/Send/TransactionResult/Token.tsx
@@ -12,7 +12,7 @@ export const Token = () => {
 	const { token, amount, time, status, network } =
 		useTransactionContext<FulfilledTokenTransaction>();
 
-	const icon = token.image ? { uri: token.image } : assets.misc.unknownToken;
+	const icon = token?.image ? { uri: token.image } : assets.misc.unknownToken;
 
 	return (
 		<View style={styles.container}>

From a99f084ccde824baa1b5ce8cdf16fc0fe8f6f4ab Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Wed, 12 Jun 2024 15:00:50 +0700
Subject: [PATCH 15/35] fix: token turns undefined after clean modal

---
 apps/wallet/src/features/Send/TransactionResult/Token.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/wallet/src/features/Send/TransactionResult/Token.tsx b/apps/wallet/src/features/Send/TransactionResult/Token.tsx
index c3b1fee9b..89b3b86a9 100644
--- a/apps/wallet/src/features/Send/TransactionResult/Token.tsx
+++ b/apps/wallet/src/features/Send/TransactionResult/Token.tsx
@@ -12,7 +12,9 @@ export const Token = () => {
 	const { token, amount, time, status, network } =
 		useTransactionContext<FulfilledTokenTransaction>();
 
-	const icon = token?.image ? { uri: token.image } : assets.misc.unknownToken;
+	if (!token) return null;
+
+	const icon = token.image ? { uri: token.image } : assets.misc.unknownToken;
 
 	return (
 		<View style={styles.container}>

From 6baa94804a1405617e8f5c7a841b9821ef73f239 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Wed, 12 Jun 2024 15:01:10 +0700
Subject: [PATCH 16/35] chore: add view solscan button in processing screen

---
 apps/wallet/src/features/Send/ConfirmByPasscode/Processing.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/wallet/src/features/Send/ConfirmByPasscode/Processing.tsx b/apps/wallet/src/features/Send/ConfirmByPasscode/Processing.tsx
index 457566dc5..15f3a5d85 100644
--- a/apps/wallet/src/features/Send/ConfirmByPasscode/Processing.tsx
+++ b/apps/wallet/src/features/Send/ConfirmByPasscode/Processing.tsx
@@ -1,11 +1,14 @@
 import { ActivityIndicator, StyleSheet } from 'react-native';
 import { Text, View } from '@walless/gui';
 
+import { SolanaShareButton } from '../TransactionResult/ShareButton';
+
 export const Processing = () => {
 	return (
 		<View style={styles.container}>
 			<ActivityIndicator />
 			<Text>Processing...</Text>
+			<SolanaShareButton />
 		</View>
 	);
 };

From 9ae86f56c3bcb77dcf17cb61d7cf7d8b1c999672 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Wed, 12 Jun 2024 15:19:11 +0700
Subject: [PATCH 17/35] fix: force clear engine before start new one after init
 signin to prevent key conflicting

---
 apps/wallet/src/state/bootstrap.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/wallet/src/state/bootstrap.ts b/apps/wallet/src/state/bootstrap.ts
index de836186b..e1c4825f0 100644
--- a/apps/wallet/src/state/bootstrap.ts
+++ b/apps/wallet/src/state/bootstrap.ts
@@ -92,6 +92,10 @@ export const initAfterSignIn = async () => {
 	if (!runtime.isMobile) {
 		await initializeVaultKeys();
 	}
+
+	// clean registered engine before restart
+	if (engine) await engine.clear();
+
 	await registerNetworkRunners(engine);
 	await engine.start();
 };

From 4de98256b2432f2594e803a476f071ce1fabaef2 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Wed, 12 Jun 2024 15:45:08 +0700
Subject: [PATCH 18/35] chore: add version text in setting screen

---
 apps/wallet/src/features/Setting/index.tsx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/wallet/src/features/Setting/index.tsx b/apps/wallet/src/features/Setting/index.tsx
index 91c985dd7..913f6718e 100644
--- a/apps/wallet/src/features/Setting/index.tsx
+++ b/apps/wallet/src/features/Setting/index.tsx
@@ -24,7 +24,7 @@ interface Props {
 }
 
 const SettingFeature: FC<Props> = ({ style }) => {
-	const { profile } = useSnapshot(appState);
+	const { profile, config } = useSnapshot(appState);
 	const displayName = profile.name || profile.email || 'Anonymous';
 	const imageSource = { uri: profile.profileImage };
 
@@ -113,6 +113,12 @@ const SettingFeature: FC<Props> = ({ style }) => {
 						}
 					/>
 				</View>
+
+				<View>
+					<Text style={styles.poweredText}>
+						Powered by walless.io, version@{config.version}
+					</Text>
+				</View>
 			</View>
 		</View>
 	);
@@ -149,6 +155,12 @@ const styles = StyleSheet.create({
 	innerContainer: {
 		gap: 16,
 	},
+	poweredText: {
+		fontSize: 12,
+		color: '#5D6A73',
+		textAlign: 'center',
+		marginTop: 24,
+	},
 });
 
 export default SettingFeature;

From ca149b4b8062d56884b4e6ac6e4601c9d54f86ca Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Wed, 12 Jun 2024 16:15:27 +0700
Subject: [PATCH 19/35] fix: catch error when getting token quote

---
 apps/wallet/src/utils/api.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/wallet/src/utils/api.ts b/apps/wallet/src/utils/api.ts
index 5e613992b..23ccd5ddf 100644
--- a/apps/wallet/src/utils/api.ts
+++ b/apps/wallet/src/utils/api.ts
@@ -30,10 +30,14 @@ export const getTokenQuotes = async (
 };
 
 export const getTokenQuote = async (token: IToken) => {
-	const response = await qlClient.request<
-		{ tokenByAddress: TokenInfo },
-		{ address: string }
-	>(queries.tokenByAddress, { address: makeHashId(token) });
-
-	return response.tokenByAddress;
+	try {
+		const response = await qlClient.request<
+			{ tokenByAddress: TokenInfo },
+			{ address: string }
+		>(queries.tokenByAddress, { address: makeHashId(token) });
+
+		return response.tokenByAddress;
+	} catch (error) {
+		console.log('failed to get token quote:', error);
+	}
 };

From d06c39e75b9aab186e85af199e8e8d40ee3f420d Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Wed, 12 Jun 2024 16:55:48 +0700
Subject: [PATCH 20/35] fix: revoke handle register account when w3a status is
 READY (this edge case is only in staging)

---
 .../Authentication/CreatePasscode/index.tsx   |  6 ++----
 apps/wallet/src/utils/auth/signIn.ts          | 19 +++----------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/apps/wallet/src/screens/Authentication/CreatePasscode/index.tsx b/apps/wallet/src/screens/Authentication/CreatePasscode/index.tsx
index 935529eb2..6492091a5 100644
--- a/apps/wallet/src/screens/Authentication/CreatePasscode/index.tsx
+++ b/apps/wallet/src/screens/Authentication/CreatePasscode/index.tsx
@@ -39,10 +39,8 @@ export const CreatePasscodeScreen: FC = () => {
 		paddingBottom: insets.bottom || 24,
 	};
 
-	const handleInitFail = () => {
-		showError({
-			errorText: 'Something went wrong. Please try again.',
-		});
+	const handleInitFail = (errorText: string) => {
+		showError({ errorText });
 		navigate('Authentication', { screen: 'Login' });
 	};
 
diff --git a/apps/wallet/src/utils/auth/signIn.ts b/apps/wallet/src/utils/auth/signIn.ts
index d59c1d904..0275457b5 100644
--- a/apps/wallet/src/utils/auth/signIn.ts
+++ b/apps/wallet/src/utils/auth/signIn.ts
@@ -1,4 +1,4 @@
-import type { Account, WalletInvitation } from '@walless/graphql';
+import type { WalletInvitation } from '@walless/graphql';
 import { mutations, queries } from '@walless/graphql';
 import type { FirebaseUser } from 'utils/firebase';
 import { qlClient } from 'utils/graphql';
@@ -70,27 +70,14 @@ const signInWithTorusKey = async (
 
 const signInWithPasscode = async (
 	passcode: string,
-	handleInitFail?: () => void,
+	handleInitFail?: (error: string) => void,
 ): Promise<void> => {
 	const status = await importAvailableShares();
 
 	if (status === ThresholdResult.Initializing) {
 		const registeredAccount = await initAndRegisterWallet();
 		if (!registeredAccount?.identifier) {
-			handleInitFail?.();
-			return;
-		}
-	} else if (status === ThresholdResult.Ready) {
-		let { userAccount } = await qlClient.request<{
-			userAccount: Account | undefined;
-		}>(queries.userAccount);
-
-		if (!userAccount) {
-			userAccount = await initAndRegisterWallet();
-		}
-
-		if (!userAccount?.identifier) {
-			handleInitFail?.();
+			handleInitFail?.('Failed to register account, please try again!');
 			return;
 		}
 	}

From 6c724b66249cdec32b502332fd6627c70e90d496 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Wed, 12 Jun 2024 17:25:22 +0700
Subject: [PATCH 21/35] fix: fix new (first time) user can not sign in by
 remove clean shares by empty object

---
 apps/wallet/src/utils/auth/logout.ts     | 3 ---
 apps/wallet/src/utils/auth/logout.web.ts | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/apps/wallet/src/utils/auth/logout.ts b/apps/wallet/src/utils/auth/logout.ts
index 11f8e1f0e..5295560a0 100644
--- a/apps/wallet/src/utils/auth/logout.ts
+++ b/apps/wallet/src/utils/auth/logout.ts
@@ -4,12 +4,9 @@ import { appActions } from 'state/app';
 
 import { storage } from '../storage';
 
-import { tkey } from './w3a';
-
 export const logout = async () => {
 	await firebase.auth().signOut();
 	await engine.clear();
 	await storage.clearAllDocs();
 	appActions.cleanupAfterLogOut();
-	tkey.shares = {};
 };
diff --git a/apps/wallet/src/utils/auth/logout.web.ts b/apps/wallet/src/utils/auth/logout.web.ts
index 71b71531c..8895033e2 100644
--- a/apps/wallet/src/utils/auth/logout.web.ts
+++ b/apps/wallet/src/utils/auth/logout.web.ts
@@ -5,12 +5,9 @@ import { appActions } from 'state/app';
 import { auth } from '../firebase/index.web';
 import { storage } from '../storage';
 
-import { tkey } from './w3a';
-
 export const logout = async () => {
 	await signOut(auth());
 	await engine.clear();
 	await storage.clearAllDocs();
 	appActions.cleanupAfterLogOut();
-	tkey.shares = {};
 };

From 75b8cb09476c29bceaccafa6dd1e75574624c291 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Thu, 13 Jun 2024 10:39:23 +0700
Subject: [PATCH 22/35] chore: update correct log message

---
 apps/wallet/src/utils/auth/recovery.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wallet/src/utils/auth/recovery.ts b/apps/wallet/src/utils/auth/recovery.ts
index f9f8872f1..9ce69cf9f 100644
--- a/apps/wallet/src/utils/auth/recovery.ts
+++ b/apps/wallet/src/utils/auth/recovery.ts
@@ -22,7 +22,7 @@ export const initAndRegisterWallet = async (): Promise<Account | undefined> => {
 
 		return account;
 	} catch (e) {
-		logger.error('Failed to init or register wallet:', e);
+		logger.error('Failed to init and register wallet:', e);
 	}
 };
 

From 775558187959dad345ce819606867e845aa68038 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Thu, 13 Jun 2024 11:16:34 +0700
Subject: [PATCH 23/35] fix: add tracking wallets on ext/pwa in initializeAuth

---
 apps/wallet/src/utils/firebase/index.ext.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/wallet/src/utils/firebase/index.ext.ts b/apps/wallet/src/utils/firebase/index.ext.ts
index 03717e7da..c45dc3293 100644
--- a/apps/wallet/src/utils/firebase/index.ext.ts
+++ b/apps/wallet/src/utils/firebase/index.ext.ts
@@ -5,6 +5,7 @@ import { getAuth, GoogleAuthProvider } from '@firebase/auth';
 import { getPerformance } from '@firebase/performance';
 import type { RemoteConfig } from '@walless/core';
 import { appState } from 'state/app';
+import { runtimeActions } from 'state/runtime';
 import { defaultRemoteConfig } from 'utils/constants';
 
 import type { Analytics } from './types';
@@ -54,6 +55,10 @@ export const initializeAuth = async () => {
 
 	if (user?.uid) {
 		fireCache.idToken = await user.getIdToken();
+
+		if (appState.remoteConfig.deepAnalyticsEnabled) {
+			runtimeActions.syncRemoteProfile();
+		}
 	}
 };
 

From 44915bc8036e2180e41afff9ec985e7c683e1960 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Thu, 13 Jun 2024 11:24:42 +0700
Subject: [PATCH 24/35] fix: call initializeAuth in initAfterSignIn to re-init
 after un-signin bootstrap

---
 apps/wallet/src/state/bootstrap.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/wallet/src/state/bootstrap.ts b/apps/wallet/src/state/bootstrap.ts
index e1c4825f0..67937dc3d 100644
--- a/apps/wallet/src/state/bootstrap.ts
+++ b/apps/wallet/src/state/bootstrap.ts
@@ -98,6 +98,13 @@ export const initAfterSignIn = async () => {
 
 	await registerNetworkRunners(engine);
 	await engine.start();
+
+	/**
+	 * fix: initializeAuth called by `bootstrap` only at the init time
+	 * in case user is not signed-in, no initialization happen.
+	 * need to re-init after sign-in
+	 * */
+	await initializeAuth();
 };
 
 const configEngine = async () => {

From 5193c7e880c827c7027ab2565f9df473ca076c17 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Thu, 13 Jun 2024 11:28:10 +0700
Subject: [PATCH 25/35] chore: fix default type error

---
 apps/wallet/src/utils/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wallet/src/utils/constants.ts b/apps/wallet/src/utils/constants.ts
index f6818726a..98177309f 100644
--- a/apps/wallet/src/utils/constants.ts
+++ b/apps/wallet/src/utils/constants.ts
@@ -6,7 +6,7 @@ export const noHeaderNavigation = {
 
 export const tabBarHeight = 52;
 
-export const defaultConfig: Config = {
+export const defaultConfig: Omit<Config, 'version'> = {
 	hideBalance: true,
 	latestLocation: '/',
 };

From 1c574b2a51b08bb892d9c8902d0d48a84c99addd Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Thu, 13 Jun 2024 13:08:01 +0700
Subject: [PATCH 26/35] fix: remote duplicated Setting stack, prevent redundant
 nested widget params (broken drawer active item)

---
 apps/wallet/src/features/Explorer/Header.tsx  |  7 +---
 .../src/screens/Dashboard/Widget/index.tsx    |  8 ++---
 apps/wallet/src/stacks/Explorer/Sidebar.tsx   | 10 ++----
 apps/wallet/src/stacks/Explorer/index.tsx     |  9 ++---
 apps/wallet/src/stacks/Widget/index.tsx       | 36 -------------------
 apps/wallet/src/utils/navigation/index.ts     |  9 ++---
 apps/wallet/src/utils/navigation/types.ts     |  9 +----
 7 files changed, 13 insertions(+), 75 deletions(-)
 delete mode 100644 apps/wallet/src/stacks/Widget/index.tsx

diff --git a/apps/wallet/src/features/Explorer/Header.tsx b/apps/wallet/src/features/Explorer/Header.tsx
index f2dec292e..edd34559b 100644
--- a/apps/wallet/src/features/Explorer/Header.tsx
+++ b/apps/wallet/src/features/Explorer/Header.tsx
@@ -15,12 +15,7 @@ const Header = () => {
 	const handleNavigateToSettings = () => {
 		navigate('Dashboard', {
 			screen: 'Explore',
-			params: {
-				screen: 'Widget',
-				params: {
-					screen: 'Setting',
-				},
-			},
+			params: { screen: 'Profile', params: { screen: 'Setting' } },
 		});
 	};
 
diff --git a/apps/wallet/src/screens/Dashboard/Widget/index.tsx b/apps/wallet/src/screens/Dashboard/Widget/index.tsx
index 0436eeb4e..42eba4547 100644
--- a/apps/wallet/src/screens/Dashboard/Widget/index.tsx
+++ b/apps/wallet/src/screens/Dashboard/Widget/index.tsx
@@ -6,16 +6,16 @@ import WidgetFeature from 'features/Widget';
 import { appState } from 'state/app';
 import { mockWidgets } from 'state/widget';
 import { useSafeAreaInsets, useSnapshot } from 'utils/hooks';
-import type { WidgetParamList } from 'utils/navigation';
+import type { ExploreParamList } from 'utils/navigation';
 
-type Props = DrawerScreenProps<WidgetParamList, 'Default'>;
+type Props = DrawerScreenProps<ExploreParamList, 'Widget'>;
 
 export const WidgetScreen: FC<Props> = ({ navigation, route }) => {
 	const { top, bottom } = useSafeAreaInsets();
 	const { navigationDisplay } = useSnapshot(appState);
-	const widgetId = route.params?.id;
+	const widgetId = route.params.id;
 
-	if (!widgetId || widgetId === 'explorer') {
+	if (widgetId === 'explorer') {
 		return (
 			<ExplorerFeature
 				style={[styles.container, { paddingTop: top, paddingBottom: bottom }]}
diff --git a/apps/wallet/src/stacks/Explorer/Sidebar.tsx b/apps/wallet/src/stacks/Explorer/Sidebar.tsx
index 9216de759..5d3c4fa9d 100644
--- a/apps/wallet/src/stacks/Explorer/Sidebar.tsx
+++ b/apps/wallet/src/stacks/Explorer/Sidebar.tsx
@@ -27,10 +27,7 @@ export const Sidebar: FC<DrawerContentComponentProps> = ({ state }) => {
 			screen: 'Explore',
 			params: {
 				screen: 'Widget',
-				params: {
-					screen: 'Default',
-					params: { id: item._id },
-				},
+				params: { id: item._id },
 			},
 		});
 	};
@@ -45,10 +42,7 @@ export const Sidebar: FC<DrawerContentComponentProps> = ({ state }) => {
 				screen: 'Explore',
 				params: {
 					screen: 'Widget',
-					params: {
-						screen: 'Default',
-						params: { id: 'explorer' },
-					},
+					params: { id: 'explorer' },
 				},
 			});
 		}
diff --git a/apps/wallet/src/stacks/Explorer/index.tsx b/apps/wallet/src/stacks/Explorer/index.tsx
index 64f8f90ff..6f602ac19 100644
--- a/apps/wallet/src/stacks/Explorer/index.tsx
+++ b/apps/wallet/src/stacks/Explorer/index.tsx
@@ -4,8 +4,8 @@ import type { DrawerNavigationOptions } from 'components/DrawerNavigation';
 import { createDrawerNavigator } from 'components/DrawerNavigation';
 import { withStackContainer } from 'components/StackContainer';
 import LoyaltyScreen from 'screens/Dashboard/Loyalty';
+import WidgetScreen from 'screens/Dashboard/Widget';
 import CollectionStack from 'stacks/Explorer/CollectionStack';
-import WidgetStack from 'stacks/Widget';
 import { appState } from 'state/app';
 import { useSnapshot } from 'utils/hooks';
 import type { ExploreParamList } from 'utils/navigation';
@@ -41,10 +41,7 @@ export const ExplorerStack = () => {
 						screen: 'Explore',
 						params: {
 							screen: 'Widget',
-							params: {
-								screen: 'Default',
-								params: { id: 'explorer' },
-							},
+							params: { id: 'explorer' },
 						},
 					}),
 			}),
@@ -57,7 +54,7 @@ export const ExplorerStack = () => {
 			screenOptions={screenOptions}
 			backBehavior="order"
 		>
-			<Drawer.Screen name="Widget" component={WidgetStack} options={options} />
+			<Drawer.Screen name="Widget" component={WidgetScreen} options={options} />
 			<Drawer.Screen
 				name="Collection"
 				component={CollectionStack}
diff --git a/apps/wallet/src/stacks/Widget/index.tsx b/apps/wallet/src/stacks/Widget/index.tsx
deleted file mode 100644
index b82381336..000000000
--- a/apps/wallet/src/stacks/Widget/index.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import type { FC } from 'react';
-import { useMemo } from 'react';
-import type { StackNavigationOptions } from '@react-navigation/stack';
-import { createStackNavigator } from '@react-navigation/stack';
-import type { DrawerScreenProps } from 'components/DrawerNavigation';
-import { withStackContainer } from 'components/StackContainer';
-import SettingScreen from 'screens/Dashboard/Setting';
-import WidgetScreen from 'screens/Dashboard/Widget';
-import type { ExploreParamList, WidgetParamList } from 'utils/navigation';
-import { navigateBack } from 'utils/navigation';
-
-type Props = DrawerScreenProps<ExploreParamList, 'Widget'>;
-const Stack = createStackNavigator<WidgetParamList>();
-
-export const WidgetStack: FC<Props> = () => {
-	const screenOptions: StackNavigationOptions = {
-		headerShown: false,
-	};
-	const ManageSettingScreen = useMemo(
-		() =>
-			withStackContainer(SettingScreen, {
-				isHeaderActive: true,
-				goBack: navigateBack,
-			}),
-		[],
-	);
-
-	return (
-		<Stack.Navigator screenOptions={screenOptions}>
-			<Stack.Screen name="Default" component={WidgetScreen} />
-			<Stack.Screen name="Setting" component={ManageSettingScreen} />
-		</Stack.Navigator>
-	);
-};
-
-export default WidgetStack;
diff --git a/apps/wallet/src/utils/navigation/index.ts b/apps/wallet/src/utils/navigation/index.ts
index 8a1a13c7c..c74d4cb20 100644
--- a/apps/wallet/src/utils/navigation/index.ts
+++ b/apps/wallet/src/utils/navigation/index.ts
@@ -51,13 +51,8 @@ export const linking: LinkingOptions<RootParamList> = {
 					Explore: {
 						path: '/explore',
 						screens: {
-							Widget: {
-								path: '/widget',
-								screens: {
-									Default: '/:id',
-									Setting: '/setting',
-								},
-							},
+							Widget: '/widget/:id',
+							Setting: '/setting',
 							Collection: {
 								path: '/collection',
 								screens: {
diff --git a/apps/wallet/src/utils/navigation/types.ts b/apps/wallet/src/utils/navigation/types.ts
index 09a8dcd2d..b3191d43f 100644
--- a/apps/wallet/src/utils/navigation/types.ts
+++ b/apps/wallet/src/utils/navigation/types.ts
@@ -18,13 +18,6 @@ export type CollectionParamList = {
 	};
 };
 
-export type WidgetParamList = {
-	Default: {
-		id?: string;
-	};
-	Setting?: undefined;
-};
-
 export type ProfileParamList = {
 	Default: undefined;
 	Setting: undefined;
@@ -32,7 +25,7 @@ export type ProfileParamList = {
 };
 
 export type ExploreParamList = {
-	Widget: NavigatorScreenParams<WidgetParamList>;
+	Widget: { id: string };
 	Collection: NavigatorScreenParams<CollectionParamList>;
 	Profile: NavigatorScreenParams<ProfileParamList>;
 	Loyalty: undefined;

From df9b3f3ba9f11d13eb97805b85cc43b9908b2486 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Thu, 13 Jun 2024 15:05:14 +0700
Subject: [PATCH 27/35] chore: update log message

---
 packages/store/migrations/index.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/store/migrations/index.ts b/packages/store/migrations/index.ts
index de2d98ee5..49bf11e34 100644
--- a/packages/store/migrations/index.ts
+++ b/packages/store/migrations/index.ts
@@ -32,9 +32,8 @@ export const migrateDatabase = async (
 	const storedVersion = setting?.config?.storageVersion || 0;
 	const latestVersion = getLatestMigrationVersion();
 
-	logger.info(storedVersion, latestVersion);
-
 	if (storedVersion < latestVersion) {
+		logger.info(`migrating from ${storedVersion} to ${latestVersion}`);
 		const newerVersionFilter = (i: Migration) =>
 			i.version > storedVersion && (i.scope === 'all' || i.scope === scope);
 

From da509829d209a22dd63962d7bffa6dc1d4ba0394 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Thu, 13 Jun 2024 16:18:26 +0700
Subject: [PATCH 28/35] fix: use backBehavior to history to prevent unexpected
 goBack

---
 apps/wallet/src/stacks/Explorer/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wallet/src/stacks/Explorer/index.tsx b/apps/wallet/src/stacks/Explorer/index.tsx
index 6f602ac19..2ac226d27 100644
--- a/apps/wallet/src/stacks/Explorer/index.tsx
+++ b/apps/wallet/src/stacks/Explorer/index.tsx
@@ -52,7 +52,7 @@ export const ExplorerStack = () => {
 		<Drawer.Navigator
 			drawerContent={Sidebar}
 			screenOptions={screenOptions}
-			backBehavior="order"
+			backBehavior="history"
 		>
 			<Drawer.Screen name="Widget" component={WidgetScreen} options={options} />
 			<Drawer.Screen

From 39ca31c07f997a158ab4b3205bee0bf86a4b4230 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Thu, 13 Jun 2024 16:19:20 +0700
Subject: [PATCH 29/35] fix: memorize all components passing as component prop

---
 apps/wallet/src/features/Setting/index.tsx |  4 +--
 apps/wallet/src/stacks/Explorer/index.tsx  | 29 ++++++++++-----------
 apps/wallet/src/stacks/Home/index.tsx      | 30 ++++++++++++----------
 apps/wallet/src/stacks/Setting/index.tsx   | 24 +++++++++--------
 4 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/apps/wallet/src/features/Setting/index.tsx b/apps/wallet/src/features/Setting/index.tsx
index 913f6718e..1599714bb 100644
--- a/apps/wallet/src/features/Setting/index.tsx
+++ b/apps/wallet/src/features/Setting/index.tsx
@@ -31,9 +31,7 @@ const SettingFeature: FC<Props> = ({ style }) => {
 	const handleNavigateToReferralScreen = () => {
 		navigate('Dashboard', {
 			screen: 'Setting',
-			params: {
-				screen: 'Referral',
-			},
+			params: { screen: 'Referral' },
 		});
 	};
 
diff --git a/apps/wallet/src/stacks/Explorer/index.tsx b/apps/wallet/src/stacks/Explorer/index.tsx
index 2ac226d27..d2574f8c6 100644
--- a/apps/wallet/src/stacks/Explorer/index.tsx
+++ b/apps/wallet/src/stacks/Explorer/index.tsx
@@ -18,18 +18,20 @@ const Drawer = createDrawerNavigator<ExploreParamList>();
 
 export const ExplorerStack = () => {
 	const { navigationDisplay } = useSnapshot(appState);
-	const screenOptions: DrawerNavigationOptions = {
-		headerShown: false,
-		drawerStyle: styles.drawer,
-		swipeEdgeWidth: 100,
-		swipeMinDistance: sidebarWidth / 3,
-		overlayColor: 'transparent',
-		drawerType: navigationDisplay.isPermanentDrawer ? 'permanent' : 'back',
-	};
+	const screenOptions: DrawerNavigationOptions = useMemo(() => {
+		return {
+			headerShown: false,
+			drawerStyle: styles.drawer,
+			swipeEdgeWidth: 100,
+			swipeMinDistance: sidebarWidth / 3,
+			overlayColor: 'transparent',
+			drawerType: navigationDisplay.isPermanentDrawer ? 'permanent' : 'back',
+		};
+	}, [navigationDisplay]);
 
-	const options = {
-		unmountOnBlur: false,
-	};
+	const options = useMemo(() => {
+		return { unmountOnBlur: false };
+	}, []);
 
 	const ManageLoyaltyScreen = useMemo(
 		() =>
@@ -70,10 +72,7 @@ export const ExplorerStack = () => {
 			<Drawer.Screen
 				name="Loyalty"
 				component={ManageLoyaltyScreen}
-				options={{
-					...options,
-					drawerType: 'back',
-				}}
+				options={{ ...options, drawerType: 'back' }}
 			/>
 		</Drawer.Navigator>
 	);
diff --git a/apps/wallet/src/stacks/Home/index.tsx b/apps/wallet/src/stacks/Home/index.tsx
index 14de172a0..4b2af43cd 100644
--- a/apps/wallet/src/stacks/Home/index.tsx
+++ b/apps/wallet/src/stacks/Home/index.tsx
@@ -1,4 +1,4 @@
-import type { FC } from 'react';
+import { type FC, useMemo } from 'react';
 import type { StackScreenProps } from '@react-navigation/stack';
 import { createStackNavigator } from '@react-navigation/stack';
 import { withStackContainer } from 'components/StackContainer';
@@ -16,19 +16,21 @@ type Props = StackScreenProps<DashboardParamList, 'Home'>;
 const Stack = createStackNavigator<HomeParamList>();
 
 export const HomeStack: FC<Props> = () => {
-	const ManagedHomeScreen = withStackContainer(ProfileScreen, {
-		title: 'Home',
-	});
-	const ManagedHistoryScreen = withStackContainer(HistoryScreen, {
-		title: 'Transaction History',
-		goBack: () =>
-			navigate('Dashboard', {
-				screen: 'Home',
-				params: {
-					screen: 'Default',
-				},
-			}),
-	});
+	const ManagedHomeScreen = useMemo(() => {
+		return withStackContainer(ProfileScreen, {
+			title: 'Home',
+		});
+	}, []);
+	const ManagedHistoryScreen = useMemo(() => {
+		return withStackContainer(HistoryScreen, {
+			title: 'Transaction History',
+			goBack: () =>
+				navigate('Dashboard', {
+					screen: 'Home',
+					params: { screen: 'Default' },
+				}),
+		});
+	}, []);
 
 	return (
 		<Stack.Navigator screenOptions={noHeaderNavigation}>
diff --git a/apps/wallet/src/stacks/Setting/index.tsx b/apps/wallet/src/stacks/Setting/index.tsx
index f6c230b15..e22fa5446 100644
--- a/apps/wallet/src/stacks/Setting/index.tsx
+++ b/apps/wallet/src/stacks/Setting/index.tsx
@@ -1,4 +1,4 @@
-import type { FC } from 'react';
+import { type FC, useMemo } from 'react';
 import type { StackScreenProps } from '@react-navigation/stack';
 import { createStackNavigator } from '@react-navigation/stack';
 import { withStackContainer } from 'components/StackContainer';
@@ -18,18 +18,22 @@ export const SettingStack: FC<Props> = () => {
 	const { navigationDisplay } = useSnapshot(appState);
 
 	const screenOptions = { headerShown: false };
-	const ManagedSettingScreen = withStackContainer(SettingScreen, {
-		title: 'Settings',
-	});
-	const ManagedReferralScreen = withStackContainer(ReferralScreen, {
-		title: 'Referral',
-		noBottomTabs: !navigationDisplay.isBottomTabActive,
-		goBack: handleGoBackFromReferralScreen,
-	});
+	const ManagedSettingScreen = useMemo(() => {
+		return withStackContainer(SettingScreen, {
+			title: 'Settings',
+		});
+	}, []);
+	const ManagedReferralScreen = useMemo(() => {
+		return withStackContainer(ReferralScreen, {
+			title: 'Referral',
+			noBottomTabs: !navigationDisplay.isBottomTabActive,
+			goBack: handleGoBackFromReferralScreen,
+		});
+	}, []);
 
 	return (
 		<Stack.Navigator screenOptions={screenOptions}>
-			<Stack.Screen name="Default" component={ManagedSettingScreen as never} />
+			<Stack.Screen name="Default" component={ManagedSettingScreen} />
 			<Stack.Screen name="Referral" component={ManagedReferralScreen} />
 		</Stack.Navigator>
 	);

From 8ed168edc5bb624f342182524c69830c57e1e109 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Thu, 13 Jun 2024 16:27:35 +0700
Subject: [PATCH 30/35] fix: import convention

---
 apps/wallet/src/stacks/Home/index.tsx    | 10 ++++------
 apps/wallet/src/stacks/Setting/index.tsx |  3 ++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/apps/wallet/src/stacks/Home/index.tsx b/apps/wallet/src/stacks/Home/index.tsx
index 4b2af43cd..321613d1c 100644
--- a/apps/wallet/src/stacks/Home/index.tsx
+++ b/apps/wallet/src/stacks/Home/index.tsx
@@ -1,15 +1,13 @@
-import { type FC, useMemo } from 'react';
+import type { FC } from 'react';
+import { useMemo } from 'react';
 import type { StackScreenProps } from '@react-navigation/stack';
 import { createStackNavigator } from '@react-navigation/stack';
 import { withStackContainer } from 'components/StackContainer';
 import HistoryScreen from 'screens/Dashboard/History';
 import ProfileScreen from 'screens/Dashboard/Home';
 import { noHeaderNavigation } from 'utils/constants';
-import {
-	type DashboardParamList,
-	type HomeParamList,
-	navigate,
-} from 'utils/navigation';
+import type { DashboardParamList, HomeParamList } from 'utils/navigation';
+import { navigate } from 'utils/navigation';
 
 type Props = StackScreenProps<DashboardParamList, 'Home'>;
 
diff --git a/apps/wallet/src/stacks/Setting/index.tsx b/apps/wallet/src/stacks/Setting/index.tsx
index e22fa5446..672723a5c 100644
--- a/apps/wallet/src/stacks/Setting/index.tsx
+++ b/apps/wallet/src/stacks/Setting/index.tsx
@@ -1,4 +1,5 @@
-import { type FC, useMemo } from 'react';
+import type { FC } from 'react';
+import { useMemo } from 'react';
 import type { StackScreenProps } from '@react-navigation/stack';
 import { createStackNavigator } from '@react-navigation/stack';
 import { withStackContainer } from 'components/StackContainer';

From ea8b0b017f8ef230c577216c4f70ea8be9f6d58a Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Thu, 13 Jun 2024 17:44:04 +0700
Subject: [PATCH 31/35] fix: use transparent as default background color for
 unknown image source

---
 .../wallet/src/stacks/Explorer/WidgetNavigator/NavigatorOrb.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/wallet/src/stacks/Explorer/WidgetNavigator/NavigatorOrb.tsx b/apps/wallet/src/stacks/Explorer/WidgetNavigator/NavigatorOrb.tsx
index 85b9098a1..e8b9b23aa 100644
--- a/apps/wallet/src/stacks/Explorer/WidgetNavigator/NavigatorOrb.tsx
+++ b/apps/wallet/src/stacks/Explorer/WidgetNavigator/NavigatorOrb.tsx
@@ -168,7 +168,7 @@ const styles = StyleSheet.create({
 const getIconColor = (
 	isActive: boolean | undefined,
 	storeOptions: WidgetStoreOptions,
-	defaultColor = '#FFFFFF',
+	defaultColor = 'transparent',
 ) => {
 	if (isActive) {
 		return (

From 0161bb915c9487db3e2df8385faecc950936dc35 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Thu, 13 Jun 2024 17:44:46 +0700
Subject: [PATCH 32/35] fix: make iconColor as optional to remove broken
 rounded pixeverse icon

---
 apps/wallet/browser/kernel/utils/mockExtension.ts | 1 -
 apps/wallet/src/state/widget/shared.ts            | 1 -
 packages/core/utils/extension.ts                  | 2 +-
 packages/core/utils/widget.ts                     | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/wallet/browser/kernel/utils/mockExtension.ts b/apps/wallet/browser/kernel/utils/mockExtension.ts
index f3e422996..05eef6113 100644
--- a/apps/wallet/browser/kernel/utils/mockExtension.ts
+++ b/apps/wallet/browser/kernel/utils/mockExtension.ts
@@ -11,7 +11,6 @@ export const mockLayoutCards: ExtensionDocument[] = [
 		storeMeta: {
 			iconUri: '/img/explore/logo-pixeverse.png',
 			iconSize: 40,
-			iconColor: '#ffffff',
 			coverUri: '/img/explore/thumbnail-pixeverse.png',
 			description:
 				'A hyper casual pixel-style game in which players step into the shoes of their ...',
diff --git a/apps/wallet/src/state/widget/shared.ts b/apps/wallet/src/state/widget/shared.ts
index 29a3332e7..f30ec92ce 100644
--- a/apps/wallet/src/state/widget/shared.ts
+++ b/apps/wallet/src/state/widget/shared.ts
@@ -14,7 +14,6 @@ export const mockWidgets: WidgetDocument[] = [
 		storeMeta: {
 			iconUri: '/img/explore/logo-pixeverse.png',
 			iconSize: 40,
-			iconColor: '#ffffff',
 			coverUri: '/img/explore/thumbnail-pixeverse.png',
 			description:
 				'A hyper casual pixel-style game in which players step into the shoes of their ...',
diff --git a/packages/core/utils/extension.ts b/packages/core/utils/extension.ts
index 732c99ee1..a54cd632f 100644
--- a/packages/core/utils/extension.ts
+++ b/packages/core/utils/extension.ts
@@ -1,7 +1,7 @@
 export interface ExtensionStoreMetadata {
 	iconUri: string;
 	iconSize: number;
-	iconColor: string;
+	iconColor?: string;
 	iconActiveColor?: string;
 	coverUri: string;
 	description: string;
diff --git a/packages/core/utils/widget.ts b/packages/core/utils/widget.ts
index 28ba07bfb..31b35d919 100644
--- a/packages/core/utils/widget.ts
+++ b/packages/core/utils/widget.ts
@@ -3,7 +3,7 @@ import type { Networks } from './common';
 export interface WidgetStoreOptions {
 	iconUri: string;
 	iconSize: number;
-	iconColor: string;
+	iconColor?: string;
 	iconActiveColor?: string;
 	coverUri: string;
 	description: string;

From a11c343dad738b146b83c5d22729f8002ccc7bb8 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Thu, 13 Jun 2024 17:49:07 +0700
Subject: [PATCH 33/35] fix: correct navigate to widget from explorer

---
 .../src/features/Explorer/Highlights/HighlightItem.tsx       | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/wallet/src/features/Explorer/Highlights/HighlightItem.tsx b/apps/wallet/src/features/Explorer/Highlights/HighlightItem.tsx
index 894e717e5..2bb5d2bad 100644
--- a/apps/wallet/src/features/Explorer/Highlights/HighlightItem.tsx
+++ b/apps/wallet/src/features/Explorer/Highlights/HighlightItem.tsx
@@ -36,10 +36,7 @@ const HighlightItem: FC<HighlightItemProps> = ({ animation, widget }) => {
 			screen: 'Explore',
 			params: {
 				screen: 'Widget',
-				params: {
-					screen: 'Default',
-					params: { id },
-				},
+				params: { id },
 			},
 		});
 	};

From bcd19f7bee3034d9196f586853161f2729a76c6f Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Thu, 13 Jun 2024 18:08:14 +0700
Subject: [PATCH 34/35] chore: styling balance valuation

---
 apps/wallet/src/features/Explorer/Header.tsx | 15 ++++++++++++++-
 apps/wallet/src/utils/helper.ts              |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/apps/wallet/src/features/Explorer/Header.tsx b/apps/wallet/src/features/Explorer/Header.tsx
index edd34559b..d1f244374 100644
--- a/apps/wallet/src/features/Explorer/Header.tsx
+++ b/apps/wallet/src/features/Explorer/Header.tsx
@@ -25,6 +25,7 @@ const Header = () => {
 				<Text style={styles.helloText}>Hi 👋, your balance today:</Text>
 				<View style={styles.tokenValuationContainer}>
 					<Hoverable
+						style={!config.hideBalance && styles.eyeOffIcon}
 						onPress={() => {
 							setPrivacy(!config.hideBalance);
 						}}
@@ -35,7 +36,12 @@ const Header = () => {
 							<EyeOff color="#19A3E1" size={16} />
 						)}
 					</Hoverable>
-					<Text style={styles.tokenValuation}>
+					<Text
+						style={[
+							styles.tokenValuation,
+							config.hideBalance && styles.hiddenTokenValuation,
+						]}
+					>
 						{getValuationDisplay(valuation, config.hideBalance)}
 					</Text>
 				</View>
@@ -71,11 +77,18 @@ const styles = StyleSheet.create({
 	balanceContainer: {
 		gap: 4,
 	},
+	eyeOffIcon: {
+		top: 1,
+	},
 	tokenValuationContainer: {
 		flexDirection: 'row',
 		alignItems: 'center',
 		gap: 4,
 	},
+	hiddenTokenValuation: {
+		lineHeight: 21.5,
+		fontSize: 12,
+	},
 	tokenValuation: {
 		fontSize: 18,
 		color: '#ffffff',
diff --git a/apps/wallet/src/utils/helper.ts b/apps/wallet/src/utils/helper.ts
index 3ff86acc0..0b0b24207 100644
--- a/apps/wallet/src/utils/helper.ts
+++ b/apps/wallet/src/utils/helper.ts
@@ -69,7 +69,7 @@ export const isValidHttpUrl = (str: string) => {
 
 export const getValuationDisplay = (valuation: number, isPrivate?: boolean) => {
 	if (isPrivate) {
-		return '******';
+		return '∗∗∗∗∗∗';
 	}
 
 	return `$${numeral(valuation).format('0.00')}`;

From bf9b05eac61a8dc853db0e3b5fff39ace2230630 Mon Sep 17 00:00:00 2001
From: Tan Le <tanlethanh8266@gmail.com>
Date: Thu, 13 Jun 2024 18:15:31 +0700
Subject: [PATCH 35/35] fix: remove unused import

---
 apps/wallet/src/engine/runners/tezos/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/wallet/src/engine/runners/tezos/index.ts b/apps/wallet/src/engine/runners/tezos/index.ts
index aa59e5106..f75c156ca 100644
--- a/apps/wallet/src/engine/runners/tezos/index.ts
+++ b/apps/wallet/src/engine/runners/tezos/index.ts
@@ -1,5 +1,4 @@
 import type { TezosToolkit } from '@taquito/taquito';
-import {} from '@taquito/tzip16';
 import type { TezosToken } from '@walless/core';
 import { Networks } from '@walless/core';
 import type { PublicKeyDocument, TokenDocument } from '@walless/store';