From d7e65b12941ea6a85639f5c7cd1708e6164c16f9 Mon Sep 17 00:00:00 2001
From: makylfang <makyl@newfang.io>
Date: Fri, 21 Apr 2023 14:22:59 +0400
Subject: [PATCH 001/153] Added unity check in redirect and mfa (#287)

---
 src/pages/MFARestoreScreen.vue | 2 +-
 src/pages/loginRedirect.vue    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/MFARestoreScreen.vue b/src/pages/MFARestoreScreen.vue
index 195e08c6..f8467bcf 100644
--- a/src/pages/MFARestoreScreen.vue
+++ b/src/pages/MFARestoreScreen.vue
@@ -155,7 +155,7 @@ async function returnToParent(key: string) {
       }
     )
   } else {
-    if (loginSrc === 'rn') {
+    if (loginSrc === 'rn' || loginSrc === 'flutter' || loginSrc === 'unity') {
       await connectionToParent.goToWallet()
       return
     }
diff --git a/src/pages/loginRedirect.vue b/src/pages/loginRedirect.vue
index bc4ec012..7b693456 100644
--- a/src/pages/loginRedirect.vue
+++ b/src/pages/loginRedirect.vue
@@ -81,7 +81,11 @@ async function init() {
           }
         )
       } else {
-        if (loginSrc === 'rn' || loginSrc === 'flutter') {
+        if (
+          loginSrc === 'rn' ||
+          loginSrc === 'flutter' ||
+          loginSrc === 'unity'
+        ) {
           await connectionToParent.goToWallet()
           return
         }

From 895c86e21724240d5218f3a74072a6353336aed2 Mon Sep 17 00:00:00 2001
From: mmjee <root@git.maharshi.ninja>
Date: Tue, 25 Apr 2023 18:13:31 +0530
Subject: [PATCH 002/153] Reduce Polling of eth_balance calls from wallet to
 reduce costs (#286)

* Initial implementation

* Move relevant balance tracking to the store

* Get wallet balance first

* Add timers in the wallet middleware

* Move certain values to constants
---
 src/components/AddNetwork.vue |  2 +-
 src/pages/homeScreen.vue      | 25 ++++---------------
 src/store/rpc.ts              | 47 +++++++++++++++++++++++++++++++++++
 src/utils/accountHandler.ts   |  4 +--
 src/utils/getwalletType.ts    |  2 +-
 src/utils/walletMiddleware.ts |  4 +++
 6 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/src/components/AddNetwork.vue b/src/components/AddNetwork.vue
index b876dd13..ccf6a0b9 100644
--- a/src/components/AddNetwork.vue
+++ b/src/components/AddNetwork.vue
@@ -45,7 +45,7 @@ async function handleSubmit() {
       `RPC URL - ${rpcUrl} already exists, please use different one`
     )
   } else {
-    const provider = new ethers.providers.JsonRpcProvider(
+    const provider = new ethers.providers.StaticJsonRpcProvider(
       rpcConfig.value.rpcUrl
     )
     const chainId = await provider.getNetwork()
diff --git a/src/pages/homeScreen.vue b/src/pages/homeScreen.vue
index 118385e8..7151c650 100644
--- a/src/pages/homeScreen.vue
+++ b/src/pages/homeScreen.vue
@@ -6,7 +6,6 @@ import AppLoader from '@/components/AppLoader.vue'
 import AssetsView from '@/components/AssetsView.vue'
 import UserWallet from '@/components/UserWallet.vue'
 import { useRpcStore } from '@/store/rpc'
-import { getRequestHandler } from '@/utils/requestHandlerSingleton'
 
 const rpcStore = useRpcStore()
 const walletBalance = ref('')
@@ -17,7 +16,6 @@ const loader = ref({
   show: false,
   message: '',
 })
-let balancePolling
 
 function showLoader(message) {
   loader.value.show = true
@@ -34,24 +32,20 @@ onMounted(() => {
     if (rpcStore.walletBalanceChainId !== rpcStore.selectedChainId) {
       handleChainChange()
     } else {
-      getWalletBalance()
+      rpcStore.getWalletBalance()
     }
-    balancePolling = setInterval(getWalletBalance, 4000)
+    rpcStore.setUpBalancePolling()
   } catch (err) {
     console.log({ err })
   }
 })
 
-onBeforeUnmount(() => {
-  if (balancePolling) {
-    clearInterval(balancePolling)
-  }
-})
+onBeforeUnmount(rpcStore.cleanUpBalancePolling)
 
 async function handleChainChange() {
   showLoader('Fetching Wallet Balance...')
   try {
-    await getWalletBalance()
+    await rpcStore.getWalletBalance()
   } catch (err) {
     console.log({ err })
   } finally {
@@ -59,19 +53,10 @@ async function handleChainChange() {
   }
 }
 
-async function getWalletBalance() {
-  const accountHandler = getRequestHandler().getAccountHandler()
-  if (accountHandler) {
-    const balance = (await accountHandler.getBalance()) || '0'
-    rpcStore.setWalletBalance(balance.toString())
-    walletBalance.value = ethers.utils.formatEther(balance.toString())
-  }
-}
-
 async function handleRefresh() {
   showLoader('Refreshing wallet balance...')
   try {
-    await getWalletBalance()
+    await rpcStore.getWalletBalance()
   } catch (err) {
     console.log({ err })
   } finally {
diff --git a/src/store/rpc.ts b/src/store/rpc.ts
index 48d25089..b396609f 100644
--- a/src/store/rpc.ts
+++ b/src/store/rpc.ts
@@ -1,6 +1,10 @@
 import { defineStore } from 'pinia'
 
 import { RpcConfigWallet, CHAIN_LIST } from '@/models/RpcConfigList'
+import { getRequestHandler } from '@/utils/requestHandlerSingleton'
+
+const BALANCE_POLLING_INTERVAL = 10 * 1000
+const BALANCE_POLLING_DURATION = 10 * 60 * 1000
 
 type RpcConfigs = {
   [chainId: number]: RpcConfigWallet
@@ -9,8 +13,12 @@ type RpcConfigs = {
 type RpcConfigState = {
   selectedRPCConfig: RpcConfigWallet
   selectedChainId: string | number
+
   walletBalance: string
   walletBalanceChainId: string
+  walletBalancePollingIntervalID: NodeJS.Timer | null
+  walletBalancePollingCleanupID: NodeJS.Timer | null
+
   rpcConfigs: RpcConfigs | null
   editChainId: number | null
 }
@@ -20,7 +28,12 @@ export const useRpcStore = defineStore('rpcStore', {
     ({
       selectedRPCConfig: CHAIN_LIST[0],
       selectedChainId: CHAIN_LIST[0].chainId,
+
       walletBalance: '',
+      walletBalanceChainId: '',
+      walletBalancePollingCleanupID: null,
+      walletBalancePollingIntervalID: null,
+
       rpcConfigs: null,
       editChainId: null,
     } as RpcConfigState),
@@ -115,5 +128,39 @@ export const useRpcStore = defineStore('rpcStore', {
       })
       this.rpcConfigs = configs
     },
+
+    async getWalletBalance() {
+      const accountHandler = getRequestHandler().getAccountHandler()
+      if (accountHandler) {
+        const balance = (await accountHandler.getBalance()) || '0'
+        this.setWalletBalance(balance.toString())
+      }
+    },
+
+    cleanUpBalancePolling() {
+      if (this.walletBalancePollingIntervalID != null) {
+        clearInterval(this.walletBalancePollingIntervalID)
+        this.walletBalancePollingIntervalID = null
+      }
+      if (this.walletBalancePollingCleanupID != null) {
+        clearTimeout(this.walletBalancePollingCleanupID)
+        this.walletBalancePollingCleanupID = null
+      }
+    },
+
+    async setUpBalancePolling() {
+      this.cleanUpBalancePolling()
+      await this.getWalletBalance()
+      // Poll every 10 seconds
+      this.walletBalancePollingIntervalID = setInterval(
+        this.getWalletBalance.bind(this),
+        BALANCE_POLLING_INTERVAL
+      )
+      this.walletBalancePollingCleanupID = setTimeout(() => {
+        if (this.walletBalancePollingIntervalID != null) {
+          clearInterval(this.walletBalancePollingIntervalID)
+        }
+      }, BALANCE_POLLING_DURATION)
+    },
   },
 })
diff --git a/src/utils/accountHandler.ts b/src/utils/accountHandler.ts
index 6fc0d02c..b352402f 100644
--- a/src/utils/accountHandler.ts
+++ b/src/utils/accountHandler.ts
@@ -26,14 +26,14 @@ class AccountHandler {
     rpcUrl: string = process.env.VUE_APP_WALLET_RPC_URL
   ) {
     this.wallet = new ethers.Wallet(privateKey)
-    this.provider = new ethers.providers.JsonRpcProvider(rpcUrl)
+    this.provider = new ethers.providers.StaticJsonRpcProvider(rpcUrl)
   }
 
   getBalance() {
     return this.provider.getBalance(this.wallet.address)
   }
   setProvider(url: string) {
-    this.provider = new ethers.providers.JsonRpcProvider(url)
+    this.provider = new ethers.providers.StaticJsonRpcProvider(url)
   }
 
   asMiddleware() {
diff --git a/src/utils/getwalletType.ts b/src/utils/getwalletType.ts
index 4d22621b..4a2efcfe 100644
--- a/src/utils/getwalletType.ts
+++ b/src/utils/getwalletType.ts
@@ -1,7 +1,7 @@
 import { ethers } from 'ethers'
 
 const getContract = (rpcUrl, appAddress) => {
-  const provider = new ethers.providers.JsonRpcProvider(rpcUrl)
+  const provider = new ethers.providers.StaticJsonRpcProvider(rpcUrl)
   return new ethers.Contract(
     appAddress,
     ['function walletType() view returns (uint)'],
diff --git a/src/utils/walletMiddleware.ts b/src/utils/walletMiddleware.ts
index d30a364a..f15b3984 100644
--- a/src/utils/walletMiddleware.ts
+++ b/src/utils/walletMiddleware.ts
@@ -8,6 +8,8 @@ import {
   PendingJsonRpcResponse,
 } from 'json-rpc-engine'
 
+import { useRpcStore } from '@/store/rpc'
+
 interface TransactionParams {
   from: string
 }
@@ -141,6 +143,7 @@ function createWalletMiddleware({
       req
     )
     res.result = await processTransaction(txParams)
+    await useRpcStore().setUpBalancePolling()
   }
 
   async function signTransaction(
@@ -158,6 +161,7 @@ function createWalletMiddleware({
       req
     )
     res.result = await processSignTransaction(txParams, req)
+    await useRpcStore().setUpBalancePolling()
   }
 
   //

From ecfc117105f26c18edbf453ec1bfd3015dae82fd Mon Sep 17 00:00:00 2001
From: mmjee <root@git.maharshi.ninja>
Date: Thu, 27 Apr 2023 15:33:06 +0530
Subject: [PATCH 003/153] Wallet - NFT Auto-detection (#271)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add a ‘database’ for NFTs with automatic detection from Ankr

* Cleanup

* Send all blockchains to ensure all NFTs are retrieved

* Add ui updates to ankr nft autofetch

* Update toast message

* Filter NFTs out rigorously

* Update to startsWith instead of includes to check ipfs url

* Optimistically bypass the checkOwnership execution if the NFT is autodetected

* Reduce complexity

* Add NFT balance to the list

* Add conditional check to store balance

---------

Co-authored-by: shrinathprabhu <shrinathprabhu.123@gmail.com>
---
 src/components/NFTView.vue       |  92 ++++++--------
 src/models/NFT.ts                |   2 +
 src/pages/AddOrEditNFTScreen.vue | 101 ++++-----------
 src/pages/ManageNFTScreen.vue    |  49 ++++---
 src/services/nft.service.ts      | 211 +++++++++++++++++++++++++++++++
 src/shims-vue.d.ts               |   1 +
 src/utils/storageWrapper.ts      |   1 +
 7 files changed, 309 insertions(+), 148 deletions(-)
 create mode 100644 src/services/nft.service.ts

diff --git a/src/components/NFTView.vue b/src/components/NFTView.vue
index 6833eeb3..c2717bd1 100644
--- a/src/components/NFTView.vue
+++ b/src/components/NFTView.vue
@@ -3,6 +3,8 @@ import { onMounted, ref, type Ref, reactive, watch } from 'vue'
 import { useRouter } from 'vue-router'
 
 import type { NFT } from '@/models/NFT'
+import { getNFTDetails, modifyIpfsUrl } from '@/services/getNFTDetails.service'
+import { NFTDB } from '@/services/nft.service'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
 import { checkOwnership } from '@/utils/nftUtils'
@@ -11,6 +13,7 @@ import { getStorage } from '@/utils/storageWrapper'
 const userStore = useUserStore()
 const rpcStore = useRpcStore()
 const storage = getStorage()
+let nftDB: NFTDB
 
 type NFTViewProps = {
   refreshState?: boolean
@@ -26,73 +29,48 @@ const loader = reactive({
   message: 'Loading saved NFTs...',
 })
 
-function fetchStoredNfts(): NFT[] {
-  const storedNftsString = storage.local.getItem(
-    `${userStore.walletAddress}/${rpcStore.selectedRpcConfig?.chainId}/nfts`
-  )
-  if (storedNftsString) {
-    return (JSON.parse(storedNftsString) as NFT[]).filter(
-      (contract) => contract.type === 'erc721' || contract.type === 'erc1155'
-    )
-  } else {
-    return []
+function sanitizeUrl(url?: string) {
+  if (url && url.startsWith('ipfs://')) {
+    return modifyIpfsUrl(url)
   }
+  return url
 }
 
 async function getNFTAssets() {
   loader.show = true
+  nftDB = await NFTDB.create(storage.local, userStore.walletAddress)
   nfts.value = []
-  const storedNfts = fetchStoredNfts()
-  storedNfts.forEach((nft) => {
-    nfts.value.push({
-      type: nft.type,
-      name: nft.name,
-      balance: nft.balance,
-      imageUrl: nft.imageUrl,
-      animationUrl: nft.animationUrl,
-      description: nft.description,
-      collectionName: nft.collectionName,
-      tokenId: nft.tokenId,
-      address: nft.address,
-      attributes: nft.attributes,
-    })
-  })
-  const nftsToRemoveIndex: number[] = []
-  const nftCheckOwnerPromises: Promise<any>[] = []
-  nfts.value.forEach((nft, index) => {
-    nftCheckOwnerPromises.push(checkNftOwnership(nft, index, nftsToRemoveIndex))
-  })
-
-  await Promise.all(nftCheckOwnerPromises)
-
-  nfts.value = nfts.value.filter(
-    (nft, index) => !nftsToRemoveIndex.includes(index)
-  )
 
-  storage.local.setItem(
-    `${userStore.walletAddress}/${rpcStore.selectedRpcConfig?.chainId}/nfts`,
-    JSON.stringify(nfts.value)
+  const potentialNFTList = nftDB.getNFTs(Number(rpcStore.selectedChainId))
+  const chainId = Number(rpcStore.selectedChainId)
+
+  await Promise.all(
+    potentialNFTList.map(async (nft) => {
+      const [ownership, details] = await Promise.all([
+        nft.autodetected
+          ? undefined
+          : checkOwnership(nft.type, {
+              tokenId: nft.tokenId,
+              contractAddress: nft.address,
+            }),
+        getNFTDetails(nft.tokenUrl, nft.tokenId),
+      ])
+      if (ownership != undefined && !ownership.owner) {
+        nftDB.removeNFT(nft, chainId)
+        return
+      }
+
+      details.name = details.name || `#${nft.tokenId}`
+      details.imageUrl = sanitizeUrl(details.image_url || details.image)
+      details.animationUrl = sanitizeUrl(
+        details.animation_url || details.animations
+      )
+      nfts.value.push(details)
+    })
   )
-
   loader.show = false
 }
 
-async function checkNftOwnership(
-  nft: NFT,
-  index: number,
-  nftsToRemoveIndex: number[]
-) {
-  const hasOwnership = await checkOwnership(nft.type, {
-    tokenId: nft.tokenId,
-    contractAddress: nft.address,
-  })
-  if (hasOwnership.owner) {
-    nft.balance = hasOwnership.balance
-  } else {
-    nftsToRemoveIndex.push(index)
-  }
-}
-
 function handleManageNFT() {
   router.push({ name: 'ManageNft' })
 }
@@ -101,8 +79,10 @@ function getNftDetailValues(nft: NFT) {
   const attributes = nft.attributes?.length
     ? JSON.stringify(nft.attributes)
     : ''
+  const autodetected = JSON.stringify(nft.autodetected)
   return {
     ...nft,
+    autodetected,
     attributes,
   }
 }
diff --git a/src/models/NFT.ts b/src/models/NFT.ts
index 992a3be4..1c1dfe1c 100644
--- a/src/models/NFT.ts
+++ b/src/models/NFT.ts
@@ -13,6 +13,8 @@ type NFTContract = {
     trait: string
     value: string
   }[]
+  tokenUrl: string
+  autodetected?: boolean
 }
 
 type NFT = NFTContract & { balance?: number }
diff --git a/src/pages/AddOrEditNFTScreen.vue b/src/pages/AddOrEditNFTScreen.vue
index 2b42444d..bf64fa1c 100644
--- a/src/pages/AddOrEditNFTScreen.vue
+++ b/src/pages/AddOrEditNFTScreen.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { reactive, ref, watch } from 'vue'
+import { onBeforeMount, reactive, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useToast } from 'vue-toastification'
 
@@ -9,6 +9,7 @@ import contractMap from '@/contract-map.json'
 import type { EthAssetContract } from '@/models/Asset'
 import { NFT } from '@/models/NFT'
 import { getNFTDetails, modifyIpfsUrl } from '@/services/getNFTDetails.service'
+import { NFTDB } from '@/services/nft.service'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
 import {
@@ -25,6 +26,8 @@ const router = useRouter()
 const toast = useToast()
 const getImage = useImage()
 const storage = getStorage()
+const rpcStore = useRpcStore()
+const userStore = useUserStore()
 
 type EditNFTProps = {
   collectionName?: string
@@ -34,7 +37,14 @@ type EditNFTProps = {
 
 const props = defineProps<EditNFTProps>()
 
-const canEdit = route.name === 'EditNft'
+let nftDB: NFTDB
+
+onBeforeMount(async () => {
+  nftDB = await NFTDB.create(storage.local, userStore.walletAddress)
+})
+
+const canEdit = false
+const canDelete = route.name === 'EditNft'
 const showAddressOutline = ref(false)
 
 const ethMainnetNftContracts: EthAssetContract[] = Object.keys(contractMap)
@@ -43,8 +53,6 @@ const ethMainnetNftContracts: EthAssetContract[] = Object.keys(contractMap)
     address,
   }))
   .filter((contract) => contract.erc721 === true || contract.erc1155 === true)
-const rpcStore = useRpcStore()
-const userStore = useUserStore()
 
 const loader = reactive({
   show: false,
@@ -92,12 +100,7 @@ async function handleSubmit() {
     return toast.error('Token belongs to Ethereum Mainnet')
   }
 
-  const storedNftStrings = storage.local.getItem(
-    `${userStore.walletAddress}/${rpcStore.selectedRpcConfig?.chainId}/nfts`
-  )
-  let storedNfts: NFT[] = storedNftStrings?.length
-    ? JSON.parse(storedNftStrings)
-    : []
+  const storedNfts = nftDB.getNFTs(Number(rpcStore.selectedChainId))
 
   const existingStoredNft = storedNfts.find(
     (nft) =>
@@ -166,43 +169,16 @@ async function handleSubmit() {
         animationUrl: sanitizedAnimationUrl,
         attributes,
         balance: hasOwnership.balance,
+        tokenUrl: tokenUri,
       }
 
-      if (canEdit) {
-        storedNfts = storedNfts.filter(
-          (nft) =>
-            nft.address !== props.address || nft.tokenId !== props.tokenId
-        )
-      }
-      toast.success('NFT saved')
-      storedNfts.push(nftDetails)
-      storedNfts.sort((nft1, nft2) => {
-        if (nft1.tokenId > nft2.tokenId) {
-          return 1
-        }
-        if (nft2.tokenId > nft1.tokenId) {
-          return -1
-        }
-        return 0
-      })
-      storedNfts.sort((nft1, nft2) => {
-        if (nft1.collectionName > nft2.collectionName) {
-          return 1
-        }
-        if (nft2.collectionName > nft1.collectionName) {
-          return -1
-        }
-        return 0
-      })
+      nftDB.addNFT(nftDetails, Number(rpcStore.selectedChainId))
+      toast.success('NFT added')
 
-      storage.local.setItem(
-        `${userStore.walletAddress}/${rpcStore.selectedRpcConfig?.chainId}/nfts`,
-        JSON.stringify(storedNfts)
-      )
       router.back()
     } catch (e) {
       console.error(e)
-      toast.error("Couldn't fetch NFT details")
+      toast.error(e)
     }
   } else {
     toast.error('Invalid token ID')
@@ -213,40 +189,15 @@ async function handleSubmit() {
 function handleDeleteNft() {
   loader.show = true
   loader.message = 'Deleting NFT...'
-  const storedNftStrings = storage.local.getItem(
-    `${userStore.walletAddress}/${rpcStore.selectedRpcConfig?.chainId}/nfts`
-  )
-  let storedNfts: NFT[] = storedNftStrings?.length
-    ? JSON.parse(storedNftStrings)
-    : []
-
-  storedNfts = storedNfts.filter(
-    (nft) => nft.address !== props.address || nft.tokenId !== props.tokenId
-  )
-
-  storedNfts.sort((nft1, nft2) => {
-    if (nft1.tokenId > nft2.tokenId) {
-      return 1
-    }
-    if (nft2.tokenId > nft1.tokenId) {
-      return -1
-    }
-    return 0
-  })
-  storedNfts.sort((nft1, nft2) => {
-    if (nft1.collectionName > nft2.collectionName) {
-      return 1
-    }
-    if (nft2.collectionName > nft1.collectionName) {
-      return -1
-    }
-    return 0
-  })
-
-  storage.local.setItem(
-    `${userStore.walletAddress}/${rpcStore.selectedRpcConfig?.chainId}/nfts`,
-    JSON.stringify(storedNfts)
+  const storedNfts = nftDB.getNFTs(Number(rpcStore.selectedChainId))
+  const existingNft = storedNfts.find(
+    (nft) =>
+      nft.address.toLowerCase() === nftContract.address.toLowerCase() &&
+      nft.tokenId.toLowerCase() === nftContract.tokenId.toLowerCase()
   )
+  if (existingNft)
+    nftDB.removeNFT(existingNft, Number(rpcStore.selectedChainId))
+  toast.success('NFT deleted')
   router.back()
   loader.show = false
 }
@@ -278,7 +229,7 @@ watch(
       <AppLoader :message="loader.message" />
     </div>
     <div class="p-4 sm:p-2 h-full flex flex-col overflow-auto">
-      <div v-if="canEdit" class="flex justify-between items-start">
+      <div v-if="canDelete" class="flex justify-between items-start">
         <h2 class="font-semibold mb-5 add-token__title">Edit NFT</h2>
         <img
           :src="getImage('trash-icon')"
diff --git a/src/pages/ManageNFTScreen.vue b/src/pages/ManageNFTScreen.vue
index e5837faf..7354ffc7 100644
--- a/src/pages/ManageNFTScreen.vue
+++ b/src/pages/ManageNFTScreen.vue
@@ -1,9 +1,10 @@
 <script setup lang="ts">
-import { reactive } from 'vue'
+import { onBeforeMount, reactive, ref, type Ref } from 'vue'
 import { useRouter } from 'vue-router'
 
 import AppLoader from '@/components/AppLoader.vue'
 import { NFT } from '@/models/NFT'
+import { NFTDB } from '@/services/nft.service'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
 import { getStorage } from '@/utils/storageWrapper'
@@ -18,12 +19,15 @@ const loader = reactive({
   show: false,
   message: '',
 })
+const storage = getStorage()
 
-const storedNftsString = getStorage().local.getItem(
-  `${userStore.walletAddress}/${rpcStore.selectedRpcConfig?.chainId}/nfts`
-)
+let nftDB: NFTDB
+const nfts: Ref<NFT[]> = ref([])
 
-const nfts: NFT[] = storedNftsString?.length ? JSON.parse(storedNftsString) : []
+onBeforeMount(async () => {
+  nftDB = await NFTDB.create(storage.local, userStore.walletAddress)
+  nfts.value = nftDB.getNFTs(Number(rpcStore.selectedChainId))
+})
 
 function handleClose() {
   router.back()
@@ -32,6 +36,19 @@ function handleClose() {
 function handleAddToken() {
   router.push({ name: 'AddNft' })
 }
+
+function handleEditToken(nft: NFT) {
+  if (!nft.autodetected) {
+    router.push({
+      name: 'EditNft',
+      params: {
+        address: nft.address,
+        collectionName: nft.collectionName,
+        tokenId: nft.tokenId,
+      },
+    })
+  }
+}
 </script>
 
 <template>
@@ -55,22 +72,20 @@ function handleAddToken() {
               v-for="nft in nfts"
               :key="`nft-${nft.address}-${nft.tokenId}`"
               :title="`${nft.collectionName} (${nft.tokenId}) - ${nft.name}`"
-              class="cursor-pointer select-none p-3 rounded-[10px] flex justify-between gap-1 hover:bg-zinc-200 dark:hover:bg-zinc-800 text-black dark:text-white nft-container"
-              @click.stop="
-                router.push({
-                  name: 'EditNft',
-                  params: {
-                    address: nft.address,
-                    collectionName: nft.collectionName,
-                    tokenId: nft.tokenId,
-                  },
-                })
-              "
+              class="select-none p-3 rounded-[10px] flex justify-between gap-1 hover:bg-zinc-200 dark:hover:bg-zinc-800 text-black dark:text-white nft-container"
+              :class="{
+                'cursor-pointer': !nft.autodetected,
+              }"
+              @click.stop="handleEditToken(nft)"
             >
               <span class="overflow-hidden whitespace-nowrap text-ellipsis">
                 {{ nft.collectionName }} ({{ nft.tokenId }})
               </span>
-              <img :src="getImage('edit-icon')" class="opacity-0" />
+              <img
+                v-if="!nft.autodetected"
+                :src="getImage('edit-icon')"
+                class="opacity-0"
+              />
             </div>
           </div>
           <div v-else class="flex flex-col flex-grow">
diff --git a/src/services/nft.service.ts b/src/services/nft.service.ts
new file mode 100644
index 00000000..27fe5303
--- /dev/null
+++ b/src/services/nft.service.ts
@@ -0,0 +1,211 @@
+import axios from 'axios'
+
+import type { NFT } from '@/models/NFT'
+import type { StorageWrapper } from '@/utils/storageWrapper'
+
+const NFT_DB_KEY = 'nft_list'
+const NFT_PAGE_SIZE = 50
+
+type NFTItem = NFT & {
+  autodetected: boolean
+  chainId: number
+}
+
+type AnkrTrait = {
+  trait_type: string
+  value: string
+}
+
+type AnkrNFT = {
+  blockchain: string
+  collectionName: string
+  contractAddress: string
+  contractType: string
+  imageUrl: string
+  name: string
+  quantity: string
+  symbol: string
+  tokenId: string
+  tokenUrl: string
+  animationUrl?: string
+  traits?: AnkrTrait[]
+  nextPageToken: string
+}
+
+const ANKR_BLOCKCHAIN_TO_CHAIN_ID = new Map([
+  ['arbitrum', 42161],
+  ['avalanche', 43114],
+  ['avalanche_fuji', 43113],
+  ['bsc', 56],
+  ['eth', 1],
+  ['eth_goerli', 5],
+  ['fantom', 250],
+  ['optimism', 10],
+  ['polygon', 137],
+  ['polygon_mumbai', 80001],
+  ['syscoin', 57],
+])
+
+class NFTDB {
+  private readonly storage: StorageWrapper
+  private readonly walletAddress: string
+  public list: NFTItem[]
+
+  static async create(storage: StorageWrapper, walletAddress: string) {
+    let existingNfts: NFTItem[]
+    const realKey = `${walletAddress}-${NFT_DB_KEY}`
+
+    const nftsInStorage = storage.getItem(realKey)
+    existingNfts = nftsInStorage ? JSON.parse(nftsInStorage) : []
+    existingNfts = existingNfts.filter((nft) => !nft.autodetected)
+
+    try {
+      let npToken: null | boolean | string = null
+      while (npToken !== false) {
+        const resp = await axios({
+          method: 'POST',
+          baseURL: process.env.VUE_APP_ANKR_PREMIUM_API_URL,
+          url: '',
+          params: {
+            ankr_getNFTsByOwner: '',
+          },
+          data: {
+            id: 1,
+            jsonrpc: '2.0',
+            method: 'ankr_getNFTsByOwner',
+            params: {
+              blockchain: Array.from(ANKR_BLOCKCHAIN_TO_CHAIN_ID.keys()),
+              walletAddress,
+              pageSize: NFT_PAGE_SIZE,
+              pageToken:
+                npToken != null || npToken != false ? npToken : undefined,
+            },
+          },
+        })
+
+        const result = resp.data.result?.assets as AnkrNFT[]
+        for (const r of result) {
+          let contractType
+
+          switch (r.contractType) {
+            case 'ERC721':
+              contractType = 'erc721'
+              break
+            case 'ERC1155':
+              contractType = 'erc1155'
+              break
+            default:
+              continue
+          }
+          const chainId = ANKR_BLOCKCHAIN_TO_CHAIN_ID.get(r.blockchain)
+          if (chainId == null) {
+            continue
+          }
+
+          existingNfts.push({
+            type: contractType,
+            address: r.contractAddress,
+            tokenId: r.tokenId,
+            collectionName: r.collectionName,
+            name: r.name,
+            imageUrl: r.imageUrl,
+            attributes: r.traits?.map((k) => ({
+              trait: k.trait_type,
+              value: k.value,
+            })),
+            autodetected: true,
+            chainId,
+            tokenUrl: r.tokenUrl,
+            balance: r.quantity ? Number(r.quantity) : undefined,
+          })
+        }
+        npToken =
+          resp.data.result?.nextPageToken == ''
+            ? false
+            : resp.data.result.nextPageToken
+      }
+    } catch (e) {
+      console.error('Caught error while trying to get NFTs:', e)
+    }
+
+    storage.setItem(realKey, JSON.stringify(existingNfts))
+
+    return new NFTDB(storage, walletAddress, existingNfts)
+  }
+
+  constructor(
+    storage: StorageWrapper,
+    walletAddress: string,
+    initialList: NFTItem[]
+  ) {
+    this.storage = storage
+    this.list = initialList
+    this.walletAddress = walletAddress
+  }
+
+  private get storageKey() {
+    return `${this.walletAddress}-${NFT_DB_KEY}`
+  }
+
+  private synchronizeToStorage() {
+    this.storage.setItem(this.storageKey, JSON.stringify(this.list))
+  }
+
+  public getNFTs(chainId: number): NFTItem[] {
+    return this.list.filter((x) => x.chainId == chainId)
+  }
+
+  public addNFT(item: NFT, chainId: number) {
+    const index = this.list.findIndex((x) => {
+      return (
+        x.chainId === chainId &&
+        x.address.toLowerCase() === item.address.toLowerCase() &&
+        x.tokenId === item.tokenId
+      )
+    })
+    if (index !== -1) {
+      throw new Error('NFT already exists')
+    }
+    this.list.push({
+      ...item,
+      autodetected: false,
+      chainId,
+      tokenUrl: '',
+    })
+    this.synchronizeToStorage()
+  }
+
+  public updateNFT(item: NFT, chainId) {
+    const act = this.list.find((x) => {
+      return (
+        x.chainId === chainId &&
+        x.address.toLowerCase() === item.address.toLowerCase() &&
+        x.tokenId === item.tokenId
+      )
+    })
+    if (act == null) {
+      throw new Error('Could not find the relevant NFT')
+    }
+    for (const k of Object.keys(item)) {
+      act[k] = item[k]
+    }
+    this.synchronizeToStorage()
+  }
+
+  public removeNFT(item: NFT, chainId: number) {
+    const index = this.list.findIndex((x) => {
+      return (
+        x.chainId === chainId &&
+        x.address.toLowerCase() === item.address.toLowerCase() &&
+        x.tokenId === item.tokenId
+      )
+    })
+    if (index === -1) {
+      throw new Error('Could not find the relevant NFT')
+    }
+    this.list.splice(index, 1)
+    this.synchronizeToStorage()
+  }
+}
+
+export { NFTDB }
diff --git a/src/shims-vue.d.ts b/src/shims-vue.d.ts
index 84659414..910cd5cd 100644
--- a/src/shims-vue.d.ts
+++ b/src/shims-vue.d.ts
@@ -24,6 +24,7 @@ declare namespace NodeJS {
     VUE_APP_RAMP_API_KEY: string
     VUE_APP_RAMP_ENV: 'STAGING' | 'PRODUCTION'
     VUE_APP_HIDE_ON_RAMP: 'true' | undefined
+    VUE_APP_ANKR_PREMIUM_API_URL: string
   }
 }
 
diff --git a/src/utils/storageWrapper.ts b/src/utils/storageWrapper.ts
index 65b22929..2c5b3520 100644
--- a/src/utils/storageWrapper.ts
+++ b/src/utils/storageWrapper.ts
@@ -44,3 +44,4 @@ function initStorage(appId?: string) {
 }
 
 export { getStorage, initStorage }
+export type { StorageWrapper }

From b55099474d366f15d2a15253734c147397ea4b3b Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 8 May 2023 17:25:41 +0530
Subject: [PATCH 004/153] Add nftDB in places where it was missing

---
 src/components/NFTView.vue                    |  2 +-
 src/pages/SelectNftScreen.vue                 | 65 +++++++++++--------
 src/utils/requestManagement.ts                | 36 ++--------
 .../validateAndPopulateContractForNft.ts      | 16 ++---
 4 files changed, 51 insertions(+), 68 deletions(-)

diff --git a/src/components/NFTView.vue b/src/components/NFTView.vue
index c2717bd1..727faee6 100644
--- a/src/components/NFTView.vue
+++ b/src/components/NFTView.vue
@@ -65,7 +65,7 @@ async function getNFTAssets() {
       details.animationUrl = sanitizeUrl(
         details.animation_url || details.animations
       )
-      nfts.value.push(details)
+      nfts.value.push({ ...nft, ...details })
     })
   )
   loader.show = false
diff --git a/src/pages/SelectNftScreen.vue b/src/pages/SelectNftScreen.vue
index 831991d4..5d0d1a2c 100644
--- a/src/pages/SelectNftScreen.vue
+++ b/src/pages/SelectNftScreen.vue
@@ -4,9 +4,12 @@ import { useRouter } from 'vue-router'
 
 import SendNft from '@/components/SendNft.vue'
 import type { NFT } from '@/models/NFT'
+import { getNFTDetails, modifyIpfsUrl } from '@/services/getNFTDetails.service'
+import { NFTDB } from '@/services/nft.service'
 import { useModalStore } from '@/store/modal'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
+import { checkOwnership } from '@/utils/nftUtils'
 import { getStorage } from '@/utils/storageWrapper'
 
 type ModalState = 'send-nft' | false
@@ -20,37 +23,44 @@ const showModal: Ref<ModalState> = ref(false)
 const modalStore = useModalStore()
 const searchQuery = ref('')
 const filteredNfts: Ref<NFT[]> = ref([])
+const storage = getStorage()
+let nftDB: NFTDB
 
-function fetchStoredNfts(): NFT[] {
-  const storedNftsString = getStorage().local.getItem(
-    `${userStore.walletAddress}/${rpcStore.selectedRpcConfig?.chainId}/nfts`
-  )
-  if (storedNftsString) {
-    return (JSON.parse(storedNftsString) as NFT[]).filter(
-      (contract) => contract.type === 'erc721' || contract.type === 'erc1155'
-    )
-  } else {
-    return []
+function sanitizeUrl(url?: string) {
+  if (url && url.startsWith('ipfs://')) {
+    return modifyIpfsUrl(url)
   }
+  return url
 }
 
 async function getNFTAssets() {
-  nfts.value = []
-  const storedNfts = fetchStoredNfts()
-  storedNfts.forEach((nft) => {
-    nfts.value.push({
-      type: nft.type,
-      name: nft.name,
-      balance: nft.balance,
-      imageUrl: nft.imageUrl,
-      animationUrl: nft.animationUrl,
-      description: nft.description,
-      collectionName: nft.collectionName,
-      tokenId: nft.tokenId,
-      address: nft.address,
-      attributes: nft.attributes,
+  const potentialNFTList = nftDB.getNFTs(Number(rpcStore.selectedChainId))
+  const chainId = Number(rpcStore.selectedChainId)
+
+  await Promise.all(
+    potentialNFTList.map(async (nft) => {
+      const [ownership, details] = await Promise.all([
+        nft.autodetected
+          ? undefined
+          : checkOwnership(nft.type, {
+              tokenId: nft.tokenId,
+              contractAddress: nft.address,
+            }),
+        getNFTDetails(nft.tokenUrl, nft.tokenId),
+      ])
+      if (ownership != undefined && !ownership.owner) {
+        nftDB.removeNFT(nft, chainId)
+        return
+      }
+
+      details.name = details.name || `#${nft.tokenId}`
+      details.imageUrl = sanitizeUrl(details.image_url || details.image)
+      details.animationUrl = sanitizeUrl(
+        details.animation_url || details.animations
+      )
+      nfts.value.push({ ...nft, ...details })
     })
-  })
+  )
   filteredNfts.value = [...nfts.value]
 }
 
@@ -82,7 +92,10 @@ watch(
   }
 )
 
-onMounted(getNFTAssets)
+onMounted(async () => {
+  nftDB = await NFTDB.create(storage.local, userStore.walletAddress)
+  await getNFTAssets()
+})
 
 rpcStore.$subscribe(getNFTAssets)
 </script>
diff --git a/src/utils/requestManagement.ts b/src/utils/requestManagement.ts
index 8b4b8a50..7b8c925a 100644
--- a/src/utils/requestManagement.ts
+++ b/src/utils/requestManagement.ts
@@ -1,14 +1,13 @@
 // Todo: Find a better place for these functions
 import { AppMode } from '@arcana/auth'
 import { ethErrors, serializeError } from 'eth-rpc-errors'
-import { ethers } from 'ethers'
 import { watch } from 'vue'
 import { useToast } from 'vue-toastification'
 
 import type { AssetContract } from '@/models/Asset'
 import { requirePermission } from '@/models/Connection'
-import { NFT } from '@/models/NFT'
 import { router } from '@/routes'
+import { NFTDB } from '@/services/nft.service'
 import { store } from '@/store'
 import { useActivitiesStore } from '@/store/activities'
 import { useRequestStore } from '@/store/request'
@@ -246,36 +245,11 @@ async function addToken(request, keeper) {
     })
   } else if (ercType === 'erc721' || ercType === 'erc1155') {
     const { nft } = await validateAddNftParams(ercType, params)
-    const nftsString = storage.local.getItem(
-      `${userStore.walletAddress}/${rpcStore.selectedRpcConfig?.chainId}/nfts`
-    )
-    let nfts: NFT[] = []
-    if (nftsString) {
-      nfts = JSON.parse(nftsString) as NFT[]
-    }
-    nfts.push({ ...nft })
-    nfts.sort((nft1, nft2) => {
-      if (nft1.tokenId > nft2.tokenId) {
-        return 1
-      }
-      if (nft2.tokenId > nft1.tokenId) {
-        return -1
-      }
-      return 0
-    })
-    nfts.sort((nft1, nft2) => {
-      if (nft1.collectionName > nft2.collectionName) {
-        return 1
-      }
-      if (nft2.collectionName > nft1.collectionName) {
-        return -1
-      }
-      return 0
-    })
-    storage.local.setItem(
-      `${userStore.walletAddress}/${rpcStore.selectedRpcConfig?.chainId}/nfts`,
-      JSON.stringify(nfts)
+    const nftDB = await NFTDB.create(
+      getStorage().local,
+      userStore.walletAddress
     )
+    nftDB.addNFT(nft, Number(rpcStore.selectedChainId))
     keeper.reply(request.method, {
       result: 'Token Added successfully',
       id: request.id,
diff --git a/src/utils/validateAndPopulateContractForNft.ts b/src/utils/validateAndPopulateContractForNft.ts
index fc4de6ea..124b5d13 100644
--- a/src/utils/validateAndPopulateContractForNft.ts
+++ b/src/utils/validateAndPopulateContractForNft.ts
@@ -2,6 +2,7 @@ import contractMap from '@/contract-map.json'
 import { EthAssetContract } from '@/models/Asset'
 import type { NFT } from '@/models/NFT'
 import { getNFTDetails, modifyIpfsUrl } from '@/services/getNFTDetails.service'
+import { NFTDB } from '@/services/nft.service'
 import {
   checkOwnership,
   getCollectionName,
@@ -16,15 +17,7 @@ const ethMainnetTokens: EthAssetContract[] = Object.keys(contractMap).map(
   })
 )
 
-function isNftInLocalStorage(walletAddress, chainId, tokenContract) {
-  const nftString = getStorage().local.getItem(
-    `${walletAddress}/${chainId}/nfts`
-  )
-  if (nftString === null) return false
-
-  const nfts = JSON.parse(nftString) as NFT[]
-  if (!Array.isArray(nfts)) return false
-
+function isNftInDB(nfts, tokenContract) {
   const tokenId = tokenContract.tokenId || tokenContract.token_id
 
   return nfts.find(
@@ -62,7 +55,10 @@ async function validateAndPopulateContractForNft({
     result.error = 'Required params missing'
     return result
   }
-  if (isNftInLocalStorage(walletAddress, chainId, nftContract)) {
+  const nftDB = await NFTDB.create(getStorage().local, walletAddress)
+  const nfts = nftDB.getNFTs(Number(chainId))
+
+  if (isNftInDB(nfts, nftContract)) {
     result.error = 'Token already added'
     result.isValid = false
     return result

From 55f3f99afbd1658657a98807754316588c9aa084 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 8 May 2023 17:42:15 +0530
Subject: [PATCH 005/153] Fix balance discrepancy issue

---
 src/components/AssetsView.vue | 16 +++++++++++-----
 src/pages/homeScreen.vue      | 11 ++++++++++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/components/AssetsView.vue b/src/components/AssetsView.vue
index c52f7811..6be110d8 100644
--- a/src/components/AssetsView.vue
+++ b/src/components/AssetsView.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { ethers } from 'ethers'
 import { onMounted, reactive, onBeforeUnmount } from 'vue'
 import { useRouter } from 'vue-router'
 
@@ -33,10 +34,7 @@ function fetchNativeAsset() {
   return {
     address: 'native',
     name: rpcStore.nativeCurrency.name,
-    balance: formatTokenDecimals(
-      rpcStore.walletBalance,
-      rpcStore.nativeCurrency.decimals
-    ),
+    balance: Number(ethers.utils.formatEther(rpcStore.walletBalance)),
     decimals: rpcStore.nativeCurrency.decimals,
     symbol: rpcStore.nativeCurrency.symbol,
     logo:
@@ -92,6 +90,10 @@ function handleAddToken() {
   router.push({ name: 'AddToken' })
 }
 
+function isNative(asset: Asset) {
+  return asset.address === 'native'
+}
+
 onMounted(async () => {
   await getAssetsBalance()
   assetsPolling = setInterval(updateAssetsBalance, 4000)
@@ -127,7 +129,11 @@ rpcStore.$subscribe(getAssetsBalance)
         </div>
         <div
           class="assets-view__asset-balance flex flex-wrap leading-none text-right overflow-hidden whitespace-nowrap text-ellipsis"
-          :title="`${asset.balance.toFixed(asset.decimals)} ${asset.symbol}`"
+          :title="`${
+            isNative(asset)
+              ? ethers.utils.formatEther(rpcStore.walletBalance)
+              : asset.balance.toFixed(asset.decimals)
+          } ${asset.symbol}`"
         >
           {{ beautifyBalance(asset.balance) }}
           {{ asset.symbol }}
diff --git a/src/pages/homeScreen.vue b/src/pages/homeScreen.vue
index 7151c650..83e8a785 100644
--- a/src/pages/homeScreen.vue
+++ b/src/pages/homeScreen.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ethers } from 'ethers'
-import { ref, onMounted, onBeforeUnmount } from 'vue'
+import { ref, onMounted, onBeforeUnmount, watch } from 'vue'
 
 import AppLoader from '@/components/AppLoader.vue'
 import AssetsView from '@/components/AssetsView.vue'
@@ -69,6 +69,15 @@ rpcStore.$subscribe(() => {
     handleChainChange()
   }
 })
+
+watch(
+  () => rpcStore.walletBalance,
+  () => {
+    if (rpcStore.walletBalance) {
+      walletBalance.value = ethers.utils.formatEther(rpcStore.walletBalance)
+    }
+  }
+)
 </script>
 
 <template>

From 7bd38488781bcb1b0c9d36f7b1b97ebd7f534ccd Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 8 May 2023 17:52:28 +0530
Subject: [PATCH 006/153] Listen to requests after all the ops are completed

---
 src/pages/loggedInView.vue | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index 35d366f0..f805701d 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -59,6 +59,21 @@ onMounted(async () => {
   await getAccountDetails()
   await setMFABannerState()
   router.push({ name: 'home' })
+  const requestHandler = getRequestHandler()
+  if (requestHandler) {
+    requestHandler.setConnection(parentConnection)
+    const { chainId, ...rpcConfig } = rpcStore.selectedRpcConfig
+    const selectedChainId = Number(chainId)
+    await requestHandler.setRpcConfig({
+      chainId: selectedChainId,
+      ...rpcConfig,
+    })
+    const parentConnectionInstance = await parentConnection.promise
+    parentConnectionInstance.onEvent('connect', {
+      chainId: selectedChainId,
+    })
+    watchRequestQueue(requestHandler)
+  }
   loader.value.show = false
 })
 
@@ -116,23 +131,6 @@ async function initAccountHandler() {
         const walletType = await getWalletType(appStore.id)
         setAppMode(walletType, parentConnectionInstance)
       }
-
-      const requestHandler = getRequestHandler()
-      if (requestHandler) {
-        requestHandler.setConnection(parentConnection)
-        const { chainId, ...rpcConfig } = rpcStore.selectedRpcConfig
-        const selectedChainId = Number(chainId)
-        await requestHandler.setRpcConfig({
-          chainId: selectedChainId,
-          ...rpcConfig,
-        })
-
-        watchRequestQueue(requestHandler)
-
-        parentConnectionInstance.onEvent('connect', {
-          chainId: selectedChainId,
-        })
-      }
     }
   } catch (err) {
     console.log({ err })

From 13b80c4882878270100002579541d88fdfcdb203 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 9 May 2023 10:12:49 +0530
Subject: [PATCH 007/153] Move repeated code to utils and reuse it

---
 src/components/NFTView.vue    | 41 +++-------------------------
 src/pages/SelectNftScreen.vue | 38 ++------------------------
 src/utils/nftUtils.ts         | 51 +++++++++++++++++++++++++++++++++--
 3 files changed, 54 insertions(+), 76 deletions(-)

diff --git a/src/components/NFTView.vue b/src/components/NFTView.vue
index 727faee6..c39b9eec 100644
--- a/src/components/NFTView.vue
+++ b/src/components/NFTView.vue
@@ -3,11 +3,10 @@ import { onMounted, ref, type Ref, reactive, watch } from 'vue'
 import { useRouter } from 'vue-router'
 
 import type { NFT } from '@/models/NFT'
-import { getNFTDetails, modifyIpfsUrl } from '@/services/getNFTDetails.service'
 import { NFTDB } from '@/services/nft.service'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
-import { checkOwnership } from '@/utils/nftUtils'
+import { getDetailedNFTs } from '@/utils/nftUtils'
 import { getStorage } from '@/utils/storageWrapper'
 
 const userStore = useUserStore()
@@ -29,45 +28,11 @@ const loader = reactive({
   message: 'Loading saved NFTs...',
 })
 
-function sanitizeUrl(url?: string) {
-  if (url && url.startsWith('ipfs://')) {
-    return modifyIpfsUrl(url)
-  }
-  return url
-}
-
 async function getNFTAssets() {
   loader.show = true
   nftDB = await NFTDB.create(storage.local, userStore.walletAddress)
-  nfts.value = []
-
-  const potentialNFTList = nftDB.getNFTs(Number(rpcStore.selectedChainId))
-  const chainId = Number(rpcStore.selectedChainId)
-
-  await Promise.all(
-    potentialNFTList.map(async (nft) => {
-      const [ownership, details] = await Promise.all([
-        nft.autodetected
-          ? undefined
-          : checkOwnership(nft.type, {
-              tokenId: nft.tokenId,
-              contractAddress: nft.address,
-            }),
-        getNFTDetails(nft.tokenUrl, nft.tokenId),
-      ])
-      if (ownership != undefined && !ownership.owner) {
-        nftDB.removeNFT(nft, chainId)
-        return
-      }
-
-      details.name = details.name || `#${nft.tokenId}`
-      details.imageUrl = sanitizeUrl(details.image_url || details.image)
-      details.animationUrl = sanitizeUrl(
-        details.animation_url || details.animations
-      )
-      nfts.value.push({ ...nft, ...details })
-    })
-  )
+  nfts.value = await getDetailedNFTs(nftDB, Number(rpcStore.selectedChainId))
+
   loader.show = false
 }
 
diff --git a/src/pages/SelectNftScreen.vue b/src/pages/SelectNftScreen.vue
index 5d0d1a2c..c03d42f0 100644
--- a/src/pages/SelectNftScreen.vue
+++ b/src/pages/SelectNftScreen.vue
@@ -4,12 +4,11 @@ import { useRouter } from 'vue-router'
 
 import SendNft from '@/components/SendNft.vue'
 import type { NFT } from '@/models/NFT'
-import { getNFTDetails, modifyIpfsUrl } from '@/services/getNFTDetails.service'
 import { NFTDB } from '@/services/nft.service'
 import { useModalStore } from '@/store/modal'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
-import { checkOwnership } from '@/utils/nftUtils'
+import { getDetailedNFTs } from '@/utils/nftUtils'
 import { getStorage } from '@/utils/storageWrapper'
 
 type ModalState = 'send-nft' | false
@@ -26,41 +25,8 @@ const filteredNfts: Ref<NFT[]> = ref([])
 const storage = getStorage()
 let nftDB: NFTDB
 
-function sanitizeUrl(url?: string) {
-  if (url && url.startsWith('ipfs://')) {
-    return modifyIpfsUrl(url)
-  }
-  return url
-}
-
 async function getNFTAssets() {
-  const potentialNFTList = nftDB.getNFTs(Number(rpcStore.selectedChainId))
-  const chainId = Number(rpcStore.selectedChainId)
-
-  await Promise.all(
-    potentialNFTList.map(async (nft) => {
-      const [ownership, details] = await Promise.all([
-        nft.autodetected
-          ? undefined
-          : checkOwnership(nft.type, {
-              tokenId: nft.tokenId,
-              contractAddress: nft.address,
-            }),
-        getNFTDetails(nft.tokenUrl, nft.tokenId),
-      ])
-      if (ownership != undefined && !ownership.owner) {
-        nftDB.removeNFT(nft, chainId)
-        return
-      }
-
-      details.name = details.name || `#${nft.tokenId}`
-      details.imageUrl = sanitizeUrl(details.image_url || details.image)
-      details.animationUrl = sanitizeUrl(
-        details.animation_url || details.animations
-      )
-      nfts.value.push({ ...nft, ...details })
-    })
-  )
+  nfts.value = await getDetailedNFTs(nftDB, Number(rpcStore.selectedChainId))
   filteredNfts.value = [...nfts.value]
 }
 
diff --git a/src/utils/nftUtils.ts b/src/utils/nftUtils.ts
index 6ff65124..5b2b3339 100644
--- a/src/utils/nftUtils.ts
+++ b/src/utils/nftUtils.ts
@@ -2,7 +2,9 @@ import { ethers } from 'ethers'
 
 import erc1155abi from '@/abis/erc1155.abi.json'
 import erc721abi from '@/abis/erc721.abi.json'
-import type { NFTContractType } from '@/models/NFT'
+import type { NFT, NFTContractType } from '@/models/NFT'
+import { getNFTDetails, modifyIpfsUrl } from '@/services/getNFTDetails.service'
+import { NFTDB } from '@/services/nft.service'
 import { useUserStore } from '@/store/user'
 import { getRequestHandler } from '@/utils/requestHandlerSingleton'
 
@@ -140,4 +142,49 @@ async function checkOwnership(
   }
 }
 
-export { getTokenUri, getERCStandard, getCollectionName, checkOwnership }
+function sanitizeUrl(url?: string) {
+  if (url && url.startsWith('ipfs://')) {
+    return modifyIpfsUrl(url)
+  }
+  return url
+}
+
+async function getDetailedNFTs(nftDB: NFTDB, chainId: number) {
+  const potentialNFTList = nftDB.getNFTs(chainId)
+  const nfts: NFT[] = []
+
+  await Promise.all(
+    potentialNFTList.map(async (nft) => {
+      const [ownership, details] = await Promise.all([
+        nft.autodetected
+          ? undefined
+          : checkOwnership(nft.type, {
+              tokenId: nft.tokenId,
+              contractAddress: nft.address,
+            }),
+        getNFTDetails(nft.tokenUrl, nft.tokenId),
+      ])
+      if (ownership != undefined && !ownership.owner) {
+        nftDB.removeNFT(nft, chainId)
+        return
+      }
+
+      details.name = details.name || `#${nft.tokenId}`
+      details.imageUrl = sanitizeUrl(details.image_url || details.image)
+      details.animationUrl = sanitizeUrl(
+        details.animation_url || details.animations
+      )
+      nfts.push({ ...nft, ...details })
+    })
+  )
+
+  return nfts
+}
+
+export {
+  getTokenUri,
+  getERCStandard,
+  getCollectionName,
+  checkOwnership,
+  getDetailedNFTs,
+}

From 73803fb11afab457c25a74f0ac824237ecec8413 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 9 May 2023 11:48:35 +0530
Subject: [PATCH 008/153] Remove non required styles

---
 src/App.vue   | 138 --------------------------------------------------
 src/index.css |  71 --------------------------
 2 files changed, 209 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 492966e8..d5ef11cf 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -66,109 +66,6 @@ const showFooter = computed(() => {
 </template>
 
 <style>
-@import '@/assets/css/reset.css';
-
-:root {
-  --color-light: #f9f9f9;
-  --color-dark: #101010;
-  --color-philippine-gray: #8d8d8d;
-  --color-light-disabled: #f9f9f9af;
-  --color-dark-disabled: #101010af;
-  --color-state-green: #5dab5c;
-  --color-state-red: #b43030;
-  --color-state-yellow: #b07641;
-  --color-gradient-light: linear-gradient(
-    324.81deg,
-    #d6d8d9 14.65%,
-    rgb(232 232 232 / 36%) 92.36%
-  );
-  --color-gradient-dark: radial-gradient(
-    134.5% 939.99% at -23.59% -12.9%,
-    #262626 0%,
-    #1a1a1a 31.41%,
-    rgb(32 32 32 / 76%) 100%
-  );
-  --box-shadow-light: inset -1px -1px 1px rgb(255 255 255 / 70%),
-    inset 1px 1px 2px rgb(174 174 192 / 20%);
-  --box-shadow-dark: inset -2px -2px 4px rgb(57 57 57 / 44%),
-    inset 5px 5px 10px rgb(11 11 11 / 50%);
-  --debossed-light-color: #eee;
-  --debossed-dark-color: #161616;
-  --debossed-box-shadow-light: inset 5px 5px 10px 5px rgb(255 255 255 / 70%);
-  --debossed-box-shadow-dark: inset 5px 5px 10px 5px #121212;
-  --fs-500: 20px;
-  --fs-550: 18px;
-  --fs-400: 16px;
-  --fs-350: 14px;
-  --fs-300: 12px;
-  --fs-250: 12px;
-  --p-500: 20px;
-  --p-450: 18px;
-  --p-400: 16px;
-  --p-350: 14px;
-  --p-300: 12px;
-  --p-250: 10px;
-  --flow-space-container: 30px;
-  --flow-space-element: 20px;
-}
-
-@media (max-width: 235px) {
-  :root {
-    --fs-500: 16px;
-    --fs-450: 14px;
-    --fs-400: 12px;
-    --fs-350: 10px;
-    --fs-300: 8px;
-    --fs-250: 8px;
-    --p-500: 16px;
-    --p-550: 14px;
-    --p-400: 12px;
-    --p-350: 10px;
-    --p-300: 8px;
-    --p-250: 6px;
-    --flow-space-container: 15px;
-    --flow-space-element: 10px;
-  }
-}
-
-.light-mode {
-  --fg-color: var(--color-dark);
-  --fg-color-secondary: var(--color-philippine-gray);
-  --bg-gradient: var(--color-gradient-light);
-  --content-bg-color: var(--color-light);
-  --container-bg-color: #f2f2f2;
-  --debossed-box-color: var(--debossed-light-color);
-  --debossed-shadow: var(--debossed-box-shadow-light);
-  --card-shadow: 4px 5px 4px #f0f0f3;
-  --card-bg: #f9f9f9;
-  --filled-button-bg-color: var(--color-dark);
-  --filled-button-fg-color: var(--color-light);
-  --outlined-button-border-color: var(--color-dark);
-  --outlined-button-fg-color: var(--color-dark);
-  --button-bg-disabled: var(--color-dark-disabled);
-  --scrollbar-thumb-color: #ddd;
-  --request-footer-bg: rgb(235 235 235 / 70%);
-}
-
-.dark-mode {
-  --fg-color: var(--color-light);
-  --fg-color-secondary: var(--color-philippine-gray);
-  --bg-gradient: var(--color-gradient-dark);
-  --content-bg-color: var(--color-gradient-dark);
-  --container-bg-color: #1e1e1e;
-  --debossed-box-color: var(--debossed-dark-color);
-  --debossed-shadow: var(--debossed-box-shadow-dark);
-  --card-shadow: 4px 5px 4px #181818;
-  --card-bg: #262626;
-  --filled-button-bg-color: var(--color-light);
-  --filled-button-fg-color: var(--color-dark);
-  --outlined-button-border-color: var(--color-light);
-  --outlined-button-fg-color: var(--color-light);
-  --button-bg-disabled: var(--color-light-disabled);
-  --scrollbar-thumb-color: #444;
-  --request-footer-bg: rgb(10 10 10 / 70%);
-}
-
 ::-webkit-scrollbar {
   width: 0.75rem;
   height: 0.75rem;
@@ -191,41 +88,6 @@ body {
   overflow-x: hidden;
 }
 
-button {
-  height: 40px;
-
-  /* TODO: Brainstorm on managing outlines. https://github.com/arcana-network/wallet-ui/pull/1#discussion_r824371816 */
-  cursor: pointer;
-  background: transparent;
-  outline: none;
-}
-
-.font-montserrat {
-  font-family: MontserratVariable, sans-serif;
-}
-
-.color-secondary {
-  color: var(--color-philippine-gray);
-}
-
-.color-state-green {
-  color: var(--color-state-green);
-}
-
-.color-state-red {
-  color: var(--color-state-red);
-}
-
-.color-state-yellow {
-  color: var(--color-state-yellow);
-}
-
-@media (max-width: 235px) {
-  button {
-    height: 30px;
-  }
-}
-
 .wallet__container {
   display: flex;
   flex-direction: column;
diff --git a/src/index.css b/src/index.css
index ae445991..b966289a 100644
--- a/src/index.css
+++ b/src/index.css
@@ -3,75 +3,4 @@
 @tailwind utilities;
 
 @layer utilities {
-  :root {
-    --bg-gradient-start-color: #eee;
-    --bg-gradient-stop-color: #eee;
-    --tab-shadow-color: inset 0 4px 4px rgb(0 0 0 / 25%);
-    --tab-container-shadow: inset -1px -1px 1px rgb(255 255 255 / 70%),
-      inset 1px 1px 2px rgb(0 0 0 / 5%);
-    --input-box-shadow: inset -1px -1px 1px rgb(255 255 255 / 70%),
-      inset 1px 1px 2px rgb(0 0 0 / 5%);
-    --tab-view-border-color: #aeaec0;
-    --nft-card-background: #dadada;
-    --nft-card-title: #aaa;
-    --nft-card-collection: #808080;
-  }
-
-  .dark {
-    --glow-start-color: rgb(247 247 247 / 30%);
-    --glow-middle-color: rgb(11 11 11 / 50%);
-    --glow-stop-color: rgb(28 28 28 / 84%);
-    --bg-gradient-start-color: #161616;
-    --bg-gradient-stop-color: #151515;
-    --tab-shadow-color: rgb(0 0 0 / 25%);
-    --tab-container-shadow: 5px 5px 10px rgb(0 0 0 / 15%);
-    --input-box-shadow: var(--debossed-box-shadow);
-    --tab-view-border-color: rgb(247 247 247 / 20%);
-    --nft-card-background: #202020;
-  }
-
-  .tab-shadow {
-    box-shadow: inset 0 4px 4px var(--tab-shadow-color);
-  }
-
-  .glow {
-    box-shadow: 0 0 12px 4px var(--glow-start-color),
-      inset 5px 5px 10px var(--glow-middle-color),
-      inset -50px 49px 29px 22px var(--glow-stop-color);
-  }
-
-  .glow {
-    box-shadow: 0 0 12px 4px var(--glow-start-color),
-      inset 5px 5px 10px var(--glow-middle-color),
-      inset -50px 49px 29px 22px var(--glow-stop-color);
-  }
-
-  .bg-gradient {
-    background: linear-gradient(
-      141.48deg,
-      var(--bg-gradient-start-color) -4.56%,
-      var(--bg-gradient-stop-color) 135.63%
-    );
-  }
-
-  .wallet__card {
-    background: var(--card-bg);
-    box-shadow: var(--card-shadow);
-  }
-
-  .label,
-  ::placeholder {
-    color: var(--color-philippine-gray);
-  }
-
-  .input,
-  .debossed-card {
-    background: var(--debossed-box-color);
-    border-radius: 10px;
-    box-shadow: var(--input-box-shadow);
-  }
-
-  .tab-view-border-color {
-    border-color: var(--tab-view-border-color);
-  }
 }

From 330683332ce1781ff8375e40c266e02069fc35bf Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 9 May 2023 12:58:29 +0530
Subject: [PATCH 009/153] Add tailwind config

---
 tailwind.config.js | 53 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 5 deletions(-)

diff --git a/tailwind.config.js b/tailwind.config.js
index 69e01493..f00cb5e2 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -3,11 +3,54 @@ module.exports = {
   content: ['./src/**/*.{vue,js,ts,jsx,tsx,css}'],
   darkMode: 'class',
   theme: {
-    screens: {
-      sm: { max: '235px' },
-      lg: '236px',
+    fontSize: {
+      xs: '10px',
+      sm: '12px',
+      base: '14px',
+      lg: '16px',
+      xl: '18px',
+      xxl: '28px',
+    },
+    fontWeight: {
+      light: 300,
+      normal: 400,
+      medium: 500,
+      bold: 700,
+    },
+    colors: {
+      red: '#ff4264',
+      yellow: '#eeb113',
+      blue: '#3e9aff',
+      green: '#05c168',
+      black: {
+        100: '#000000',
+      },
+      white: {
+        100: '#ffffff',
+        200: '#f7f7f7',
+      },
+      gray: {
+        100: '#050505',
+        200: '#141414',
+        300: '#1f1f1f',
+        400: '#8d8d8d',
+        500: '#363636',
+        600: '#313131',
+        700: '#050505',
+        800: '#dcdcdc',
+        900: '#2c2c2c',
+      },
+    },
+    width: {
+      icon: {
+        xs: '14px',
+        sm: '16px',
+        md: '18px',
+        lg: '20px',
+        xl: '24px',
+        xxl: '32px',
+        xxxl: '34px',
+      },
     },
-    extend: {},
   },
-  plugins: [],
 }

From 1791be42e149308b8a40e9c14fa40ada1697738a Mon Sep 17 00:00:00 2001
From: Karthik Durai <iamkarthiksiddarth@gmail.com>
Date: Tue, 9 May 2023 15:22:08 +0530
Subject: [PATCH 010/153] [AR-5926] Move UI related code from Auth SDK to
 Wallet UI (#261)

* make bottom border rounded

* create wallet header

* create wallet button

* add type to set iframe style

* comment code that calls sdk fn close, open wallet

* add two new methods from parent connection

* set walletpostion, logo and set showWallet to true

* add new props to show/hide, position wallet

* impl getter to get iframe style

* create actions to set position and logo of wallet

* replace with expand wallet

* put optional chaining while accessing logo

* add InitParentConnectionApi to connection prop

* add wallet header and button to UI

* remove loader component

* destructure required prop from app store

* set iframe style based on show/expand wallet

* set false to showWallet in handleLogout

* if showWallet is false, set height & width zero

* fix logic that sets iframe style

* use Partial keyword in style type

* add child method to expand wallet

* use generic handle name

* apply height for logo

* create component for compact mode

* add getSDKVersion fn and return type

* impl logic to show compact/expanded mode

* based on sdk version call/set appropriate values

* add compact mode to state

* add SDK version state

* impl getter to get iframe styles

* if there are requests, route to /requests

* rotate arrow based on mode

* emit click on click of arrow

* remove unused imports

* get sdkversion and set wallet position based on version

* get compact mode and sdk version values

* move setIframeStyle to a fn and call it as needed

* add compact mode check to showFooter computed

* implement two different UI based on SDK version

* create request count badge & impl on wallet button

* increase values little bit

* set height to 100%

* fix logic renders footer when permission shown

* add transition prop

* add css transition

* show request count badge little late

* Merge branch 'dev' of github.com:arcana-network/wallet-ui into karthik/AR-5926-move-show-hide-logic-of-wallet-ui-to-its-src

* remove code that routes to home

* inc space b/w logo and title, dec height of logo

* rename file

* move constants to constants file

* remove check for transaction request

* set padding made of wallet mode

* impl code compact mode for transaction & sign req

* await request process

* remove routing to MFA req page

* move toast time out to constant

* impl code to hide shrink wallet after toast ends

* remove unused style

* dont show banner if the wallet is in compact mode

* use v-show instead of v-if and v-else

* set right and left based on position

* remove code that redirects to login page

* change char case
---
 src/App.vue                               | 71 ++++++++++++++++---
 src/components/AppFooter.vue              |  2 +-
 src/components/GasPrice.vue               | 15 ++--
 src/components/RequestCountBadge.vue      | 31 ++++++++
 src/components/SendTransaction.vue        | 14 +++-
 src/components/SendTransactionCompact.vue | 86 +++++++++++++++++++++++
 src/components/SignMessage.vue            | 11 ++-
 src/components/SignMessageCompact.vue     | 48 +++++++++++++
 src/components/WalletButton.vue           | 54 ++++++++++++++
 src/components/WalletHeader.vue           | 33 +++++++++
 src/main.ts                               |  3 +-
 src/models/Connection.ts                  |  9 ++-
 src/pages/RequestsScreen.vue              | 69 ++++++++++--------
 src/pages/homeScreen.vue                  |  6 --
 src/pages/loggedInView.vue                | 34 ++++++---
 src/pages/profileScreen.vue               |  1 +
 src/store/app.ts                          | 50 +++++++++++++
 src/store/parentConnection.ts             | 13 +++-
 src/utils/constants.ts                    | 22 +++++-
 src/utils/requestManagement.ts            | 52 ++++++++------
 20 files changed, 530 insertions(+), 94 deletions(-)
 create mode 100644 src/components/RequestCountBadge.vue
 create mode 100644 src/components/SendTransactionCompact.vue
 create mode 100644 src/components/SignMessageCompact.vue
 create mode 100644 src/components/WalletButton.vue
 create mode 100644 src/components/WalletHeader.vue

diff --git a/src/App.vue b/src/App.vue
index 492966e8..c5cebad9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,12 +1,15 @@
 <script setup lang="ts">
-import { toRefs, ref, watch, computed, onBeforeMount } from 'vue'
+import { toRefs, watch, computed, onBeforeMount } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
 import WalletFooter from '@/components/AppFooter.vue'
 import BaseModal from '@/components/BaseModal.vue'
+import WalletButton from '@/components/WalletButton.vue'
+import WalletHeader from '@/components/WalletHeader.vue'
 import type { Theme } from '@/models/Theme'
 import { useAppStore } from '@/store/app'
 import { useModalStore } from '@/store/modal'
+import { useParentConnectionStore } from '@/store/parentConnection'
 import { useRequestStore } from '@/store/request'
 import { fetchTransakNetworks } from '@/utils/transak'
 
@@ -15,9 +18,9 @@ import '@/index.css'
 const app = useAppStore()
 const modal = useModalStore()
 const requestStore = useRequestStore()
+const parentConnectionStore = useParentConnectionStore()
 const router = useRouter()
-const { theme } = toRefs(app)
-const isLoading = ref(false)
+const { theme, expandWallet, showWallet, compactMode, sdkVersion } = toRefs(app)
 const route = useRoute()
 
 const url = new URL(window.location.href)
@@ -33,8 +36,23 @@ onBeforeMount(async () => {
   await fetchTransakNetworks()
 })
 
-watch(showRequestPage, () => {
-  if (showRequestPage.value) {
+async function setIframeStyle() {
+  const parentConnectionInstance = await parentConnectionStore.parentConnection
+    ?.promise
+  await parentConnectionInstance?.setIframeStyle(app.iframeStyle)
+}
+
+watch(showWallet, async (newValue) => {
+  if (newValue) app.expandWallet = false
+  setIframeStyle()
+})
+
+watch(expandWallet, setIframeStyle)
+
+watch(compactMode, setIframeStyle)
+
+watch(showRequestPage, (newValue) => {
+  if (newValue) {
     modal.show = false
     router.push({ name: 'requests', params: { appId: app.id } })
   }
@@ -42,22 +60,54 @@ watch(showRequestPage, () => {
 
 const showFooter = computed(() => {
   return (
-    !['requests', 'MFARequired', 'MFARestore'].includes(route.name as string) ||
-    (route.name === 'requests' && !requestStore.pendingRequest)
+    (!['requests', 'MFARequired', 'MFARestore'].includes(
+      route.name as string
+    ) ||
+      (route.name === 'requests' && !requestStore.pendingRequest)) &&
+    !app.compactMode
   )
 })
+
+function onClickOfHeader() {
+  if (app.compactMode) app.compactMode = false
+  else app.expandWallet = false
+}
 </script>
 
 <template>
-  <div v-if="isLoading" class="flex col justify-center items-center h-full">
-    <div>Loading...</div>
+  <div v-if="sdkVersion === 'v3'" class="flex flex-col h-full">
+    <div
+      v-show="expandWallet"
+      class="flex flex-col h-full"
+      :class="[theme === 'dark' ? 'dark-mode' : 'light-mode']"
+    >
+      <WalletHeader @click="onClickOfHeader" />
+      <div
+        class="flex-grow wallet__container p-4"
+        :class="{ 'rounded-b-xl p-0': compactMode }"
+      >
+        <RouterView class="min-h-full" />
+        <BaseModal v-if="modal.show" />
+      </div>
+      <WalletFooter v-if="showFooter" />
+    </div>
+    <div
+      v-show="!expandWallet"
+      class="h-full"
+      :class="[theme === 'dark' ? 'dark-mode' : 'light-mode']"
+    >
+      <WalletButton />
+    </div>
   </div>
   <div
     v-else
     class="flex flex-col h-full"
     :class="[theme === 'dark' ? 'dark-mode' : 'light-mode']"
   >
-    <div class="flex-grow wallet__container">
+    <div
+      class="flex-grow wallet__container p-4"
+      :class="{ 'rounded-b-xl p-0': compactMode }"
+    >
       <RouterView class="min-h-full" />
       <BaseModal v-if="modal.show" />
     </div>
@@ -230,7 +280,6 @@ button {
   display: flex;
   flex-direction: column;
   justify-content: space-around;
-  padding: var(--p-400);
   overflow-x: hidden;
   color: var(--fg-color);
   background: var(--container-bg-color);
diff --git a/src/components/AppFooter.vue b/src/components/AppFooter.vue
index 4cee2750..06625581 100644
--- a/src/components/AppFooter.vue
+++ b/src/components/AppFooter.vue
@@ -29,7 +29,7 @@ function getAppropriateIcon(iconName, pathName) {
 
 <template>
   <footer
-    class="flex items-center justify-end py-4"
+    class="flex items-center justify-end py-4 rounded-b-xl"
     :class="{ 'justify-between': userStore.isLoggedIn }"
   >
     <div v-if="userStore.isLoggedIn" class="flex space-x-4">
diff --git a/src/components/GasPrice.vue b/src/components/GasPrice.vue
index 29793d50..bb9a1ed6 100644
--- a/src/components/GasPrice.vue
+++ b/src/components/GasPrice.vue
@@ -6,14 +6,16 @@ import type { CurrencySymbol } from '@/services/exchangeRate.service'
 import { getExchangeRate } from '@/services/exchangeRate.service'
 import { GAS_AVAILABLE_CHAIN_IDS } from '@/services/gasPrice.service'
 import { useRpcStore } from '@/store/rpc'
+import {
+  EXCHANGE_RATE_CURRENCY,
+  GAS_FEE_UNIT,
+  GAS_PRICE_SPEED_MAP,
+} from '@/utils/constants'
 import debounce from '@/utils/debounce'
 import { formatValueToUSD } from '@/utils/formatUSD'
 import { convertGweiToEth } from '@/utils/gweiToEth'
 import { useImage } from '@/utils/useImage'
 
-const EXCHANGE_RATE_CURRENCY: CurrencySymbol = 'USD'
-const GAS_FEE_UNIT = 'GWEI'
-
 const emits = defineEmits(['gasPriceInput'])
 
 const props = defineProps({
@@ -51,11 +53,6 @@ watch(gasFee, () => {
 
 const getImage = useImage()
 const showCustomGasFeeInput = ref(false)
-const gasPriceLabelPropsMap = {
-  slow: { wait: 'safeLowWait', price: 'safeLow' },
-  standard: { wait: 'avgWait', price: 'average' },
-  fast: { wait: 'fastWait', price: 'fast' },
-}
 
 const showSlider = GAS_AVAILABLE_CHAIN_IDS.includes(
   Number(rpcStore.selectedChainId)
@@ -85,7 +82,7 @@ async function getConversionRate(gasFee) {
 function handleGasPriceSelect(value = '') {
   disableSlider.value = false
   const type = value.toLowerCase()
-  const { wait, price } = gasPriceLabelPropsMap[type]
+  const { wait, price } = GAS_PRICE_SPEED_MAP[type]
   gasFee.value = Number((props.gasPrices[price] / 10).toFixed(9))
   transactionTime.value = props.gasPrices[wait]
   emits('gasPriceInput', gasFee.value)
diff --git a/src/components/RequestCountBadge.vue b/src/components/RequestCountBadge.vue
new file mode 100644
index 00000000..374b1566
--- /dev/null
+++ b/src/components/RequestCountBadge.vue
@@ -0,0 +1,31 @@
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+
+const showComponent = ref(false)
+
+defineProps({
+  requestCount: {
+    type: Number,
+    required: true,
+  },
+})
+
+onMounted(() => {
+  // this is to fix issue when css transition is applied on Iframe window
+  setTimeout(() => {
+    showComponent.value = true
+  }, 500)
+})
+</script>
+
+<template>
+  <span v-if="showComponent" class="w-5 h-5 flex">
+    <span
+      class="animate-ping absolute h-full w-full rounded-full bg-[#b43030] opacity-75"
+    ></span>
+    <span
+      class="flex items-center justify-center rounded-full w-5 h-5 bg-[#b43030] text-xs font-medium"
+      >{{ requestCount }}</span
+    >
+  </span>
+</template>
diff --git a/src/components/SendTransaction.vue b/src/components/SendTransaction.vue
index 81074a88..8219467b 100644
--- a/src/components/SendTransaction.vue
+++ b/src/components/SendTransaction.vue
@@ -5,6 +5,7 @@ import type { Ref } from 'vue'
 
 import AppLoader from '@/components/AppLoader.vue'
 import GasPrice from '@/components/GasPrice.vue'
+import SendTransactionCompact from '@/components/SendTransactionCompact.vue'
 import SignMessageAdvancedInfo from '@/components/signMessageAdvancedInfo.vue'
 import {
   getGasPrice,
@@ -18,12 +19,12 @@ import { useImage } from '@/utils/useImage'
 
 const props = defineProps({
   request: {
-    type: Request,
+    type: Object,
     required: true,
   },
 })
 
-const emits = defineEmits(['gasPriceInput'])
+const emits = defineEmits(['gasPriceInput', 'reject', 'approve'])
 const customGasPrice = ref('')
 
 const rpcStore = useRpcStore()
@@ -70,6 +71,7 @@ onMounted(async () => {
 })
 
 function handleSetGasPrice(value) {
+  console.log('handleSetGasPrice', { value })
   const requestId = props.request.request.id
   customGasPrice.value = value
   emits('gasPriceInput', {
@@ -83,6 +85,14 @@ function handleSetGasPrice(value) {
   <div v-if="loader.show" class="flex justify-center items-center flex-1">
     <AppLoader :message="loader.message" />
   </div>
+  <SendTransactionCompact
+    v-else-if="appStore.compactMode"
+    :gas-price="customGasPrice"
+    :gas-prices="gasPrices"
+    :request="request"
+    @approve="emits('approve')"
+    @reject="emits('reject')"
+  />
   <div v-else class="flex flex-1 flex-col space-y-4 sm:space-y-3">
     <div class="flex flex-col space-y-2">
       <div class="flex justify-between">
diff --git a/src/components/SendTransactionCompact.vue b/src/components/SendTransactionCompact.vue
new file mode 100644
index 00000000..1b03d59f
--- /dev/null
+++ b/src/components/SendTransactionCompact.vue
@@ -0,0 +1,86 @@
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+
+import DateTime from '@/components/DateTime.vue'
+import { useAppStore } from '@/store/app'
+import { useParentConnectionStore } from '@/store/parentConnection'
+import { useRpcStore } from '@/store/rpc'
+import { GAS_FEE_UNIT, GAS_PRICE_SPEED_MAP } from '@/utils/constants'
+
+const emits = defineEmits(['reject', 'approve'])
+
+const rpcStore = useRpcStore()
+const appStore = useAppStore()
+const parentConnectionStore = useParentConnectionStore()
+const gasFee = ref(0)
+const transactionTime = ref(null)
+
+const props = defineProps({
+  request: {
+    type: Object,
+    required: true,
+  },
+  gasPrices: {
+    type: Object,
+    required: false,
+    default: () => ({}),
+  },
+})
+
+onMounted(async () => {
+  setHeight()
+  getGasPriceInfo()
+})
+
+async function setHeight() {
+  const parentConnectionInstance = await parentConnectionStore.parentConnection
+    ?.promise
+  await parentConnectionInstance?.setIframeStyle({
+    ...appStore.iframeStyle,
+    height: '275px',
+  })
+}
+
+function getGasPriceInfo() {
+  const { wait, price } = GAS_PRICE_SPEED_MAP['slow']
+  gasFee.value = Number((props.gasPrices[price] / 10).toFixed(9))
+  transactionTime.value = props.gasPrices[wait]
+}
+</script>
+
+<template>
+  <div
+    class="flex flex-1 flex-col h-full space-y-2 rounded-b-xl justify-between"
+  >
+    <div class="flex items-baseline">
+      <h1 class="flex-1 m-0 font-semibold text-base sm:text-sm capitalize">
+        Send Transaction
+      </h1>
+      <DateTime :datetime="request.receivedTime" />
+    </div>
+    <p class="text-xs text-zinc-400">
+      {{ appStore.name }} requests your permission to send this transaction to
+      the {{ rpcStore.selectedRpcConfig?.chainName }}. Please specify gas while
+      submitting the transaction.
+    </p>
+    <div class="flex-1">
+      <div class="flex flex-col justify-between">
+        <div class="space-x-1 flex items-baseline">
+          <span class="text-xs text-zinc-400">Gas Fees</span>
+          <div class="space-x-1">
+            <span class="sm:text-xs">{{ gasFee }}</span>
+            <span class="text-xs">{{ GAS_FEE_UNIT }}</span>
+          </div>
+        </div>
+        <div class="space-x-1">
+          <span class="text-xs text-zinc-400">Transaction Time:</span>
+          <span class="text-xs"> ~{{ transactionTime }} mins </span>
+        </div>
+      </div>
+    </div>
+    <div class="flex justify-end space-x-2 text-sm">
+      <button class="uppercase" @click="emits('reject')">Reject</button>
+      <button class="uppercase" @click="emits('approve')">Approve</button>
+    </div>
+  </div>
+</template>
diff --git a/src/components/SignMessage.vue b/src/components/SignMessage.vue
index 8cff8cf3..64c9e530 100644
--- a/src/components/SignMessage.vue
+++ b/src/components/SignMessage.vue
@@ -3,6 +3,7 @@ import { storeToRefs } from 'pinia'
 
 import DateTime from '@/components/DateTime.vue'
 import SignMessageAdvancedInfo from '@/components/signMessageAdvancedInfo.vue'
+import SignMessageCompact from '@/components/SignMessageCompact.vue'
 import type { Request } from '@/models/Connection'
 import { useAppStore } from '@/store/app'
 import { useRpcStore } from '@/store/rpc'
@@ -23,6 +24,8 @@ defineProps({
   },
 })
 
+const emits = defineEmits(['reject', 'approve'])
+
 const stateChangeRequests = [
   methodAndAction.wallet_addEthereumChain,
   methodAndAction.wallet_switchEthereumChain,
@@ -38,7 +41,13 @@ function getTitle(requestMethod: string) {
 </script>
 
 <template>
-  <div class="flex flex-1 flex-col space-y-4 sm:space-y-3">
+  <SignMessageCompact
+    v-if="appStore.compactMode"
+    :request="request"
+    @approve="emits('approve')"
+    @reject="emits('reject')"
+  />
+  <div v-else class="flex flex-1 flex-col space-y-4 sm:space-y-3">
     <div class="flex items-baseline">
       <h1 class="flex-1 m-0 font-semibold text-xl sm:text-sm capitalize">
         {{ getTitle(methodAndAction[request.request.method]) }}
diff --git a/src/components/SignMessageCompact.vue b/src/components/SignMessageCompact.vue
new file mode 100644
index 00000000..935fa507
--- /dev/null
+++ b/src/components/SignMessageCompact.vue
@@ -0,0 +1,48 @@
+<script setup lang="ts">
+import DateTime from '@/components/DateTime.vue'
+import type { Request } from '@/models/Connection'
+import { useAppStore } from '@/store/app'
+import { methodAndAction } from '@/utils/method'
+
+defineProps({
+  request: {
+    type: Request,
+    required: true,
+  },
+})
+
+const emits = defineEmits(['reject', 'approve'])
+
+const appStore = useAppStore()
+
+const stateChangeRequests = [
+  methodAndAction.wallet_addEthereumChain,
+  methodAndAction.wallet_switchEthereumChain,
+  methodAndAction.wallet_watchAsset,
+]
+
+function getTitle(requestMethod: string) {
+  if (stateChangeRequests.includes(requestMethod)) {
+    return requestMethod
+  }
+  return 'Sign Message'
+}
+</script>
+
+<template>
+  <div class="flex flex-1 flex-col space-y-2 rounded-b-xl">
+    <div class="flex items-baseline">
+      <h1 class="flex-1 m-0 font-semibold text-base sm:text-sm capitalize">
+        {{ getTitle(methodAndAction[request.request.method]) }}
+      </h1>
+      <DateTime :datetime="request.receivedTime" />
+    </div>
+    <p class="font-normal text-sm sm:text-xs">
+      {{ appStore.name }} requests your permission.
+    </p>
+    <div class="flex justify-end space-x-2 text-sm">
+      <button class="uppercase" @click="emits('reject')">Reject</button>
+      <button class="uppercase" @click="emits('approve')">Approve</button>
+    </div>
+  </div>
+</template>
diff --git a/src/components/WalletButton.vue b/src/components/WalletButton.vue
new file mode 100644
index 00000000..1ee982d9
--- /dev/null
+++ b/src/components/WalletButton.vue
@@ -0,0 +1,54 @@
+<script setup lang="ts">
+import { Wallet } from 'ethers'
+import { computed, toRefs } from 'vue'
+
+import RequestCountBadge from '@/components/RequestCountBadge.vue'
+import { useAppStore } from '@/store/app'
+import { useRequestStore } from '@/store/request'
+import { useImage } from '@/utils/useImage'
+
+const appStore = useAppStore()
+const requestStore = useRequestStore()
+const getImage = useImage()
+const { walletPosition } = toRefs(appStore)
+
+function onClickOfButton() {
+  appStore.expandWallet = true
+}
+
+const requestCount = computed(() => {
+  return requestStore.pendingRequestsForApproval.length
+})
+
+const showRequestCountBadge = computed(() => {
+  return requestStore.areRequestsPendingForApproval
+})
+</script>
+
+<template>
+  <div class="h-full relative">
+    <div v-if="showRequestCountBadge" class="z-[999] absolute top-4 left-2">
+      <RequestCountBadge :request-count="requestCount" />
+    </div>
+    <button
+      class="container | absolute bottom-0 w-14 h-11 flex justify-center items-center cursor-pointer"
+      :class="[
+        walletPosition === 'right' ? 'rounded-l-[10px]' : 'rounded-r-[10px]',
+        walletPosition === 'right' ? 'right-0' : 'left-0',
+      ]"
+      @click="onClickOfButton"
+    >
+      <img
+        :src="getImage('arrow-icon')"
+        alt="arrow icon"
+        :class="[walletPosition === 'right' ? 'rotate-90' : 'rotate-[270deg]']"
+      />
+    </button>
+  </div>
+</template>
+
+<style scoped>
+.container {
+  background: var(--container-bg-color);
+}
+</style>
diff --git a/src/components/WalletHeader.vue b/src/components/WalletHeader.vue
new file mode 100644
index 00000000..dedfbc3d
--- /dev/null
+++ b/src/components/WalletHeader.vue
@@ -0,0 +1,33 @@
+<script setup lang="ts">
+import { useAppStore } from '@/store/app'
+import { useImage } from '@/utils/useImage'
+
+const appStore = useAppStore()
+const getImage = useImage()
+
+const emits = defineEmits(['click'])
+</script>
+
+<template>
+  <header class="flex justify-between rounded-t-xl">
+    <div class="flex space-x-3 items-center">
+      <img :src="appStore.appLogo?.horizontal" alt="app logo" class="h-8" />
+      <p>{{ appStore.name }}</p>
+    </div>
+    <button
+      class="h-auto"
+      :class="[appStore.compactMode ? 'rotate-180' : 'rotate-0']"
+      @click="emits('click')"
+    >
+      <img :src="getImage('arrow-icon')" alt="arrow" />
+    </button>
+  </header>
+</template>
+
+<style scoped>
+header {
+  padding: var(--p-300);
+  color: var(--fg-color);
+  background: var(--container-bg-color);
+}
+</style>
diff --git a/src/main.ts b/src/main.ts
index 1de9a594..a6a7bf28 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,13 +10,14 @@ import Toast from 'vue-toastification'
 import App from '@/App.vue'
 import { router } from '@/routes/index'
 import { store } from '@/store'
+import { TOAST_TIME_OUT } from '@/utils/constants'
 
 import '@fontsource/montserrat/variable.css'
 import '@fontsource/sora/variable.css'
 import 'vue-toastification/dist/index.css'
 
 const toastOptions = {
-  timeout: 2500,
+  timeout: TOAST_TIME_OUT,
   closeOnClick: false,
   pauseOnFocusLoss: false,
   pauseOnHover: true,
diff --git a/src/models/Connection.ts b/src/models/Connection.ts
index 5485db1a..f0b5399f 100644
--- a/src/models/Connection.ts
+++ b/src/models/Connection.ts
@@ -1,7 +1,9 @@
-import { AppConfig, AppMode, RpcConfig } from '@arcana/auth'
+import { AppConfig, AppMode, Position, RpcConfig } from '@arcana/auth'
 import type { SocialLoginType } from '@arcana/auth-core'
 import { JsonRpcRequest, PendingJsonRpcResponse } from 'json-rpc-engine'
 
+type SDKVersion = 'v2' | 'v3'
+
 type RequestMethod =
   | 'eth_sign'
   | 'personal_sign'
@@ -66,12 +68,16 @@ type ParentConnectionApi = {
   getAppMode(): Promise<AppMode>
   triggerSocialLogin(type: SocialLoginType): void
   triggerPasswordlessLogin(email: string): void
+  setIframeStyle(styles: CSSStyleDeclaration): void
+  getWalletPosition(): Position
+  getSDKVersion(): SDKVersion
 }
 type InitParentConnectionApi = {
   getParentUrl(): string
   getLoginSource(): string
   getPasswordlessParams(): { sessionId: string; setToken: string }
   error(e: string): void
+  setIframeStyle(styles: CSSStyleDeclaration): void
 }
 
 export { requirePermission, PERMISSIONS }
@@ -82,4 +88,5 @@ export type {
   InitParentConnectionApi,
   RequestMethod,
   ProviderEvent,
+  SDKVersion,
 }
diff --git a/src/pages/RequestsScreen.vue b/src/pages/RequestsScreen.vue
index 4c0b54c9..245d47e7 100644
--- a/src/pages/RequestsScreen.vue
+++ b/src/pages/RequestsScreen.vue
@@ -7,6 +7,7 @@ import ChargeInfo from '@/components/ChargeInfo.vue'
 import SendTransaction from '@/components/SendTransaction.vue'
 import SignMessage from '@/components/SignMessage.vue'
 import SignMessageNoRequests from '@/components/signMessageNoRequests.vue'
+import { useAppStore } from '@/store/app'
 import { useRequestStore } from '@/store/request'
 import { useRpcStore } from '@/store/rpc'
 import { useImage } from '@/utils/useImage'
@@ -15,6 +16,7 @@ const getImage = useImage()
 const requestStore = useRequestStore()
 const toast = useToast()
 const rpcStore = useRpcStore()
+const appStore = useAppStore()
 
 const { pendingRequest, areRequestsPendingForApproval } = toRefs(requestStore)
 
@@ -51,39 +53,48 @@ function handleGasPriceInput({ value, requestId }) {
 
 <template>
   <div v-if="areRequestsPendingForApproval" class="flex flex-col h-full gap-2">
-    <div class="wallet__card rounded-[10px] flex flex-1 flex-col h-[80%]">
-      <div v-if="pendingRequest" class="sign__messages-container">
-        <div
-          :key="Number(pendingRequest.request.id)"
-          class="sign__message-container"
-        >
-          <SendTransaction
-            v-if="isSendTransactionRequest(pendingRequest.request.id)"
-            :request="pendingRequest"
-            @gas-price-input="handleGasPriceInput"
-          />
-          <SignMessage v-else :request="pendingRequest" />
-          <div v-if="rpcStore.isArcanaNetwork" class="sign__message-footer">
-            <p class="sign__message-info-text">
-              You are not going to be charged!
-              <Popper arrow hover>
-                <button>
-                  <img
-                    class="sign__message-info-icon"
-                    :src="getImage('info-icon')"
-                  />
-                </button>
-                <template #content>
-                  <ChargeInfo />
-                </template>
-              </Popper>
-            </p>
-          </div>
+    <div
+      v-if="pendingRequest"
+      class="sign__messages-container rounded-[10px] flex flex-1 flex-col h-[80%]"
+      :class="{ wallet__card: !appStore.compactMode }"
+    >
+      <div
+        :key="Number(pendingRequest.request.id)"
+        class="sign__message-container"
+      >
+        <SendTransaction
+          v-if="isSendTransactionRequest(pendingRequest.request.id)"
+          :request="pendingRequest"
+          @gas-price-input="handleGasPriceInput"
+          @reject="() => onRejectClick(pendingRequest.request.id)"
+          @approve="() => onApproveClick(pendingRequest.request.id)"
+        />
+        <SignMessage
+          v-else
+          :request="pendingRequest"
+          @reject="() => onRejectClick(pendingRequest.request.id)"
+          @approve="() => onApproveClick(pendingRequest.request.id)"
+        />
+        <div v-if="rpcStore.isArcanaNetwork" class="sign__message-footer">
+          <p class="sign__message-info-text">
+            You are not going to be charged!
+            <Popper arrow hover>
+              <button>
+                <img
+                  class="sign__message-info-icon"
+                  :src="getImage('info-icon')"
+                />
+              </button>
+              <template #content>
+                <ChargeInfo />
+              </template>
+            </Popper>
+          </p>
         </div>
       </div>
     </div>
     <div
-      v-if="pendingRequest"
+      v-if="pendingRequest && !appStore.compactMode"
       class="sign__message-button-container flex justify-around -m-4 mt-0 p-4"
     >
       <button
diff --git a/src/pages/homeScreen.vue b/src/pages/homeScreen.vue
index 7151c650..1fe8d5b8 100644
--- a/src/pages/homeScreen.vue
+++ b/src/pages/homeScreen.vue
@@ -89,9 +89,3 @@ rpcStore.$subscribe(() => {
     </div>
   </div>
 </template>
-
-<style scoped>
-.section-title {
-  font-size: var(--fs-400);
-}
-</style>
diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index 35d366f0..cab9cce5 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -57,8 +57,9 @@ onMounted(async () => {
   await setTheme()
   await getRpcConfig()
   await getAccountDetails()
+  appStore.showWallet = true
   await setMFABannerState()
-  router.push({ name: 'home' })
+  // router.push({ name: 'home' })
   loader.value.show = false
 })
 
@@ -85,7 +86,12 @@ async function setMFABannerState() {
   const hasMfaDnd = mfaDnd && mfaDnd === '1'
   const hasMfaSkip =
     mfaSkipUntil && loginCount && Number(loginCount) < Number(mfaSkipUntil)
-  if (!userStore.hasMfa && !hasMfaDnd && !hasMfaSkip) {
+  if (requestStore.areRequestsPendingForApproval) {
+    router.push({ name: 'requests', params: { appId: appStore.id } })
+  } else if (userStore.hasMfa || hasMfaDnd || hasMfaSkip) {
+    router.push({ name: 'home' })
+  }
+  if (!userStore.hasMfa && !hasMfaDnd && !hasMfaSkip && !appStore.compactMode) {
     showMfaBanner.value = true
   }
 }
@@ -152,6 +158,7 @@ function connectToParent() {
     getPublicKey: handleGetPublicKey,
     triggerLogout: handleLogout,
     getUserInfo,
+    expandWallet: () => (appStore.expandWallet = true),
   })
   parentConnectionStore.setParentConnection(parentConnection)
 }
@@ -160,11 +167,24 @@ async function setTheme() {
   if (parentConnection) {
     const parentConnectionInstance = await parentConnection.promise
     const {
-      themeConfig: { theme },
+      themeConfig: {
+        theme,
+        assets: { logo },
+      },
       name: appName,
     } = await parentConnectionInstance.getAppConfig()
 
+    if (parentConnectionInstance.getSDKVersion) {
+      appStore.sdkVersion = await parentConnectionInstance.getSDKVersion()
+    }
+
+    if (appStore.sdkVersion === 'v3') {
+      const walletPosition = await parentConnectionInstance.getWalletPosition()
+      appStore.setWalletPosition(walletPosition)
+    }
+
     appStore.setTheme(theme)
+    appStore.setAppLogo(logo)
     appStore.setName(appName)
     const htmlEl = document.getElementsByTagName('html')[0]
     if (theme === 'dark') htmlEl.classList.add(theme)
@@ -185,16 +205,14 @@ async function setAppMode(walletType, parentConnectionInstance) {
   appStore.setAppMode(validAppMode as AppMode)
 }
 
-async function handleLogout(isV2 = false) {
+async function handleLogout() {
+  appStore.sdkVersion = 'v2'
   if (parentConnection) {
     const parentConnectionInstance = await parentConnection.promise
     const authProvider = await getAuthProvider(appStore.id as string)
     await userStore.handleLogout(authProvider)
     parentConnectionInstance?.onEvent('disconnect')
-    setTimeout(() => {
-      const route = isV2 ? `/${appStore.id}/v2/login` : `/${appStore.id}/login`
-      router.push(route)
-    })
+    appStore.showWallet = false
   }
 }
 
diff --git a/src/pages/profileScreen.vue b/src/pages/profileScreen.vue
index d07a6310..1715173e 100644
--- a/src/pages/profileScreen.vue
+++ b/src/pages/profileScreen.vue
@@ -60,6 +60,7 @@ async function handleLogout() {
   const parentConnectionInstance = await parentConnection?.promise
   const authProvider = await getAuthProvider(appId)
   await user.handleLogout(authProvider)
+  appStore.showWallet = false
   parentConnectionInstance?.onEvent('disconnect')
 }
 
diff --git a/src/store/app.ts b/src/store/app.ts
index f46cea6c..92c9ef05 100644
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -1,14 +1,28 @@
 import { AppMode } from '@arcana/auth'
 import { defineStore } from 'pinia'
 
+import type { SDKVersion } from '@/models/Connection'
 import type { Theme } from '@/models/Theme'
 
+type WalletPosition = 'right' | 'left'
+
+type AppLogo = {
+  horizontal: string
+  vertical: string
+}
+
 type AppState = {
   id: string
   name: string
   theme: Theme
   parentAppUrl: string | null
   validAppMode: AppMode
+  showWallet: boolean
+  expandWallet: boolean
+  walletPosition: WalletPosition
+  appLogo: AppLogo
+  compactMode: boolean
+  sdkVersion: SDKVersion | null
 }
 
 export const useAppStore = defineStore('app', {
@@ -17,7 +31,37 @@ export const useAppStore = defineStore('app', {
       id: '',
       theme: 'light',
       parentAppUrl: null,
+      showWallet: false,
+      expandWallet: true,
+      walletPosition: 'right',
+      compactMode: false,
+      sdkVersion: null,
     } as AppState),
+  getters: {
+    iframeStyle: ({
+      showWallet,
+      expandWallet,
+      walletPosition,
+      compactMode,
+    }) => {
+      const style: Partial<CSSStyleDeclaration> = {}
+      style.height = showWallet
+        ? expandWallet
+          ? compactMode
+            ? '200px'
+            : '80vh'
+          : '66px'
+        : '0'
+      style.width = showWallet ? (expandWallet ? '360px' : '68px') : '0'
+      style.right =
+        walletPosition === 'right' ? (expandWallet ? '18px' : '2px') : ''
+      style.left =
+        walletPosition === 'left' ? (expandWallet ? '18px' : '2px') : ''
+      style.bottom = '4px'
+      style.transition = 'all 300ms ease-in-out'
+      return style
+    },
+  },
   actions: {
     setAppId(id: string): void {
       this.id = id
@@ -34,5 +78,11 @@ export const useAppStore = defineStore('app', {
     setAppMode(validAppMode: AppMode): void {
       this.validAppMode = validAppMode
     },
+    setWalletPosition(position: WalletPosition): void {
+      this.walletPosition = position
+    },
+    setAppLogo(logo: AppLogo): void {
+      this.appLogo = logo
+    },
   },
 })
diff --git a/src/store/parentConnection.ts b/src/store/parentConnection.ts
index 8873394c..4cfb4cc7 100644
--- a/src/store/parentConnection.ts
+++ b/src/store/parentConnection.ts
@@ -1,10 +1,15 @@
 import type { Connection } from 'penpal'
 import { defineStore } from 'pinia'
 
-import type { ParentConnectionApi } from '@/models/Connection'
+import type {
+  ParentConnectionApi,
+  InitParentConnectionApi,
+} from '@/models/Connection'
 
 type ParentConnectionState = {
-  parentConnection: Connection<ParentConnectionApi> | null
+  parentConnection: Connection<
+    ParentConnectionApi | InitParentConnectionApi
+  > | null
 }
 
 export const useParentConnectionStore = defineStore('parentConnection', {
@@ -13,7 +18,9 @@ export const useParentConnectionStore = defineStore('parentConnection', {
       parentConnection: null,
     } as ParentConnectionState),
   actions: {
-    setParentConnection(connection: Connection<ParentConnectionApi>): void {
+    setParentConnection(
+      connection: Connection<ParentConnectionApi | InitParentConnectionApi>
+    ): void {
       this.parentConnection = connection
     },
   },
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 225b7a1c..899c422a 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -1,10 +1,30 @@
 import type { InitParams } from '@arcana/auth-core/types/types'
 
+import type { CurrencySymbol } from '@/services/exchangeRate.service'
+
 const DOCS_URL = process.env.VUE_APP_ARCANA_DOCS_URL
 const HIDE_ON_RAMP = process.env.VUE_APP_HIDE_ON_RAMP
 const AUTH_URL = process.env.VUE_APP_WALLET_AUTH_URL
 const GATEWAY_URL = process.env.VUE_APP_WALLET_GATEWAY
 const AUTH_NETWORK = process.env
   .VUE_APP_ARCANA_AUTH_NETWORK as InitParams['network']
+const EXCHANGE_RATE_CURRENCY: CurrencySymbol = 'USD'
+const GAS_FEE_UNIT = 'Gwei'
+const GAS_PRICE_SPEED_MAP = {
+  slow: { wait: 'safeLowWait', price: 'safeLow' },
+  standard: { wait: 'avgWait', price: 'average' },
+  fast: { wait: 'fastWait', price: 'fast' },
+}
+const TOAST_TIME_OUT = 2500
 
-export { DOCS_URL, HIDE_ON_RAMP, AUTH_URL, GATEWAY_URL, AUTH_NETWORK }
+export {
+  DOCS_URL,
+  HIDE_ON_RAMP,
+  AUTH_URL,
+  GATEWAY_URL,
+  AUTH_NETWORK,
+  EXCHANGE_RATE_CURRENCY,
+  GAS_FEE_UNIT,
+  GAS_PRICE_SPEED_MAP,
+  TOAST_TIME_OUT,
+}
diff --git a/src/utils/requestManagement.ts b/src/utils/requestManagement.ts
index 8b4b8a50..f2437bee 100644
--- a/src/utils/requestManagement.ts
+++ b/src/utils/requestManagement.ts
@@ -1,7 +1,6 @@
 // Todo: Find a better place for these functions
 import { AppMode } from '@arcana/auth'
 import { ethErrors, serializeError } from 'eth-rpc-errors'
-import { ethers } from 'ethers'
 import { watch } from 'vue'
 import { useToast } from 'vue-toastification'
 
@@ -11,9 +10,11 @@ import { NFT } from '@/models/NFT'
 import { router } from '@/routes'
 import { store } from '@/store'
 import { useActivitiesStore } from '@/store/activities'
+import { useAppStore } from '@/store/app'
 import { useRequestStore } from '@/store/request'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
+import { TOAST_TIME_OUT } from '@/utils/constants'
 import { getRequestHandler } from '@/utils/requestHandlerSingleton'
 import { getStorage } from '@/utils/storageWrapper'
 import validatePopulateContractForNft from '@/utils/validateAndPopulateContractForNft'
@@ -24,6 +25,15 @@ const rpcStore = useRpcStore(store)
 const userStore = useUserStore(store)
 const toast = useToast()
 const reqStore = useRequestStore()
+const appStore = useAppStore()
+
+async function showToast(type, message) {
+  return new Promise((res) => {
+    if (type === 'error') toast.error(message)
+    if (type === 'success') toast.success(message)
+    setTimeout(() => res(true), TOAST_TIME_OUT)
+  })
+}
 
 function getSendRequestFn(handleRequest, requestStore, appStore, keeper) {
   return function sendRequest(request) {
@@ -45,21 +55,14 @@ async function watchRequestQueue(keeper) {
       const pendingRequestCount = Object.values(pendingRequests).length
       const connectionInstance = await keeper.connection.promise
       const appMode = await connectionInstance.getAppMode()
-      try {
-        connectionInstance.sendPendingRequestCount(pendingRequestCount)
-      } catch (err) {
-        console.error({ err })
-      }
       if (processQueue.length > 0) {
         const request = processQueue.shift()
-        if (request) processRequest(request, keeper)
+        if (request) await processRequest(request, keeper)
         if (appMode === AppMode.Widget && pendingRequestCount === 0) {
-          connectionInstance.closePopup()
-        }
-        try {
-          connectionInstance.sendPendingRequestCount(pendingRequestCount)
-        } catch (err) {
-          console.error({ err })
+          if (appStore.sdkVersion !== 'v3') connectionInstance.closePopup()
+        } else if (pendingRequestCount === 0) {
+          appStore.expandWallet = false
+          appStore.compactMode = false
         }
       }
     },
@@ -302,12 +305,12 @@ async function processRequest({ request, isPermissionGranted }, keeper) {
       }
       try {
         const response = await keeper.request(request)
-        keeper.reply(request.method, response)
+        await keeper.reply(request.method, response)
         if (response.error) {
           if (response.error.data?.originalError?.code) {
-            toast.error(response.error.data.originalError.code)
+            await showToast('error', response.error.data.originalError.code)
           } else {
-            toast.error(response.error)
+            await showToast('error', response.error)
           }
           return
         } else {
@@ -318,13 +321,14 @@ async function processRequest({ request, isPermissionGranted }, keeper) {
             'wallet_addEthereumChain',
           ]
           if (asyncMethods.includes(request.method)) {
-            toast.success(`${request.method} execution completed`)
+            const message = `${request.method} execution completed`
+            await showToast('success', message)
           }
         }
         if (request.method === 'eth_signTypedData_v4' && request.params[1]) {
           const params = JSON.parse(request.params[1])
           if (params.domain.name === 'Arcana Forwarder') {
-            activitiesStore.saveFileActivity(
+            await activitiesStore.saveFileActivity(
               rpcStore.selectedRpcConfig?.chainId,
               params.message,
               params.domain.verifyingContract
@@ -332,7 +336,7 @@ async function processRequest({ request, isPermissionGranted }, keeper) {
           }
         }
         if (request.method === 'eth_sendTransaction' && response.result) {
-          activitiesStore.fetchAndSaveActivityFromHash({
+          await activitiesStore.fetchAndSaveActivityFromHash({
             txHash: response.result,
             chainId: rpcStore.selectedRpcConfig?.chainId,
           })
@@ -438,9 +442,15 @@ async function handleRequest(request, requestStore, appStore, keeper) {
   }
   const isPermissionRequired = requirePermission(request, appStore.validAppMode)
   if (isPermissionRequired) {
-    const connectionInstance = await keeper.connection.promise
-    connectionInstance.openPopup()
+    if (appStore.sdkVersion === 'v3') {
+      appStore.expandWallet = true
+      appStore.compactMode = isPermissionRequired
+    } else {
+      const connectionInstance = await keeper.connection.promise
+      connectionInstance.openPopup()
+    }
   }
+
   requestStore.addRequests(request, isPermissionRequired, new Date())
 }
 

From bb709aec6418c10369dfb518fda609f9d33d91ca Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 10 May 2023 12:04:08 +0530
Subject: [PATCH 011/153] Ignore NFTs that error out during fetching details

---
 src/services/getNFTDetails.service.ts | 8 +++++++-
 src/utils/nftUtils.ts                 | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/services/getNFTDetails.service.ts b/src/services/getNFTDetails.service.ts
index f00e868c..7f779fd4 100644
--- a/src/services/getNFTDetails.service.ts
+++ b/src/services/getNFTDetails.service.ts
@@ -16,7 +16,13 @@ async function getNFTDetails(tokenUri: string, tokenId: string) {
   } else {
     url = tokenUri
   }
-  return (await axios.get(url)).data
+
+  try {
+    return (await axios.get(url)).data
+  } catch (e) {
+    console.error(e)
+    return null
+  }
 }
 
 function modifyIpfsUrl(url: string) {
diff --git a/src/utils/nftUtils.ts b/src/utils/nftUtils.ts
index 5b2b3339..d1938469 100644
--- a/src/utils/nftUtils.ts
+++ b/src/utils/nftUtils.ts
@@ -164,7 +164,7 @@ async function getDetailedNFTs(nftDB: NFTDB, chainId: number) {
             }),
         getNFTDetails(nft.tokenUrl, nft.tokenId),
       ])
-      if (ownership != undefined && !ownership.owner) {
+      if ((ownership != undefined && !ownership.owner) || !details) {
         nftDB.removeNFT(nft, chainId)
         return
       }

From 2154c1208df490f7fddd18c82c3938112e30793e Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 10 May 2023 12:12:25 +0530
Subject: [PATCH 012/153] Fix custom gas fee input issue

---
 src/components/GasPrice.vue | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/components/GasPrice.vue b/src/components/GasPrice.vue
index bb9a1ed6..be0c15bd 100644
--- a/src/components/GasPrice.vue
+++ b/src/components/GasPrice.vue
@@ -90,20 +90,18 @@ function handleGasPriceSelect(value = '') {
 
 function handleCustomGasPriceInput(value) {
   disableSlider.value = true
-  if (value) {
-    const amountInputEl = document.querySelector(
-      '#custom-gas-fee-amount'
-    ) as HTMLInputElement
-    if (value < Number(props.baseFee)) {
-      return amountInputEl.setCustomValidity(
-        'Amount must not be less than base fee.'
-      )
-    } else {
-      amountInputEl.setCustomValidity('')
-      gasFee.value = value
-      emits('gasPriceInput', gasFee.value)
-    }
+  const amountInputEl = document.querySelector(
+    '#custom-gas-fee-amount'
+  ) as HTMLInputElement
+  if (!value && value !== 0) {
+    amountInputEl.setCustomValidity('Enter the gas fees to continue.')
+  } else if (value < Number(props.baseFee)) {
+    amountInputEl.setCustomValidity('Gas fees must not be less than base fees.')
+  } else {
+    amountInputEl.setCustomValidity('')
   }
+  gasFee.value = value
+  emits('gasPriceInput', gasFee.value)
 }
 </script>
 

From 456fc66b29bae4bce345c0f9e0345026acb89934 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 10 May 2023 15:55:17 +0530
Subject: [PATCH 013/153] Add base button component

---
 src/index.css      |  33 ++++++++++++++
 tailwind.config.js | 108 ++++++++++++++++++++++++++-------------------
 2 files changed, 95 insertions(+), 46 deletions(-)

diff --git a/src/index.css b/src/index.css
index b966289a..791d960e 100644
--- a/src/index.css
+++ b/src/index.css
@@ -2,5 +2,38 @@
 @tailwind components;
 @tailwind utilities;
 
+@layer base {
+  button {
+    @apply outline-none
+          cursor-pointer disabled:cursor-not-allowed
+          transition-all duration-200 ease-in-out
+          disabled:opacity-60;
+  }
+}
+
+@layer components {
+  .btn-primary {
+    @apply dark:bg-white-100 dark:active:bg-gray-400 dark:text-black-200 dark:hover:shadow-sm dark:hover:shadow-dark-100
+          rounded-sm;
+  }
+
+  .btn-secondary {
+    @apply dark:active:bg-gray-500 dark:text-white-200 dark:hover:shadow-sm dark:hover:shadow-dark-100
+          box-border dark:border-white-200 border-default rounded-sm;
+  }
+
+  .btn-tertiary {
+    @apply dark:text-white-100 dark:hover:dark-text-shadow-100;
+  }
+
+  .btn-quaternery {
+    @apply dark:bg-black-100 dark:text-white-100 dark:active:text-gray-400 dark:hover:dark-text-shadow-100
+          box-border dark:border-gray-200 border-default;
+  }
+}
+
 @layer utilities {
+  .dark-text-shadow-100 {
+    text-shadow: 0 0 6px rgb(236 236 236 / 45%);
+  }
 }
diff --git a/tailwind.config.js b/tailwind.config.js
index f00cb5e2..852dd96f 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -3,53 +3,69 @@ module.exports = {
   content: ['./src/**/*.{vue,js,ts,jsx,tsx,css}'],
   darkMode: 'class',
   theme: {
-    fontSize: {
-      xs: '10px',
-      sm: '12px',
-      base: '14px',
-      lg: '16px',
-      xl: '18px',
-      xxl: '28px',
-    },
-    fontWeight: {
-      light: 300,
-      normal: 400,
-      medium: 500,
-      bold: 700,
-    },
-    colors: {
-      red: '#ff4264',
-      yellow: '#eeb113',
-      blue: '#3e9aff',
-      green: '#05c168',
-      black: {
-        100: '#000000',
-      },
-      white: {
-        100: '#ffffff',
-        200: '#f7f7f7',
-      },
-      gray: {
-        100: '#050505',
-        200: '#141414',
-        300: '#1f1f1f',
-        400: '#8d8d8d',
-        500: '#363636',
-        600: '#313131',
-        700: '#050505',
-        800: '#dcdcdc',
-        900: '#2c2c2c',
+    extend: {
+      fontSize: {
+        xs: '10px',
+        sm: '12px',
+        base: '14px',
+        lg: '16px',
+        xl: '18px',
+        xxl: '28px',
       },
-    },
-    width: {
-      icon: {
-        xs: '14px',
-        sm: '16px',
-        md: '18px',
-        lg: '20px',
-        xl: '24px',
-        xxl: '32px',
-        xxxl: '34px',
+      fontWeight: {
+        light: 300,
+        normal: 400,
+        medium: 500,
+        bold: 700,
+      },
+      colors: {
+        red: { 100: '#ff4264' },
+        yellow: { 100: '#eeb113' },
+        blue: { 100: '#3e9aff' },
+        green: { 100: '#05c168' },
+        black: {
+          100: '#000000',
+          200: '#1f1f1f',
+          300: '#141414',
+          400: '#050505',
+        },
+        white: {
+          100: '#ffffff',
+          200: '#f7f7f7',
+        },
+        gray: {
+          100: '#8d8d8d',
+          200: '#363636',
+          300: '#313131',
+          400: '#dcdcdc',
+          500: '#2c2c2c',
+        },
+      },
+      width: {
+        icon: {
+          xs: '14px',
+          sm: '16px',
+          md: '18px',
+          lg: '20px',
+          xl: '24px',
+          xxl: '32px',
+          xxxl: '34px',
+        },
+      },
+      borderWidth: {
+        1: '1px',
+        default: '1.5px',
+      },
+      borderRadius: {
+        sm: '5px',
+      },
+      boxShadow: {
+        sm: '0 0 8px 3px rgba(0, 0, 0, 0.05)',
+      },
+      boxShadowColor: {
+        dark: {
+          100: 'rgba(126, 126, 126, 0.25)',
+        },
       },
     },
   },

From 789553e5c8651f1770cb08a7809a3c3aa975f4c1 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 10 May 2023 16:08:34 +0530
Subject: [PATCH 014/153] Use optional chaining

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

diff --git a/src/utils/nftUtils.ts b/src/utils/nftUtils.ts
index d1938469..d310b3a6 100644
--- a/src/utils/nftUtils.ts
+++ b/src/utils/nftUtils.ts
@@ -164,7 +164,7 @@ async function getDetailedNFTs(nftDB: NFTDB, chainId: number) {
             }),
         getNFTDetails(nft.tokenUrl, nft.tokenId),
       ])
-      if ((ownership != undefined && !ownership.owner) || !details) {
+      if (!ownership?.owner || !details) {
         nftDB.removeNFT(nft, chainId)
         return
       }

From 0c4aafeca5aa37ea2f1b4485c8cfff81fbf196e5 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 10 May 2023 16:56:07 +0530
Subject: [PATCH 015/153] Add fonts and background

---
 public/fonts/OnestBold1602-hint.woff    | Bin 0 -> 44888 bytes
 public/fonts/OnestLight1602-hint.woff   | Bin 0 -> 41512 bytes
 public/fonts/OnestMedium1602-hint.woff  | Bin 0 -> 43656 bytes
 public/fonts/OnestRegular1602-hint.woff | Bin 0 -> 42236 bytes
 src/App.vue                             |  18 +++---------------
 5 files changed, 3 insertions(+), 15 deletions(-)
 create mode 100644 public/fonts/OnestBold1602-hint.woff
 create mode 100644 public/fonts/OnestLight1602-hint.woff
 create mode 100644 public/fonts/OnestMedium1602-hint.woff
 create mode 100644 public/fonts/OnestRegular1602-hint.woff

diff --git a/public/fonts/OnestBold1602-hint.woff b/public/fonts/OnestBold1602-hint.woff
new file mode 100644
index 0000000000000000000000000000000000000000..d904ac4c9bdf7e56ac08c869fc8f5978a753e0ae
GIT binary patch
literal 44888
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
XO<`kjaRC4(5;RHx0000100000V#V5}

literal 0
HcmV?d00001

diff --git a/public/fonts/OnestLight1602-hint.woff b/public/fonts/OnestLight1602-hint.woff
new file mode 100644
index 0000000000000000000000000000000000000000..0665ab7d93bbed2ae4217988a4e37f8a94316f9e
GIT binary patch
literal 41512
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

literal 0
HcmV?d00001

diff --git a/public/fonts/OnestMedium1602-hint.woff b/public/fonts/OnestMedium1602-hint.woff
new file mode 100644
index 0000000000000000000000000000000000000000..776ea1181c65e63b51c3c0145c21f8767f8174e8
GIT binary patch
literal 43656
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

literal 0
HcmV?d00001

diff --git a/public/fonts/OnestRegular1602-hint.woff b/public/fonts/OnestRegular1602-hint.woff
new file mode 100644
index 0000000000000000000000000000000000000000..423315bec6bcc50f72525ed19710aead5a0ae882
GIT binary patch
literal 42236
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
Za{Q`lZV7aShN8#e{cnZ;y;Px~{tumCLOuWh

literal 0
HcmV?d00001

diff --git a/src/App.vue b/src/App.vue
index 1deabb24..502a30ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -76,11 +76,7 @@ function onClickOfHeader() {
 
 <template>
   <div v-if="sdkVersion === 'v3'" class="flex flex-col h-full">
-    <div
-      v-show="expandWallet"
-      class="flex flex-col h-full"
-      :class="[theme === 'dark' ? 'dark-mode' : 'light-mode']"
-    >
+    <div v-show="expandWallet" class="flex flex-col h-full dark:bg-black-100">
       <WalletHeader @click="onClickOfHeader" />
       <div
         class="flex-grow wallet__container p-4"
@@ -91,19 +87,11 @@ function onClickOfHeader() {
       </div>
       <WalletFooter v-if="showFooter" />
     </div>
-    <div
-      v-show="!expandWallet"
-      class="h-full"
-      :class="[theme === 'dark' ? 'dark-mode' : 'light-mode']"
-    >
+    <div v-show="!expandWallet" class="h-full dark:bg-black-100">
       <WalletButton />
     </div>
   </div>
-  <div
-    v-else
-    class="flex flex-col h-full"
-    :class="[theme === 'dark' ? 'dark-mode' : 'light-mode']"
-  >
+  <div v-else class="flex flex-col h-full dark:bg-black-100">
     <div
       class="flex-grow wallet__container p-4"
       :class="{ 'rounded-b-xl p-0': compactMode }"

From 913139ab89d917b8009cde8eb2c0d31fcfcecf5c Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 10 May 2023 17:14:55 +0530
Subject: [PATCH 016/153] Add fonts required

---
 src/App.vue                                   |   1 -
 .../assets}/fonts/OnestBold1602-hint.woff     | Bin
 .../assets}/fonts/OnestLight1602-hint.woff    | Bin
 .../assets}/fonts/OnestMedium1602-hint.woff   | Bin
 .../assets}/fonts/OnestRegular1602-hint.woff  | Bin
 src/index.css                                 |  36 ++++++++++++++++++
 6 files changed, 36 insertions(+), 1 deletion(-)
 rename {public => src/assets}/fonts/OnestBold1602-hint.woff (100%)
 rename {public => src/assets}/fonts/OnestLight1602-hint.woff (100%)
 rename {public => src/assets}/fonts/OnestMedium1602-hint.woff (100%)
 rename {public => src/assets}/fonts/OnestRegular1602-hint.woff (100%)

diff --git a/src/App.vue b/src/App.vue
index 502a30ae..b9eef98f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -118,7 +118,6 @@ function onClickOfHeader() {
 
 body {
   height: 100vh;
-  font-family: SoraVariable, sans-serif;
 }
 
 #app {
diff --git a/public/fonts/OnestBold1602-hint.woff b/src/assets/fonts/OnestBold1602-hint.woff
similarity index 100%
rename from public/fonts/OnestBold1602-hint.woff
rename to src/assets/fonts/OnestBold1602-hint.woff
diff --git a/public/fonts/OnestLight1602-hint.woff b/src/assets/fonts/OnestLight1602-hint.woff
similarity index 100%
rename from public/fonts/OnestLight1602-hint.woff
rename to src/assets/fonts/OnestLight1602-hint.woff
diff --git a/public/fonts/OnestMedium1602-hint.woff b/src/assets/fonts/OnestMedium1602-hint.woff
similarity index 100%
rename from public/fonts/OnestMedium1602-hint.woff
rename to src/assets/fonts/OnestMedium1602-hint.woff
diff --git a/public/fonts/OnestRegular1602-hint.woff b/src/assets/fonts/OnestRegular1602-hint.woff
similarity index 100%
rename from public/fonts/OnestRegular1602-hint.woff
rename to src/assets/fonts/OnestRegular1602-hint.woff
diff --git a/src/index.css b/src/index.css
index 791d960e..01c3eeb8 100644
--- a/src/index.css
+++ b/src/index.css
@@ -2,7 +2,39 @@
 @tailwind components;
 @tailwind utilities;
 
+@font-face {
+  font-family: Onest;
+  font-style: normal;
+  font-weight: 300;
+  src: url('@/assets/fonts/OnestLight1602-hint.woff') format('woff');
+}
+
+@font-face {
+  font-family: Onest;
+  font-style: normal;
+  font-weight: 400;
+  src: url('@/assets/fonts/OnestRegular1602-hint.woff') format('woff');
+}
+
+@font-face {
+  font-family: Onest;
+  font-style: normal;
+  font-weight: 500;
+  src: url('@/assets/fonts/OnestMedium1602-hint.woff') format('woff');
+}
+
+@font-face {
+  font-family: Onest;
+  font-style: normal;
+  font-weight: 700;
+  src: url('@/assets/fonts/OnestBold1602-hint.woff') format('woff');
+}
+
 @layer base {
+  body {
+    @apply font-onest text-black-100 dark:text-white-100;
+  }
+
   button {
     @apply outline-none
           cursor-pointer disabled:cursor-not-allowed
@@ -36,4 +68,8 @@
   .dark-text-shadow-100 {
     text-shadow: 0 0 6px rgb(236 236 236 / 45%);
   }
+
+  .font-onest {
+    font-family: Onest, sans-serif;
+  }
 }

From 3187c0e62f66948a8c75d1bf4ca4a27d04476294 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 10 May 2023 17:29:59 +0530
Subject: [PATCH 017/153] Add more components, nav, input and card

---
 src/index.css      | 16 ++++++++++++++++
 tailwind.config.js |  1 +
 2 files changed, 17 insertions(+)

diff --git a/src/index.css b/src/index.css
index 01c3eeb8..4c5af3ec 100644
--- a/src/index.css
+++ b/src/index.css
@@ -41,6 +41,10 @@
           transition-all duration-200 ease-in-out
           disabled:opacity-60;
   }
+
+  nav {
+    @apply dark:bg-black-400;
+  }
 }
 
 @layer components {
@@ -62,6 +66,18 @@
     @apply dark:bg-black-100 dark:text-white-100 dark:active:text-gray-400 dark:hover:dark-text-shadow-100
           box-border dark:border-gray-200 border-default;
   }
+
+  .card {
+    @apply dark:bg-black-200 dark:border-gray-200 border rounded-md;
+  }
+
+  .input-field {
+    @apply dark:bg-gray-300 rounded-sm;
+  }
+
+  .input-active {
+    @apply outline-1 dark:outline-white-200;
+  }
 }
 
 @layer utilities {
diff --git a/tailwind.config.js b/tailwind.config.js
index 852dd96f..b0d0300a 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -58,6 +58,7 @@ module.exports = {
       },
       borderRadius: {
         sm: '5px',
+        md: '10px',
       },
       boxShadow: {
         sm: '0 0 8px 3px rgba(0, 0, 0, 0.05)',

From 7259e379375ff766bdaaeeaf066385c59d99ad70 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 11 May 2023 10:15:25 +0530
Subject: [PATCH 018/153] Update the condition to ignore autofetched nfts

---
 src/utils/nftUtils.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/utils/nftUtils.ts b/src/utils/nftUtils.ts
index d310b3a6..fcd7b724 100644
--- a/src/utils/nftUtils.ts
+++ b/src/utils/nftUtils.ts
@@ -164,7 +164,10 @@ async function getDetailedNFTs(nftDB: NFTDB, chainId: number) {
             }),
         getNFTDetails(nft.tokenUrl, nft.tokenId),
       ])
-      if (!ownership?.owner || !details) {
+
+      // Check for undefined because we don't want to remove the NFT if it's autodetected
+      // Ownership is undefined if autodetected
+      if ((ownership !== undefined && !ownership.owner) || !details) {
         nftDB.removeNFT(nft, chainId)
         return
       }

From dfb226c34e0c6667fb5738551fa88c8b0fa0196c Mon Sep 17 00:00:00 2001
From: mmjee <root@git.maharshi.ninja>
Date: Thu, 11 May 2023 10:50:48 +0530
Subject: [PATCH 019/153] Add onramp.money support for Arcana wallet (#277)

* Implement support for onramp.money

* Use the gateway to acquire the OnRamp.Money data

* Fix the remainder of issues

* Use concrete comparisons to false to ensure the chain ID 0 is not dropped

* WIP fixing the configuration mess

* Eliminate secondary coin lookups

* Fix isSupportedByOnRampMoey for broken chains and recomment the computeds
---
 package-lock.json             | 263 ++++++++++++++++------------------
 package.json                  |   1 -
 src/App.vue                   |   7 +-
 src/components/BuyTokens.vue  |  36 ++++-
 src/components/UserWallet.vue |  17 ++-
 src/shims-vue.d.ts            |   2 +
 src/utils/onrampmoney.ramp.ts | 104 ++++++++++++++
 7 files changed, 284 insertions(+), 146 deletions(-)
 create mode 100644 src/utils/onrampmoney.ramp.ts

diff --git a/package-lock.json b/package-lock.json
index 266455b3..de93ab05 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,6 @@
         "@ramp-network/ramp-instant-sdk": "^4.0.1",
         "@sentry/tracing": "^7.5.1",
         "@sentry/vue": "^7.5.1",
-        "@transak/transak-sdk": "^1.2.3",
         "assert": "^2.0.0",
         "axios": "^0.27.2",
         "bignumber.js": "^9.1.0",
@@ -3362,16 +3361,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/@transak/transak-sdk": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@transak/transak-sdk/-/transak-sdk-1.2.3.tgz",
-      "integrity": "sha512-nmpMB6zUwVO/2VlTQIrlDawUbMVTGoio4IiwHxCbNRiFGzxxXwymXNqlspxCszWtznUHFHWtEMomRAdW05MAkw==",
-      "dependencies": {
-        "events": "^3.1.0",
-        "query-string": "^6.12.1",
-        "request": "^2.88.2"
-      }
-    },
     "node_modules/@trysound/sax": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
@@ -4937,6 +4926,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -5191,6 +5181,7 @@
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
       "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "dev": true,
       "dependencies": {
         "safer-buffer": "~2.1.0"
       }
@@ -5226,6 +5217,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
       "engines": {
         "node": ">=0.8"
       }
@@ -5319,6 +5311,7 @@
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
       "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
+      "dev": true,
       "engines": {
         "node": "*"
       }
@@ -5326,7 +5319,8 @@
     "node_modules/aws4": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+      "dev": true
     },
     "node_modules/axios": {
       "version": "0.27.2",
@@ -5474,6 +5468,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+      "dev": true,
       "dependencies": {
         "tweetnacl": "^0.14.3"
       }
@@ -5481,7 +5476,8 @@
     "node_modules/bcrypt-pbkdf/node_modules/tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
+      "dev": true
     },
     "node_modules/bech32": {
       "version": "1.1.4",
@@ -6048,7 +6044,8 @@
     "node_modules/caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="
+      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
+      "dev": true
     },
     "node_modules/chalk": {
       "version": "2.4.2",
@@ -6690,7 +6687,8 @@
     "node_modules/core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "dev": true
     },
     "node_modules/cosmiconfig": {
       "version": "6.0.0",
@@ -7139,6 +7137,7 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
+      "dev": true,
       "dependencies": {
         "assert-plus": "^1.0.0"
       },
@@ -7203,14 +7202,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/decode-uri-component": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/deep-extend": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
@@ -7643,6 +7634,7 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
+      "dev": true,
       "dependencies": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
@@ -8901,6 +8893,7 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
       "engines": {
         "node": ">=0.8.x"
       }
@@ -9109,12 +9102,14 @@
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
     },
     "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
+      "dev": true,
       "engines": [
         "node >=0.6.0"
       ]
@@ -9161,7 +9156,8 @@
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
@@ -9246,14 +9242,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/filter-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
-      "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/finalhandler": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
@@ -9367,6 +9355,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
       "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
+      "dev": true,
       "engines": {
         "node": "*"
       }
@@ -9517,6 +9506,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
       "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.6",
@@ -9752,6 +9742,7 @@
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
+      "dev": true,
       "dependencies": {
         "assert-plus": "^1.0.0"
       }
@@ -9958,6 +9949,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
       "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -9967,6 +9959,7 @@
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
       "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
       "deprecated": "this library is no longer supported",
+      "dev": true,
       "dependencies": {
         "ajv": "^6.12.3",
         "har-schema": "^2.0.0"
@@ -10392,6 +10385,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
+      "dev": true,
       "dependencies": {
         "assert-plus": "^1.0.0",
         "jsprim": "^1.2.2",
@@ -10955,7 +10949,8 @@
     "node_modules/is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "dev": true
     },
     "node_modules/is-unicode-supported": {
       "version": "0.1.0",
@@ -11016,7 +11011,8 @@
     "node_modules/isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
+      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
+      "dev": true
     },
     "node_modules/javascript-stringify": {
       "version": "2.1.0",
@@ -11117,7 +11113,8 @@
     "node_modules/jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="
+      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
+      "dev": true
     },
     "node_modules/jsesc": {
       "version": "2.5.2",
@@ -11163,12 +11160,14 @@
     "node_modules/json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
+      "dev": true
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "node_modules/json-stable-stringify": {
       "version": "1.0.1",
@@ -11187,7 +11186,8 @@
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+      "dev": true
     },
     "node_modules/json5": {
       "version": "2.2.3",
@@ -11231,6 +11231,7 @@
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
       "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
+      "dev": true,
       "dependencies": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -13132,6 +13133,7 @@
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
       "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true,
       "engines": {
         "node": "*"
       }
@@ -13663,7 +13665,8 @@
     "node_modules/performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+      "dev": true
     },
     "node_modules/picocolors": {
       "version": "1.0.0",
@@ -14776,7 +14779,8 @@
     "node_modules/psl": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+      "dev": true
     },
     "node_modules/public-encrypt": {
       "version": "4.0.3",
@@ -14810,6 +14814,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -14818,27 +14823,11 @@
       "version": "6.5.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
       "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+      "dev": true,
       "engines": {
         "node": ">=0.6"
       }
     },
-    "node_modules/query-string": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz",
-      "integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==",
-      "dependencies": {
-        "decode-uri-component": "^0.2.0",
-        "filter-obj": "^1.1.0",
-        "split-on-first": "^1.0.0",
-        "strict-uri-encode": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -15256,6 +15245,7 @@
       "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
       "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
       "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
+      "dev": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
         "aws4": "^1.8.0",
@@ -15287,6 +15277,7 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
       "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
       "bin": {
         "uuid": "bin/uuid"
       }
@@ -16096,14 +16087,6 @@
         "wbuf": "^1.7.3"
       }
     },
-    "node_modules/split-on-first": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
-      "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -16114,6 +16097,7 @@
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
       "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+      "dev": true,
       "dependencies": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -16137,7 +16121,8 @@
     "node_modules/sshpk/node_modules/tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
+      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
+      "dev": true
     },
     "node_modules/ssri": {
       "version": "8.0.1",
@@ -16215,14 +16200,6 @@
         "readable-stream": "^3.5.0"
       }
     },
-    "node_modules/strict-uri-encode": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
-      "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -17221,6 +17198,7 @@
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
       "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dev": true,
       "dependencies": {
         "psl": "^1.1.28",
         "punycode": "^2.1.1"
@@ -17404,6 +17382,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "dev": true,
       "dependencies": {
         "safe-buffer": "^5.0.1"
       },
@@ -17597,6 +17576,7 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -17676,6 +17656,7 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
+      "dev": true,
       "engines": [
         "node >=0.6.0"
       ],
@@ -21144,16 +21125,6 @@
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true
     },
-    "@transak/transak-sdk": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@transak/transak-sdk/-/transak-sdk-1.2.3.tgz",
-      "integrity": "sha512-nmpMB6zUwVO/2VlTQIrlDawUbMVTGoio4IiwHxCbNRiFGzxxXwymXNqlspxCszWtznUHFHWtEMomRAdW05MAkw==",
-      "requires": {
-        "events": "^3.1.0",
-        "query-string": "^6.12.1",
-        "request": "^2.88.2"
-      }
-    },
     "@trysound/sax": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
@@ -22408,6 +22379,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -22587,6 +22559,7 @@
       "version": "0.2.6",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
       "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "dev": true,
       "requires": {
         "safer-buffer": "~2.1.0"
       }
@@ -22623,7 +22596,8 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true
     },
     "astral-regex": {
       "version": "2.0.0",
@@ -22679,12 +22653,14 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="
+      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
+      "dev": true
     },
     "aws4": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+      "dev": true
     },
     "axios": {
       "version": "0.27.2",
@@ -22800,6 +22776,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+      "dev": true,
       "requires": {
         "tweetnacl": "^0.14.3"
       },
@@ -22807,7 +22784,8 @@
         "tweetnacl": {
           "version": "0.14.5",
           "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-          "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
+          "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
+          "dev": true
         }
       }
     },
@@ -23248,7 +23226,8 @@
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="
+      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
+      "dev": true
     },
     "chalk": {
       "version": "2.4.2",
@@ -23731,7 +23710,8 @@
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "dev": true
     },
     "cosmiconfig": {
       "version": "6.0.0",
@@ -24057,6 +24037,7 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
+      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -24103,11 +24084,6 @@
         }
       }
     },
-    "decode-uri-component": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="
-    },
     "deep-extend": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
@@ -24450,6 +24426,7 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
+      "dev": true,
       "requires": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
@@ -25448,7 +25425,8 @@
     "events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true
     },
     "evp_bytestokey": {
       "version": "1.0.3",
@@ -25611,12 +25589,14 @@
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
     },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="
+      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
+      "dev": true
     },
     "fast-deep-equal": {
       "version": "3.1.3",
@@ -25656,7 +25636,8 @@
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -25726,11 +25707,6 @@
         "to-regex-range": "^5.0.1"
       }
     },
-    "filter-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
-      "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ=="
-    },
     "finalhandler": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
@@ -25816,7 +25792,8 @@
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="
+      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
+      "dev": true
     },
     "fork-ts-checker-webpack-plugin": {
       "version": "6.5.2",
@@ -25914,6 +25891,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
       "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.6",
@@ -26081,6 +26059,7 @@
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
+      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -26245,12 +26224,14 @@
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="
+      "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==",
+      "dev": true
     },
     "har-validator": {
       "version": "5.1.5",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
       "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "dev": true,
       "requires": {
         "ajv": "^6.12.3",
         "har-schema": "^2.0.0"
@@ -26565,6 +26546,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==",
+      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "jsprim": "^1.2.2",
@@ -26933,7 +26915,8 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "dev": true
     },
     "is-unicode-supported": {
       "version": "0.1.0",
@@ -26979,7 +26962,8 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
+      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
+      "dev": true
     },
     "javascript-stringify": {
       "version": "2.1.0",
@@ -27064,7 +27048,8 @@
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="
+      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
+      "dev": true
     },
     "jsesc": {
       "version": "2.5.2",
@@ -27101,12 +27086,14 @@
     "json-schema": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
+      "dev": true
     },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "json-stable-stringify": {
       "version": "1.0.1",
@@ -27125,7 +27112,8 @@
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
+      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
+      "dev": true
     },
     "json5": {
       "version": "2.2.3",
@@ -27158,6 +27146,7 @@
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
       "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
+      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -28614,7 +28603,8 @@
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true
     },
     "object-assign": {
       "version": "4.1.1",
@@ -29018,7 +29008,8 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="
+      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
+      "dev": true
     },
     "picocolors": {
       "version": "1.0.0",
@@ -29737,7 +29728,8 @@
     "psl": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+      "dev": true
     },
     "public-encrypt": {
       "version": "4.0.3",
@@ -29772,23 +29764,14 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
     },
     "qs": {
       "version": "6.5.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
-    },
-    "query-string": {
-      "version": "6.14.1",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz",
-      "integrity": "sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==",
-      "requires": {
-        "decode-uri-component": "^0.2.0",
-        "filter-obj": "^1.1.0",
-        "split-on-first": "^1.0.0",
-        "strict-uri-encode": "^2.0.0"
-      }
+      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+      "dev": true
     },
     "queue-microtask": {
       "version": "1.2.3",
@@ -30113,6 +30096,7 @@
       "version": "2.88.2",
       "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
       "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
         "aws4": "^1.8.0",
@@ -30139,7 +30123,8 @@
         "uuid": {
           "version": "3.4.0",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+          "dev": true
         }
       }
     },
@@ -30781,11 +30766,6 @@
         "wbuf": "^1.7.3"
       }
     },
-    "split-on-first": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
-      "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="
-    },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -30796,6 +30776,7 @@
       "version": "1.17.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
       "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+      "dev": true,
       "requires": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -30811,7 +30792,8 @@
         "tweetnacl": {
           "version": "0.14.5",
           "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-          "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
+          "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
+          "dev": true
         }
       }
     },
@@ -30886,11 +30868,6 @@
         "readable-stream": "^3.5.0"
       }
     },
-    "strict-uri-encode": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
-      "integrity": "sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ=="
-    },
     "string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -31608,6 +31585,7 @@
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
       "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dev": true,
       "requires": {
         "psl": "^1.1.28",
         "punycode": "^2.1.1"
@@ -31746,6 +31724,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+      "dev": true,
       "requires": {
         "safe-buffer": "^5.0.1"
       }
@@ -31880,6 +31859,7 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -31950,6 +31930,7 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
+      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
diff --git a/package.json b/package.json
index ef740b6a..5a2a5a1c 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,6 @@
     "@ramp-network/ramp-instant-sdk": "^4.0.1",
     "@sentry/tracing": "^7.5.1",
     "@sentry/vue": "^7.5.1",
-    "@transak/transak-sdk": "^1.2.3",
     "assert": "^2.0.0",
     "axios": "^0.27.2",
     "bignumber.js": "^9.1.0",
diff --git a/src/App.vue b/src/App.vue
index c5cebad9..31b01ba0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,6 +11,7 @@ import { useAppStore } from '@/store/app'
 import { useModalStore } from '@/store/modal'
 import { useParentConnectionStore } from '@/store/parentConnection'
 import { useRequestStore } from '@/store/request'
+import { initializeOnRampMoney } from '@/utils/onrampmoney.ramp'
 import { fetchTransakNetworks } from '@/utils/transak'
 
 import '@/index.css'
@@ -33,7 +34,11 @@ const showRequestPage = computed(() => {
 })
 
 onBeforeMount(async () => {
-  await fetchTransakNetworks()
+  try {
+    await Promise.all([fetchTransakNetworks(), initializeOnRampMoney()])
+  } catch (e) {
+    console.error('Failed to initialize one or more on-ramps:', e)
+  }
 })
 
 async function setIframeStyle() {
diff --git a/src/components/BuyTokens.vue b/src/components/BuyTokens.vue
index db96eff3..e6ad5f4e 100644
--- a/src/components/BuyTokens.vue
+++ b/src/components/BuyTokens.vue
@@ -2,6 +2,7 @@
 import { ref, type Ref } from 'vue'
 
 import AppLoader from '@/components/AppLoader.vue'
+import { openOnRampMoneyHostedUI } from '@/utils/onrampmoney.ramp'
 import { openRampSdk } from '@/utils/rampsdk'
 import { openTransak } from '@/utils/transak'
 import { useImage } from '@/utils/useImage'
@@ -9,13 +10,14 @@ import { useImage } from '@/utils/useImage'
 type BuyTokenProps = {
   transakNetwork?: string
   rampNetwork?: string
+  onRampMoney: number | false | undefined
 }
 
 const props = defineProps<BuyTokenProps>()
 
 const emit = defineEmits(['close'])
 const getImage = useImage()
-const selectedProvider: Ref<'transak' | 'ramp' | ''> = ref('')
+const selectedProvider: Ref<'transak' | 'ramp' | 'onramp.money' | ''> = ref('')
 const isLoading = ref(false)
 const showStatusModal: Ref<'success' | 'failed' | 'cancelled' | ''> = ref('')
 const statusText = ref({
@@ -29,7 +31,7 @@ function handleTransak() {
   handleStatusModalText('Transak')
 }
 
-function handleStatusModalText(provider: 'Transak' | 'Ramp') {
+function handleStatusModalText(provider: 'Transak' | 'Ramp' | 'onramp.money') {
   setTimeout(() => {
     isLoading.value = false
   }, 1500)
@@ -47,11 +49,22 @@ function handleRamp() {
   handleStatusModalText('Ramp')
 }
 
+function handleOnRampMoney() {
+  if (props.onRampMoney === undefined || props.onRampMoney === false) {
+    throw new Error('!!!')
+  }
+  isLoading.value = true
+  openOnRampMoneyHostedUI(props.onRampMoney)
+  handleStatusModalText('onramp.money')
+}
+
 function handleBuy() {
   if (selectedProvider.value === 'transak') {
     handleTransak()
   } else if (selectedProvider.value === 'ramp') {
     handleRamp()
+  } else if (selectedProvider.value === 'onramp.money') {
+    handleOnRampMoney()
   }
 }
 
@@ -142,6 +155,25 @@ function handleDone() {
             <span class="text-base">Ramp</span>
           </label>
         </div>
+        <div class="flex gap-3 items-center">
+          <input
+            id="OnRampMoney"
+            v-model="selectedProvider"
+            type="radio"
+            value="onramp.money"
+            name="provider"
+            :disabled="props.onRampMoney === false"
+            :class="{ 'opacity-80': !props.onRampMoney }"
+          />
+          <label
+            for="OnRampMoney"
+            class="flex gap-2 items-center cursor-pointer"
+            :class="{ 'opacity-50': props.onRampMoney === false }"
+          >
+            <img src="@/assets/images/ramp.png" class="h-7 w-7" />
+            <span class="text-base">onramp.money</span>
+          </label>
+        </div>
         <div class="flex">
           <button
             class="flex-1 text-sm sm:text-xs rounded-xl text-white dark:bg-white bg-black dark:text-black h-9 sm:h-8 uppercase disabled:opacity-50 transition-opacity duration-300"
diff --git a/src/components/UserWallet.vue b/src/components/UserWallet.vue
index 50d5bf02..a1d6639d 100644
--- a/src/components/UserWallet.vue
+++ b/src/components/UserWallet.vue
@@ -18,6 +18,7 @@ import { useModalStore } from '@/store/modal'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
 import { HIDE_ON_RAMP } from '@/utils/constants'
+import { isSupportedByOnRampMoney } from '@/utils/onrampmoney.ramp'
 import { getRampSupportedNetworks } from '@/utils/rampsdk'
 import { getRequestHandler } from '@/utils/requestHandlerSingleton'
 import { getTransakSupportedNetworks } from '@/utils/transak'
@@ -52,6 +53,8 @@ const { currency } = storeToRefs(rpcStore)
 const totalAmountInUSD: Ref<string | null> = ref(null)
 const chainSelectedForEdit: Ref<number | null> = ref(null)
 
+// TODO: move these to something else scoped to onramps
+
 const transakNetwork = computed(() => {
   const selectedChainId = Number(rpcStore.selectedChainId)
   return getTransakSupportedNetworks().find(
@@ -66,6 +69,17 @@ const rampNetwork = computed(() => {
   )
 })
 
+const onRampMoney = computed(() => {
+  const selectedChainId = Number(rpcStore.selectedChainId)
+  if (isSupportedByOnRampMoney(selectedChainId)) {
+    return selectedChainId
+  } else {
+    return false
+  }
+})
+
+// See above
+
 const explorerUrl = computed(() => {
   if (
     rpcStore.selectedRpcConfig &&
@@ -277,7 +291,7 @@ watch(
           </button>
           <button
             v-if="walletBalance && !HIDE_ON_RAMP"
-            :disabled="!transakNetwork && !rampNetwork"
+            :disabled="!transakNetwork && !rampNetwork && onRampMoney !== false"
             class="text-sm sm:text-xs font-semibold rounded-xl border-2 border-solid border-black dark:border-white flex-1 uppercase disabled:opacity-50"
             @click="handleBuy(true)"
           >
@@ -311,6 +325,7 @@ watch(
         v-if="showModal === 'buy'"
         :transak-network="transakNetwork?.value"
         :ramp-network="rampNetwork?.value"
+        :on-ramp-money="onRampMoney"
         @close="handleBuy(false)"
       />
     </Teleport>
diff --git a/src/shims-vue.d.ts b/src/shims-vue.d.ts
index 910cd5cd..65531b44 100644
--- a/src/shims-vue.d.ts
+++ b/src/shims-vue.d.ts
@@ -25,6 +25,8 @@ declare namespace NodeJS {
     VUE_APP_RAMP_ENV: 'STAGING' | 'PRODUCTION'
     VUE_APP_HIDE_ON_RAMP: 'true' | undefined
     VUE_APP_ANKR_PREMIUM_API_URL: string
+    VUE_APP_ON_RAMP_MONEY_API_URL: string
+    VUE_APP_ON_RAMP_MONEY_URL: string
   }
 }
 
diff --git a/src/utils/onrampmoney.ramp.ts b/src/utils/onrampmoney.ramp.ts
new file mode 100644
index 00000000..12226640
--- /dev/null
+++ b/src/utils/onrampmoney.ramp.ts
@@ -0,0 +1,104 @@
+import axios from 'axios'
+
+import { useUserStore } from '@/store/user'
+
+class OnRampMoneyException extends Error {}
+
+type OnRampMoneyCoinObject = {
+  // defined manually
+  actualID: string
+
+  coinId: number
+  coinName: string
+  coinIcon: string
+  balanceFloatPlaces: number
+  tradeFloatPlaces: number
+  markets: {
+    decimals: {
+      usdt: number
+      inr: number
+    }
+  }
+  networks: number[]
+  networkIDs: string[]
+}
+
+type OnRampMoneyNetworkObject = {
+  chainSymbol: string
+  chainName: string
+  networkId: number
+  nativeToken: number
+}
+
+const COIN_CONFIG = new Map<number, OnRampMoneyCoinObject>()
+const CHAIN_ID_CONFIG = new Map<number, OnRampMoneyNetworkObject>()
+const API_URL = new URL(
+  '/api/v1/onramp-coin-config/',
+  process.env.VUE_APP_WALLET_GATEWAY
+).href
+
+async function initializeOnRampMoney() {
+  const resp = await axios({
+    method: 'GET',
+    url: API_URL,
+  })
+
+  const netConfigs = resp.data.data.networkConfig as Record<
+    string,
+    OnRampMoneyNetworkObject
+  >
+  for (const [key, netConfig] of Object.entries(netConfigs)) {
+    CHAIN_ID_CONFIG.set(parseInt(key), netConfig)
+  }
+
+  const allCoinConfig = resp.data.data.allCoinConfig as OnRampMoneyCoinObject[]
+  for (const [actualID, coin] of Object.entries(allCoinConfig)) {
+    coin.actualID = actualID
+
+    for (const net of coin.networks) {
+      if (CHAIN_ID_CONFIG.has(net)) {
+        const v = CHAIN_ID_CONFIG.get(net)
+        if (v == null) {
+          continue
+        }
+        coin.networkIDs.push(v.chainSymbol)
+      }
+    }
+
+    COIN_CONFIG.set(coin.coinId, coin)
+  }
+}
+
+function isSupportedByOnRampMoney(chainId: number) {
+  const cfg = CHAIN_ID_CONFIG.get(chainId)
+  if (cfg == null || cfg.nativeToken === -1) {
+    return false
+  }
+  const tok = COIN_CONFIG.get(cfg.nativeToken)
+  return tok != null
+}
+
+async function openOnRampMoneyHostedUI(chainId: number) {
+  const netConfig = CHAIN_ID_CONFIG.get(chainId)
+  if (netConfig == null) {
+    throw new OnRampMoneyException('Unsupported chain')
+  }
+  const nativeToken = COIN_CONFIG.get(netConfig.nativeToken)
+  if (nativeToken == null) {
+    throw new OnRampMoneyException('Could not find native token')
+  }
+
+  const uStore = useUserStore()
+
+  const baseURL = new URL(process.env.VUE_APP_ON_RAMP_MONEY_URL)
+  baseURL.searchParams.set('network', netConfig.chainSymbol)
+  baseURL.searchParams.set('coinCode', nativeToken.actualID)
+  baseURL.searchParams.set('walletAddress', uStore.walletAddress)
+  window.open(baseURL.href, '_blank')
+}
+
+export {
+  initializeOnRampMoney,
+  openOnRampMoneyHostedUI,
+  isSupportedByOnRampMoney,
+}

From 5176762a5064400e2cc78291471c8fb446e7eb7a Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 11 May 2023 13:51:02 +0530
Subject: [PATCH 020/153] Add default line height

---
 src/index.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/index.css b/src/index.css
index 4c5af3ec..aec5b578 100644
--- a/src/index.css
+++ b/src/index.css
@@ -32,7 +32,7 @@
 
 @layer base {
   body {
-    @apply font-onest text-black-100 dark:text-white-100;
+    @apply font-onest text-black-100 dark:text-white-100 leading-normal;
   }
 
   button {

From 3bfcdefab113ffca60bab39948aad251a0e327bd Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 11 May 2023 17:28:03 +0530
Subject: [PATCH 021/153] Keep token url to fetch token details in future

---
 src/services/nft.service.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/services/nft.service.ts b/src/services/nft.service.ts
index 27fe5303..1a0bf7a1 100644
--- a/src/services/nft.service.ts
+++ b/src/services/nft.service.ts
@@ -170,7 +170,6 @@ class NFTDB {
       ...item,
       autodetected: false,
       chainId,
-      tokenUrl: '',
     })
     this.synchronizeToStorage()
   }

From 73980634c8a255f2121730076b4bb90c4beff9c6 Mon Sep 17 00:00:00 2001
From: mmjee <root@git.maharshi.ninja>
Date: Mon, 15 May 2023 11:51:33 +0530
Subject: [PATCH 022/153] onramp.money fixes (#309)

---
 src/components/UserWallet.vue |  2 +-
 src/shims-vue.d.ts            |  1 -
 src/utils/onrampmoney.ramp.ts | 11 +++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/UserWallet.vue b/src/components/UserWallet.vue
index a1d6639d..6079da70 100644
--- a/src/components/UserWallet.vue
+++ b/src/components/UserWallet.vue
@@ -291,7 +291,7 @@ watch(
           </button>
           <button
             v-if="walletBalance && !HIDE_ON_RAMP"
-            :disabled="!transakNetwork && !rampNetwork && onRampMoney !== false"
+            :disabled="!transakNetwork && !rampNetwork && onRampMoney === false"
             class="text-sm sm:text-xs font-semibold rounded-xl border-2 border-solid border-black dark:border-white flex-1 uppercase disabled:opacity-50"
             @click="handleBuy(true)"
           >
diff --git a/src/shims-vue.d.ts b/src/shims-vue.d.ts
index 65531b44..7b4a2653 100644
--- a/src/shims-vue.d.ts
+++ b/src/shims-vue.d.ts
@@ -25,7 +25,6 @@ declare namespace NodeJS {
     VUE_APP_RAMP_ENV: 'STAGING' | 'PRODUCTION'
     VUE_APP_HIDE_ON_RAMP: 'true' | undefined
     VUE_APP_ANKR_PREMIUM_API_URL: string
-    VUE_APP_ON_RAMP_MONEY_API_URL: string
     VUE_APP_ON_RAMP_MONEY_URL: string
   }
 }
diff --git a/src/utils/onrampmoney.ramp.ts b/src/utils/onrampmoney.ramp.ts
index 12226640..54cd7039 100644
--- a/src/utils/onrampmoney.ramp.ts
+++ b/src/utils/onrampmoney.ramp.ts
@@ -47,13 +47,17 @@ async function initializeOnRampMoney() {
     string,
     OnRampMoneyNetworkObject
   >
-  for (const [key, netConfig] of Object.entries(netConfigs)) {
-    CHAIN_ID_CONFIG.set(parseInt(key), netConfig)
+  for (const netConfig of Object.values(netConfigs)) {
+    CHAIN_ID_CONFIG.set(netConfig.networkId, netConfig)
   }
 
-  const allCoinConfig = resp.data.data.allCoinConfig as OnRampMoneyCoinObject[]
+  const allCoinConfig = resp.data.data.allCoinConfig as Record<
+    string,
+    OnRampMoneyCoinObject
+  >
   for (const [actualID, coin] of Object.entries(allCoinConfig)) {
     coin.actualID = actualID
+    coin.networkIDs = []
 
     for (const net of coin.networks) {
       if (CHAIN_ID_CONFIG.has(net)) {
@@ -64,7 +68,6 @@ async function initializeOnRampMoney() {
         coin.networkIDs.push(v.chainSymbol)
       }
     }
-
     COIN_CONFIG.set(coin.coinId, coin)
   }
 }

From 19101251a38dd5c7e6908e677d662ae157b95cfb Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 15 May 2023 12:14:14 +0530
Subject: [PATCH 023/153] Update header

---
 public/chain-logos/blockchain-icon.png | Bin 0 -> 3670 bytes
 public/chain-logos/ethereum-icon.png   | Bin 0 -> 1331 bytes
 public/chain-logos/polygon-icon.png    | Bin 0 -> 708 bytes
 src/assets/images/dark/qr-code.svg     |   3 +++
 src/assets/images/light/qr-code.svg    |   3 +++
 src/components/WalletHeader.vue        |  29 +++++++++++++++++--------
 src/utils/getImage.ts                  |  11 ++++++++++
 tailwind.config.js                     |  25 +++++++++++++--------
 8 files changed, 53 insertions(+), 18 deletions(-)
 create mode 100644 public/chain-logos/blockchain-icon.png
 create mode 100644 public/chain-logos/ethereum-icon.png
 create mode 100644 public/chain-logos/polygon-icon.png
 create mode 100644 src/assets/images/dark/qr-code.svg
 create mode 100644 src/assets/images/light/qr-code.svg
 create mode 100644 src/utils/getImage.ts

diff --git a/public/chain-logos/blockchain-icon.png b/public/chain-logos/blockchain-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d32403e500528737e59bbf9095aa43469c4da1a
GIT binary patch
literal 3670
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

literal 0
HcmV?d00001

diff --git a/public/chain-logos/ethereum-icon.png b/public/chain-logos/ethereum-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6235801c6da562435565f30e7b6237be9519ffd0
GIT binary patch
literal 1331
zcmV-31<d-1P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px(?MXyIR9Hu2WS}CDkXWzq;zi&CDjLbaNKL~&oIUjau$mErFE0<(%%z$^Vct9T
z&1&LuJfUmCP+@z#@WM&w3DodBwH(O!;q0M*AP0dQ2m&5#TvRceDu!I$cHqCXI1|`m
zFb5u4`}|K!q%td|p-8a<6=XI$T-eCJALbC413~;0r7glwo`k)l#E}#`5R@^H9f0gW
zYD6_f4s0sib3ZSJO#z<+J0i|6J+RI?hTKr3z=8W&KAdI#jcze|2vQn~WIOQXi9`R{
zv19>k4t#j^3q!i07+H3arO8ldd*1$q+!L`y8#V`mGmQE{{U`T5FOeG6WH}H$W8h1J
z$a3VAjU+p8)#QEO-K<zRaD@b}5Co~8TYBTd>WM~%q=X_#4wRDGEOKo#|7&~};Bz1(
z!)#$;U<mt5tRqQsAik)@R#0Pe#P`pC7y^a)h_;t#g#oTRRxaq^3d3gU?>`I-K4r`d
zf!R6?j+`tEnbjx%wVknm)O}b$f$`Dk8<$;|5fh3;I}lswUAz02VeSQa22}%LxLqIz
z!oZUC_ZaNk<rsJbG0P)jGYnA<Jh$<{e<c}2fOO9N!N6r@!obSLj1dUP4unZQd-;vw
zEZ1iSn-B@O`dxFMeCo?o<0lk~1RW?Nvt94XM(&FsgB%jRFhtZ^<24hT1Cce9%)aoy
zdW|92-gw!=JTG6mf5m4YK?lA+bLhWq+CPSv3gSu!LJovECaK~$L+^Pjg6&4U4ipqz
z#a}+t{R5$BK$a)gfgnBq{{3gL^xuZJ*dZ8#AcIsib~mInnbi~HP+}bzntjmk(Ic<T
zgv=z$fiOb?5-$C;@RDc4XDA^D_RP6{ef35YEkX{1$rE(okrn&@*+e)Zm1zx3ElczN
zvan(==5RUi{^KtU5n19W_N|=$>VJ49{#Fh_2Qo1HXZ&#X@V}gv?`M~+cZc+d7#J8N
zB(|FtOtLzK9un9b7?{3K^w~4tH!!u)!DnCQC1{A5`*IVspP&Mep?aEIk`FE6n*(C2
zdVKVL{n~dM%rX<3BilprbUk2vWCx~KA8)^K$)yS=CoaCFdea=o77#x+|ESBYdv1FP
zMKw_l1R1h!+P?oz=8#(A$4>?Z2`f7kz3Gh){wrz<f~&gKTONGvnW@c#uzVZ)u?==V
zn3*A3w(fiSqp4qwlaS*;@<cljq!_)rTfgV`kHm6kxJ6P@o4KAn^ZCxezzFY1O>Tbl
z*UUf|CBYICwM1tUWM7JkuHw19L*g^K&mH2vF1&EnGXYuLSbyKyX)WeP=xVbXuCtvz
zYl6|2!4;Y$g&@d~V6Pp!=QeY>U^7t1|C{j7pTD%W%yT}BO}?<{%(P>t?X!uATCzeA
zrs>haga7$(j1S#>W{lPTmv4SB_$3OH93UiXfZ2|#@ruiVq@+7!ACm1rMa8Xl=hyHa
zL=P@(4h+rSul(qd&plG2mZB(zY3{4u^EoMq4XHR`U_f`^tmU^J%w1-vNRH!3E@rS<
zf*#fA4kR~fsS<(^Lsl_=I4ki7W+1Wy&3(C;kjq4JLXqq=h-{gQ&Gz;+6S*ruVlW5B
z6&=aHdE0#wIgX-ACPBCO)Y|?3)fAY)4m^ALEkjn79929|6+@7V9*_emO?Na2L6D)+
p(%WQMSvlW4c;NVh(x`>$2LNM=m^dCceo_Dc002ovPDHLkV1h_4bQ}Nx

literal 0
HcmV?d00001

diff --git a/public/chain-logos/polygon-icon.png b/public/chain-logos/polygon-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..76cf57cff684c1cc02c9a25300f32c7615f5cd14
GIT binary patch
literal 708
zcmV;#0z3VQP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px%en~_@R9HvtmpzCRK@`W|+YrM^O0lprS!+csEk&@n+qJNjG!`n?dY988RW^d<
z2^NA}EqEJC#Y(WTP^<*A!Nx|gi-&UNo~*E!xph9??9MJJZp!4ndB6R?kC{PO@`X#z
z2giVAGi0S;KTIeM7{y&HzcP@lKp9v*P#vIJz>Q#X(?i_RDL{1aa5O%*Sw<zDuM$wD
znrgGE)cg-n2iCgKY0TbzT4|na&*}m_0;qyRfGfke`$mMiA55+vAij`+x>WNJP!30b
zqS$ZhYNQ`d=K$o1HUzXkiv1HV>QV`4qrzZ7-tUho=wjLUvzjEYplyJ%{whc(3Z|QL
z00%d|w+GKpD;rD(SpgvZh+_Yg7;OF8msY#w{VGxdP61_QVVb9=QgQ~EPftHc-UGrV
zRwpC%qFrBlVmSwtrIQ7zxP&+b)TJ|@O0KPTP@C!_Q>GtI_W)?c_EgylCp`jumiHr|
z?NRKnr@t=%gJc^J?&ggV@#=85^I8`C-rDCg4X^o4o<iD*V!y{puT0HM9M)N!1}T~%
z4xnz1O0Qd{(NM)rMm6Y__rZ-|y6Pdl<S2jyPln^}ZH}$V#u{+Z07-fYIC5Jtod{_#
zZi5MN{=IjyC9Of70-Uo}w5c7?ls?V}6cK>+sx!gqx{%{*-NoEZMY}QzZU)I6M0i}P
z22IfN(S#qOxO34awS}9+1Sm^W=Ci*yYd?B*{-?OdR+zjcfXlLd#RhX$gQ{_nPuqjl
zuV?3t`II~Codc$UWsfLR22^9I62L<>gUJ{W*K}}5cxyQBJXP6L3TR3@XPDOlm<Q#6
qWj?h6n(9#Y|1n?@)kL4ASMV>Yh%Y!5)SEy60000<MNUMnLSTY@xk7>f

literal 0
HcmV?d00001

diff --git a/src/assets/images/dark/qr-code.svg b/src/assets/images/dark/qr-code.svg
new file mode 100644
index 00000000..d513b103
--- /dev/null
+++ b/src/assets/images/dark/qr-code.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19 20H20M16 20H14V17M17 17H20V14H19M14 14H16M4 17C4 16.0681 4 15.6022 4.15224 15.2346C4.35523 14.7446 4.74481 14.3552 5.23486 14.1522C5.60241 14 6.06835 14 7.00023 14C7.93211 14 8.39782 14 8.76537 14.1522C9.25542 14.3552 9.64467 14.7446 9.84766 15.2346C9.9999 15.6022 9.9999 16.0681 9.9999 17C9.9999 17.9319 9.9999 18.3978 9.84766 18.7654C9.64467 19.2554 9.25542 19.6448 8.76537 19.8478C8.39783 20 7.93211 20 7.00023 20C6.06835 20 5.6024 20 5.23486 19.8478C4.74481 19.6448 4.35523 19.2554 4.15224 18.7654C4 18.3978 4 17.9319 4 17ZM14 6.99999C14 6.0681 14 5.60216 14.1522 5.23462C14.3552 4.74456 14.7448 4.35523 15.2349 4.15224C15.6024 4 16.0683 4 17.0002 4C17.9321 4 18.3978 4 18.7654 4.15224C19.2554 4.35523 19.6447 4.74456 19.8477 5.23462C19.9999 5.60216 19.9999 6.06812 19.9999 7C19.9999 7.93188 19.9999 8.39783 19.8477 8.76537C19.6447 9.25542 19.2554 9.64479 18.7654 9.84778C18.3978 10 17.9321 10 17.0002 10C16.0683 10 15.6024 10 15.2349 9.84778C14.7448 9.64479 14.3552 9.25542 14.1522 8.76537C14 8.39782 14 7.93187 14 6.99999ZM4 6.99999C4 6.0681 4 5.60216 4.15224 5.23462C4.35523 4.74456 4.74481 4.35523 5.23486 4.15224C5.60241 4 6.06835 4 7.00023 4C7.93211 4 8.39782 4 8.76537 4.15224C9.25542 4.35523 9.64467 4.74456 9.84766 5.23462C9.9999 5.60216 9.9999 6.06812 9.9999 7C9.9999 7.93188 9.9999 8.39783 9.84766 8.76537C9.64467 9.25542 9.25542 9.64479 8.76537 9.84778C8.39783 10 7.93211 10 7.00023 10C6.06835 10 5.6024 10 5.23486 9.84778C4.74481 9.64479 4.35523 9.25542 4.15224 8.76537C4 8.39782 4 7.93187 4 6.99999Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/qr-code.svg b/src/assets/images/light/qr-code.svg
new file mode 100644
index 00000000..d513b103
--- /dev/null
+++ b/src/assets/images/light/qr-code.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19 20H20M16 20H14V17M17 17H20V14H19M14 14H16M4 17C4 16.0681 4 15.6022 4.15224 15.2346C4.35523 14.7446 4.74481 14.3552 5.23486 14.1522C5.60241 14 6.06835 14 7.00023 14C7.93211 14 8.39782 14 8.76537 14.1522C9.25542 14.3552 9.64467 14.7446 9.84766 15.2346C9.9999 15.6022 9.9999 16.0681 9.9999 17C9.9999 17.9319 9.9999 18.3978 9.84766 18.7654C9.64467 19.2554 9.25542 19.6448 8.76537 19.8478C8.39783 20 7.93211 20 7.00023 20C6.06835 20 5.6024 20 5.23486 19.8478C4.74481 19.6448 4.35523 19.2554 4.15224 18.7654C4 18.3978 4 17.9319 4 17ZM14 6.99999C14 6.0681 14 5.60216 14.1522 5.23462C14.3552 4.74456 14.7448 4.35523 15.2349 4.15224C15.6024 4 16.0683 4 17.0002 4C17.9321 4 18.3978 4 18.7654 4.15224C19.2554 4.35523 19.6447 4.74456 19.8477 5.23462C19.9999 5.60216 19.9999 6.06812 19.9999 7C19.9999 7.93188 19.9999 8.39783 19.8477 8.76537C19.6447 9.25542 19.2554 9.64479 18.7654 9.84778C18.3978 10 17.9321 10 17.0002 10C16.0683 10 15.6024 10 15.2349 9.84778C14.7448 9.64479 14.3552 9.25542 14.1522 8.76537C14 8.39782 14 7.93187 14 6.99999ZM4 6.99999C4 6.0681 4 5.60216 4.15224 5.23462C4.35523 4.74456 4.74481 4.35523 5.23486 4.15224C5.60241 4 6.06835 4 7.00023 4C7.93211 4 8.39782 4 8.76537 4.15224C9.25542 4.35523 9.64467 4.74456 9.84766 5.23462C9.9999 5.60216 9.9999 6.06812 9.9999 7C9.9999 7.93188 9.9999 8.39783 9.84766 8.76537C9.64467 9.25542 9.25542 9.64479 8.76537 9.84778C8.39783 10 7.93211 10 7.00023 10C6.06835 10 5.6024 10 5.23486 9.84778C4.74481 9.64479 4.35523 9.25542 4.15224 8.76537C4 8.39782 4 7.93187 4 6.99999Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/WalletHeader.vue b/src/components/WalletHeader.vue
index dedfbc3d..8de44bd4 100644
--- a/src/components/WalletHeader.vue
+++ b/src/components/WalletHeader.vue
@@ -1,26 +1,37 @@
 <script setup lang="ts">
 import { useAppStore } from '@/store/app'
-import { useImage } from '@/utils/useImage'
+import { getImage } from '@/utils/getImage'
 
 const appStore = useAppStore()
-const getImage = useImage()
 
 const emits = defineEmits(['click'])
 </script>
 
 <template>
-  <header class="flex justify-between rounded-t-xl">
-    <div class="flex space-x-3 items-center">
-      <img :src="appStore.appLogo?.horizontal" alt="app logo" class="h-8" />
-      <p>{{ appStore.name }}</p>
+  <header class="flex justify-between">
+    <div class="flex items-center gap-2">
+      <img
+        :src="appStore.appLogo?.horizontal"
+        alt="App Logo"
+        class="w-xl h-xl"
+      />
+      <span class="font-bold text-lg">{{ appStore.name }}</span>
     </div>
-    <button
+    <div class="flex items-center gap-3">
+      <button class="w-xl h-xl rounded-full">
+        <img :src="`/chain-logos/ethereum-icon.png`" alt="Network Icon" />
+      </button>
+      <button class="w-xl h-xl">
+        <img :src="getImage('qr-code.svg')" alt="Wallet Icon" />
+      </button>
+    </div>
+    <!-- <button
       class="h-auto"
       :class="[appStore.compactMode ? 'rotate-180' : 'rotate-0']"
       @click="emits('click')"
     >
-      <img :src="getImage('arrow-icon')" alt="arrow" />
-    </button>
+      <img :src="getImageOld('arrow-icon')" alt="arrow" />
+    </button> -->
   </header>
 </template>
 
diff --git a/src/utils/getImage.ts b/src/utils/getImage.ts
new file mode 100644
index 00000000..d56ecbb3
--- /dev/null
+++ b/src/utils/getImage.ts
@@ -0,0 +1,11 @@
+import { Theme } from '@arcana/auth'
+
+import { useAppStore } from '@/store/app'
+
+function getImage(imgUrl: string, theme?: Theme) {
+  const appStore = useAppStore()
+  const appTheme = theme || appStore.theme
+  return require(`@/assets/images/${appTheme}/${imgUrl}`)
+}
+
+export { getImage }
diff --git a/tailwind.config.js b/tailwind.config.js
index b0d0300a..0d27b87f 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -42,15 +42,22 @@ module.exports = {
         },
       },
       width: {
-        icon: {
-          xs: '14px',
-          sm: '16px',
-          md: '18px',
-          lg: '20px',
-          xl: '24px',
-          xxl: '32px',
-          xxxl: '34px',
-        },
+        xs: '14px',
+        sm: '16px',
+        md: '18px',
+        lg: '20px',
+        xl: '24px',
+        xxl: '32px',
+        xxxl: '34px',
+      },
+      height: {
+        xs: '14px',
+        sm: '16px',
+        md: '18px',
+        lg: '20px',
+        xl: '24px',
+        xxl: '32px',
+        xxxl: '34px',
       },
       borderWidth: {
         1: '1px',

From 002c70a98cd15f4cf56f50c196f711460dc38b31 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 15 May 2023 13:23:56 +0530
Subject: [PATCH 024/153] Add footer and icons

---
 src/App.vue                                   |   6 +-
 src/assets/images/dark/nfts-icon-selected.svg |   6 +
 src/assets/images/dark/nfts-icon.svg          |   6 +
 .../dark/notifications-icon-selected.svg      |   4 +
 src/assets/images/dark/notifications-icon.svg |   4 +
 .../images/dark/profile-icon-selected.svg     |   3 +
 src/assets/images/dark/profile-icon.svg       |   3 +
 .../images/dark/tokens-icon-selected.svg      |  10 ++
 src/assets/images/dark/tokens-icon.svg        |  10 ++
 .../images/light/nfts-icon-selected.svg       |   6 +
 src/assets/images/light/nfts-icon.svg         |   6 +
 .../light/notifications-icon-selected.svg     |   4 +
 .../images/light/notifications-icon.svg       |   4 +
 .../images/light/profile-icon-selected.svg    |   3 +
 src/assets/images/light/profile-icon.svg      |   3 +
 .../images/light/tokens-icon-selected.svg     |  10 ++
 src/assets/images/light/tokens-icon.svg       |  10 ++
 src/components/AppFooter.vue                  | 140 +++++++++++-------
 src/components/WalletHeader.vue               |  14 +-
 19 files changed, 181 insertions(+), 71 deletions(-)
 create mode 100644 src/assets/images/dark/nfts-icon-selected.svg
 create mode 100644 src/assets/images/dark/nfts-icon.svg
 create mode 100644 src/assets/images/dark/notifications-icon-selected.svg
 create mode 100644 src/assets/images/dark/notifications-icon.svg
 create mode 100644 src/assets/images/dark/profile-icon-selected.svg
 create mode 100644 src/assets/images/dark/profile-icon.svg
 create mode 100644 src/assets/images/dark/tokens-icon-selected.svg
 create mode 100644 src/assets/images/dark/tokens-icon.svg
 create mode 100644 src/assets/images/light/nfts-icon-selected.svg
 create mode 100644 src/assets/images/light/nfts-icon.svg
 create mode 100644 src/assets/images/light/notifications-icon-selected.svg
 create mode 100644 src/assets/images/light/notifications-icon.svg
 create mode 100644 src/assets/images/light/profile-icon-selected.svg
 create mode 100644 src/assets/images/light/profile-icon.svg
 create mode 100644 src/assets/images/light/tokens-icon-selected.svg
 create mode 100644 src/assets/images/light/tokens-icon.svg

diff --git a/src/App.vue b/src/App.vue
index 2e118be3..8a0d4919 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -81,7 +81,7 @@ function onClickOfHeader() {
 
 <template>
   <div v-if="sdkVersion === 'v3'" class="flex flex-col h-full">
-    <div v-show="expandWallet" class="flex flex-col h-full dark:bg-black-100">
+    <div v-show="expandWallet" class="flex flex-col h-full dark:bg-black-300">
       <WalletHeader @click="onClickOfHeader" />
       <div
         class="flex-grow wallet__container p-4"
@@ -92,11 +92,11 @@ function onClickOfHeader() {
       </div>
       <WalletFooter v-if="showFooter" />
     </div>
-    <div v-show="!expandWallet" class="h-full dark:bg-black-100">
+    <div v-show="!expandWallet" class="h-full dark:bg-black-300">
       <WalletButton />
     </div>
   </div>
-  <div v-else class="flex flex-col h-full dark:bg-black-100">
+  <div v-else class="flex flex-col h-full dark:bg-black-300">
     <div
       class="flex-grow wallet__container p-4"
       :class="{ 'rounded-b-xl p-0': compactMode }"
diff --git a/src/assets/images/dark/nfts-icon-selected.svg b/src/assets/images/dark/nfts-icon-selected.svg
new file mode 100644
index 00000000..b86e1e52
--- /dev/null
+++ b/src/assets/images/dark/nfts-icon-selected.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 12C2 17.5228 6.47715 22 12 22C13.6569 22 15 20.6569 15 19V18.5C15 18.0356 15 17.8034 15.0257 17.6084C15.2029 16.2622 16.2622 15.2029 17.6084 15.0257C17.8034 15 18.0356 15 18.5 15H19C20.6569 15 22 13.6569 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 13C7.55228 13 8 12.5523 8 12C8 11.4477 7.55228 11 7 11C6.44772 11 6 11.4477 6 12C6 12.5523 6.44772 13 7 13Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16 9C16.5523 9 17 8.55228 17 8C17 7.44772 16.5523 7 16 7C15.4477 7 15 7.44772 15 8C15 8.55228 15.4477 9 16 9Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 8C10.5523 8 11 7.55228 11 7C11 6.44772 10.5523 6 10 6C9.44772 6 9 6.44772 9 7C9 7.55228 9.44772 8 10 8Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/dark/nfts-icon.svg b/src/assets/images/dark/nfts-icon.svg
new file mode 100644
index 00000000..8bac5737
--- /dev/null
+++ b/src/assets/images/dark/nfts-icon.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 12C2 17.5228 6.47715 22 12 22C13.6569 22 15 20.6569 15 19V18.5C15 18.0356 15 17.8034 15.0257 17.6084C15.2029 16.2622 16.2622 15.2029 17.6084 15.0257C17.8034 15 18.0356 15 18.5 15H19C20.6569 15 22 13.6569 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 13C7.55228 13 8 12.5523 8 12C8 11.4477 7.55228 11 7 11C6.44772 11 6 11.4477 6 12C6 12.5523 6.44772 13 7 13Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16 9C16.5523 9 17 8.55228 17 8C17 7.44772 16.5523 7 16 7C15.4477 7 15 7.44772 15 8C15 8.55228 15.4477 9 16 9Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 8C10.5523 8 11 7.55228 11 7C11 6.44772 10.5523 6 10 6C9.44772 6 9 6.44772 9 7C9 7.55228 9.44772 8 10 8Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/dark/notifications-icon-selected.svg b/src/assets/images/dark/notifications-icon-selected.svg
new file mode 100644
index 00000000..9bc9d5ca
--- /dev/null
+++ b/src/assets/images/dark/notifications-icon-selected.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9465 4H9.34204C9.19845 4 9.12666 4 9.06328 4.02186C9.00723 4.04119 8.95618 4.07275 8.91382 4.11423C8.86592 4.16115 8.83382 4.22536 8.7696 4.35378L5.4096 11.0738C5.25626 11.3805 5.17959 11.5338 5.198 11.6585C5.21409 11.7673 5.27429 11.8647 5.36445 11.9278C5.46771 12 5.63915 12 5.98204 12H10.9465L8.5465 20L18.301 9.88425C18.6301 9.54296 18.7946 9.37232 18.8042 9.22631C18.8126 9.09956 18.7603 8.97639 18.6632 8.89443C18.5514 8.8 18.3144 8.8 17.8403 8.8H12.1465L13.9465 4Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<circle cx="19.5" cy="3.5" r="2.5" fill="#B43030"/>
+</svg>
diff --git a/src/assets/images/dark/notifications-icon.svg b/src/assets/images/dark/notifications-icon.svg
new file mode 100644
index 00000000..87e6e7b0
--- /dev/null
+++ b/src/assets/images/dark/notifications-icon.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9465 4H9.34204C9.19845 4 9.12666 4 9.06328 4.02186C9.00723 4.04119 8.95618 4.07275 8.91382 4.11423C8.86592 4.16115 8.83382 4.22536 8.7696 4.35378L5.4096 11.0738C5.25626 11.3805 5.17959 11.5338 5.198 11.6585C5.21409 11.7673 5.27429 11.8647 5.36445 11.9278C5.46771 12 5.63915 12 5.98204 12H10.9465L8.5465 20L18.301 9.88425C18.6301 9.54296 18.7946 9.37232 18.8042 9.22631C18.8126 9.09956 18.7603 8.97639 18.6632 8.89443C18.5514 8.8 18.3144 8.8 17.8403 8.8H12.1465L13.9465 4Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<circle cx="19.5" cy="3.5" r="2.5" fill="#B43030"/>
+</svg>
diff --git a/src/assets/images/dark/profile-icon-selected.svg b/src/assets/images/dark/profile-icon-selected.svg
new file mode 100644
index 00000000..55eacf82
--- /dev/null
+++ b/src/assets/images/dark/profile-icon-selected.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 21C20 18.2386 16.4183 16 12 16C7.58172 16 4 18.2386 4 21M12 13C9.23858 13 7 10.7614 7 8C7 5.23858 9.23858 3 12 3C14.7614 3 17 5.23858 17 8C17 10.7614 14.7614 13 12 13Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/dark/profile-icon.svg b/src/assets/images/dark/profile-icon.svg
new file mode 100644
index 00000000..8b57eac8
--- /dev/null
+++ b/src/assets/images/dark/profile-icon.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 21C20 18.2386 16.4183 16 12 16C7.58172 16 4 18.2386 4 21M12 13C9.23858 13 7 10.7614 7 8C7 5.23858 9.23858 3 12 3C14.7614 3 17 5.23858 17 8C17 10.7614 14.7614 13 12 13Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/dark/tokens-icon-selected.svg b/src/assets/images/dark/tokens-icon-selected.svg
new file mode 100644
index 00000000..d6ea4a51
--- /dev/null
+++ b/src/assets/images/dark/tokens-icon-selected.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_919_2607)">
+<path d="M8.5 14.6667C8.5 15.9553 9.54467 17 10.8333 17H13C14.3807 17 15.5 15.8807 15.5 14.5C15.5 13.1193 14.3807 12 13 12H11C9.61929 12 8.5 10.8807 8.5 9.5C8.5 8.11929 9.61929 7 11 7H13.1667C14.4553 7 15.5 8.04467 15.5 9.33333M12 5.5V7M12 17V18.5M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_919_2607">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/images/dark/tokens-icon.svg b/src/assets/images/dark/tokens-icon.svg
new file mode 100644
index 00000000..faa3df12
--- /dev/null
+++ b/src/assets/images/dark/tokens-icon.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_847_4315)">
+<path d="M8.5 14.6667C8.5 15.9553 9.54467 17 10.8333 17H13C14.3807 17 15.5 15.8807 15.5 14.5C15.5 13.1193 14.3807 12 13 12H11C9.61929 12 8.5 10.8807 8.5 9.5C8.5 8.11929 9.61929 7 11 7H13.1667C14.4553 7 15.5 8.04467 15.5 9.33333M12 5.5V7M12 17V18.5M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_847_4315">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/images/light/nfts-icon-selected.svg b/src/assets/images/light/nfts-icon-selected.svg
new file mode 100644
index 00000000..b86e1e52
--- /dev/null
+++ b/src/assets/images/light/nfts-icon-selected.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 12C2 17.5228 6.47715 22 12 22C13.6569 22 15 20.6569 15 19V18.5C15 18.0356 15 17.8034 15.0257 17.6084C15.2029 16.2622 16.2622 15.2029 17.6084 15.0257C17.8034 15 18.0356 15 18.5 15H19C20.6569 15 22 13.6569 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 13C7.55228 13 8 12.5523 8 12C8 11.4477 7.55228 11 7 11C6.44772 11 6 11.4477 6 12C6 12.5523 6.44772 13 7 13Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16 9C16.5523 9 17 8.55228 17 8C17 7.44772 16.5523 7 16 7C15.4477 7 15 7.44772 15 8C15 8.55228 15.4477 9 16 9Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 8C10.5523 8 11 7.55228 11 7C11 6.44772 10.5523 6 10 6C9.44772 6 9 6.44772 9 7C9 7.55228 9.44772 8 10 8Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/nfts-icon.svg b/src/assets/images/light/nfts-icon.svg
new file mode 100644
index 00000000..8bac5737
--- /dev/null
+++ b/src/assets/images/light/nfts-icon.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 12C2 17.5228 6.47715 22 12 22C13.6569 22 15 20.6569 15 19V18.5C15 18.0356 15 17.8034 15.0257 17.6084C15.2029 16.2622 16.2622 15.2029 17.6084 15.0257C17.8034 15 18.0356 15 18.5 15H19C20.6569 15 22 13.6569 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 13C7.55228 13 8 12.5523 8 12C8 11.4477 7.55228 11 7 11C6.44772 11 6 11.4477 6 12C6 12.5523 6.44772 13 7 13Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16 9C16.5523 9 17 8.55228 17 8C17 7.44772 16.5523 7 16 7C15.4477 7 15 7.44772 15 8C15 8.55228 15.4477 9 16 9Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 8C10.5523 8 11 7.55228 11 7C11 6.44772 10.5523 6 10 6C9.44772 6 9 6.44772 9 7C9 7.55228 9.44772 8 10 8Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/notifications-icon-selected.svg b/src/assets/images/light/notifications-icon-selected.svg
new file mode 100644
index 00000000..9bc9d5ca
--- /dev/null
+++ b/src/assets/images/light/notifications-icon-selected.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9465 4H9.34204C9.19845 4 9.12666 4 9.06328 4.02186C9.00723 4.04119 8.95618 4.07275 8.91382 4.11423C8.86592 4.16115 8.83382 4.22536 8.7696 4.35378L5.4096 11.0738C5.25626 11.3805 5.17959 11.5338 5.198 11.6585C5.21409 11.7673 5.27429 11.8647 5.36445 11.9278C5.46771 12 5.63915 12 5.98204 12H10.9465L8.5465 20L18.301 9.88425C18.6301 9.54296 18.7946 9.37232 18.8042 9.22631C18.8126 9.09956 18.7603 8.97639 18.6632 8.89443C18.5514 8.8 18.3144 8.8 17.8403 8.8H12.1465L13.9465 4Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<circle cx="19.5" cy="3.5" r="2.5" fill="#B43030"/>
+</svg>
diff --git a/src/assets/images/light/notifications-icon.svg b/src/assets/images/light/notifications-icon.svg
new file mode 100644
index 00000000..87e6e7b0
--- /dev/null
+++ b/src/assets/images/light/notifications-icon.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9465 4H9.34204C9.19845 4 9.12666 4 9.06328 4.02186C9.00723 4.04119 8.95618 4.07275 8.91382 4.11423C8.86592 4.16115 8.83382 4.22536 8.7696 4.35378L5.4096 11.0738C5.25626 11.3805 5.17959 11.5338 5.198 11.6585C5.21409 11.7673 5.27429 11.8647 5.36445 11.9278C5.46771 12 5.63915 12 5.98204 12H10.9465L8.5465 20L18.301 9.88425C18.6301 9.54296 18.7946 9.37232 18.8042 9.22631C18.8126 9.09956 18.7603 8.97639 18.6632 8.89443C18.5514 8.8 18.3144 8.8 17.8403 8.8H12.1465L13.9465 4Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<circle cx="19.5" cy="3.5" r="2.5" fill="#B43030"/>
+</svg>
diff --git a/src/assets/images/light/profile-icon-selected.svg b/src/assets/images/light/profile-icon-selected.svg
new file mode 100644
index 00000000..55eacf82
--- /dev/null
+++ b/src/assets/images/light/profile-icon-selected.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 21C20 18.2386 16.4183 16 12 16C7.58172 16 4 18.2386 4 21M12 13C9.23858 13 7 10.7614 7 8C7 5.23858 9.23858 3 12 3C14.7614 3 17 5.23858 17 8C17 10.7614 14.7614 13 12 13Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/profile-icon.svg b/src/assets/images/light/profile-icon.svg
new file mode 100644
index 00000000..8b57eac8
--- /dev/null
+++ b/src/assets/images/light/profile-icon.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 21C20 18.2386 16.4183 16 12 16C7.58172 16 4 18.2386 4 21M12 13C9.23858 13 7 10.7614 7 8C7 5.23858 9.23858 3 12 3C14.7614 3 17 5.23858 17 8C17 10.7614 14.7614 13 12 13Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/tokens-icon-selected.svg b/src/assets/images/light/tokens-icon-selected.svg
new file mode 100644
index 00000000..d6ea4a51
--- /dev/null
+++ b/src/assets/images/light/tokens-icon-selected.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_919_2607)">
+<path d="M8.5 14.6667C8.5 15.9553 9.54467 17 10.8333 17H13C14.3807 17 15.5 15.8807 15.5 14.5C15.5 13.1193 14.3807 12 13 12H11C9.61929 12 8.5 10.8807 8.5 9.5C8.5 8.11929 9.61929 7 11 7H13.1667C14.4553 7 15.5 8.04467 15.5 9.33333M12 5.5V7M12 17V18.5M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_919_2607">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/images/light/tokens-icon.svg b/src/assets/images/light/tokens-icon.svg
new file mode 100644
index 00000000..faa3df12
--- /dev/null
+++ b/src/assets/images/light/tokens-icon.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_847_4315)">
+<path d="M8.5 14.6667C8.5 15.9553 9.54467 17 10.8333 17H13C14.3807 17 15.5 15.8807 15.5 14.5C15.5 13.1193 14.3807 12 13 12H11C9.61929 12 8.5 10.8807 8.5 9.5C8.5 8.11929 9.61929 7 11 7H13.1667C14.4553 7 15.5 8.04467 15.5 9.33333M12 5.5V7M12 17V18.5M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_847_4315">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/components/AppFooter.vue b/src/components/AppFooter.vue
index 06625581..53f3a0c5 100644
--- a/src/components/AppFooter.vue
+++ b/src/components/AppFooter.vue
@@ -4,12 +4,13 @@ import { useRoute } from 'vue-router'
 
 import { useAppStore } from '@/store/app'
 import { useUserStore } from '@/store/user'
+import { getImage } from '@/utils/getImage'
 import { useImage } from '@/utils/useImage'
 
-const getImage = useImage()
 const userStore = useUserStore()
 const appStore = useAppStore()
 const route = useRoute()
+const getImageOld = useImage()
 
 const currentRoute = computed(() => {
   return route.name
@@ -25,69 +26,94 @@ function getAppropriateIcon(iconName, pathName) {
     return getImage(iconName, isDark ? 'light' : 'dark')
   else return getImage(iconName)
 }
+
+function getIcon(icon: string, pathName: string) {
+  if (isCurrentRoute(pathName)) {
+    return getImage(`${icon}-selected.svg`)
+  } else {
+    return getImage(`${icon}.svg`)
+  }
+}
 </script>
 
 <template>
-  <footer
-    class="flex items-center justify-end py-4 rounded-b-xl"
-    :class="{ 'justify-between': userStore.isLoggedIn }"
-  >
-    <div v-if="userStore.isLoggedIn" class="flex space-x-4">
-      <router-link :to="{ name: 'home' }" title="Assets">
-        <img
-          :src="getAppropriateIcon('coins-stacked-icon', 'home')"
-          alt="home"
-          class="p-1 rounded-[10px]"
-          :class="{
-            'bg-black dark:bg-white': isCurrentRoute('home'),
-          }"
-        />
+  <footer class="flex items-center px-12 py-2 dark:bg-black-400">
+    <div v-if="userStore.isLoggedIn" class="flex flex-grow justify-between">
+      <router-link
+        :to="{ name: 'home' }"
+        title="Assets"
+        class="flex flex-col justify-center items-center gap-1"
+      >
+        <div
+          class="w-xxxl h-xxl rounded-md flex items-center justify-center"
+          :class="{ 'bg-white-100': isCurrentRoute('home') }"
+        >
+          <img
+            :src="getIcon('tokens-icon', 'home')"
+            alt="home"
+            class="w-xl h-xl"
+          />
+        </div>
+        <span
+          class="text-xs font-normal text-gray-100"
+          :class="{ 'text-white-100': isCurrentRoute('home') }"
+          >Tokens</span
+        >
       </router-link>
-      <router-link :to="{ name: 'Nfts' }" title="NFTs">
-        <img
-          :src="getAppropriateIcon('nfts-icon', 'Nfts')"
-          alt="nfts"
-          class="p-1 rounded-[10px]"
-          :class="{
-            'bg-black dark:bg-white': isCurrentRoute('Nfts'),
-          }"
-        />
+      <router-link
+        :to="{ name: 'Nfts' }"
+        title="NFTs"
+        class="flex flex-col justify-center items-center gap-1"
+      >
+        <div
+          class="w-xxxl h-xxl rounded-md flex items-center justify-center"
+          :class="{ 'bg-white-100': isCurrentRoute('Nfts') }"
+        >
+          <img :src="getIcon('nfts-icon', 'Nfts')" alt="nfts" />
+        </div>
+        <span
+          class="text-xs font-normal text-gray-100"
+          :class="{ 'text-white-100': isCurrentRoute('Nfts') }"
+          >NFT</span
+        >
       </router-link>
-      <router-link :to="{ name: 'profile' }" title="Profile">
-        <img
-          :src="getAppropriateIcon('profile-icon', 'profile')"
-          alt="profile"
-          class="p-1 rounded-[10px]"
-          :class="{
-            'bg-black dark:bg-white': isCurrentRoute('profile'),
-          }"
-        />
+      <router-link
+        :to="{ name: 'profile' }"
+        title="Profile"
+        class="flex flex-col justify-center items-center gap-1"
+      >
+        <div
+          class="w-xxxl h-xxl rounded-md flex items-center justify-center"
+          :class="{ 'bg-white-100': isCurrentRoute('profile') }"
+        >
+          <img :src="getIcon('profile-icon', 'profile')" alt="profile" />
+        </div>
+        <span
+          class="text-xs font-normal text-gray-100"
+          :class="{ 'text-white-100': isCurrentRoute('profile') }"
+          >Profile</span
+        >
       </router-link>
-      <router-link :to="{ name: 'activities' }" title="Activities">
-        <img
-          :src="getAppropriateIcon('thunder-icon', 'activities')"
-          alt="activities"
-          class="p-1 rounded-[10px]"
-          :class="{
-            'bg-black dark:bg-white': isCurrentRoute('activities'),
-          }"
-        />
+      <router-link
+        :to="{ name: 'activities' }"
+        title="Activities"
+        class="flex flex-col justify-center items-center gap-1"
+      >
+        <div
+          class="w-xxxl h-xxl rounded-md flex items-center justify-center"
+          :class="{ 'bg-white-100': isCurrentRoute('activities') }"
+        >
+          <img
+            :src="getIcon('notifications-icon', 'activities')"
+            alt="activities"
+          />
+        </div>
+        <span
+          class="text-xs font-normal text-gray-100"
+          :class="{ 'text-white-100': isCurrentRoute('activities') }"
+          >Activity</span
+        >
       </router-link>
     </div>
-    <div class="flex items-center justify-center">
-      <a href="https://arcana.network/" target="_blank">
-        <img
-          class="h-auto"
-          :src="getImage('powered-by-arcana', appStore.theme, 'svg')"
-        />
-      </a>
-    </div>
   </footer>
 </template>
-
-<style scoped>
-footer {
-  padding: var(--p-500);
-  background: var(--container-bg-color);
-}
-</style>
diff --git a/src/components/WalletHeader.vue b/src/components/WalletHeader.vue
index 8de44bd4..4a316258 100644
--- a/src/components/WalletHeader.vue
+++ b/src/components/WalletHeader.vue
@@ -8,7 +8,7 @@ const emits = defineEmits(['click'])
 </script>
 
 <template>
-  <header class="flex justify-between">
+  <header class="flex justify-between px-4 py-2">
     <div class="flex items-center gap-2">
       <img
         :src="appStore.appLogo?.horizontal"
@@ -17,14 +17,14 @@ const emits = defineEmits(['click'])
       />
       <span class="font-bold text-lg">{{ appStore.name }}</span>
     </div>
-    <div class="flex items-center gap-3">
+    <nav class="flex items-center gap-3">
       <button class="w-xl h-xl rounded-full">
         <img :src="`/chain-logos/ethereum-icon.png`" alt="Network Icon" />
       </button>
       <button class="w-xl h-xl">
         <img :src="getImage('qr-code.svg')" alt="Wallet Icon" />
       </button>
-    </div>
+    </nav>
     <!-- <button
       class="h-auto"
       :class="[appStore.compactMode ? 'rotate-180' : 'rotate-0']"
@@ -34,11 +34,3 @@ const emits = defineEmits(['click'])
     </button> -->
   </header>
 </template>
-
-<style scoped>
-header {
-  padding: var(--p-300);
-  color: var(--fg-color);
-  background: var(--container-bg-color);
-}
-</style>

From 658783353e8b31039e145868d5b39d6c9ddec446 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 15 May 2023 14:16:22 +0530
Subject: [PATCH 025/153] Remove unused code

---
 src/components/WalletHeader.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/components/WalletHeader.vue b/src/components/WalletHeader.vue
index 4a316258..cec4d139 100644
--- a/src/components/WalletHeader.vue
+++ b/src/components/WalletHeader.vue
@@ -3,8 +3,6 @@ import { useAppStore } from '@/store/app'
 import { getImage } from '@/utils/getImage'
 
 const appStore = useAppStore()
-
-const emits = defineEmits(['click'])
 </script>
 
 <template>
@@ -25,12 +23,5 @@ const emits = defineEmits(['click'])
         <img :src="getImage('qr-code.svg')" alt="Wallet Icon" />
       </button>
     </nav>
-    <!-- <button
-      class="h-auto"
-      :class="[appStore.compactMode ? 'rotate-180' : 'rotate-0']"
-      @click="emits('click')"
-    >
-      <img :src="getImageOld('arrow-icon')" alt="arrow" />
-    </button> -->
   </header>
 </template>

From 82156bbeff4b701533ef9511249b85ee48f7ac8c Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 15 May 2023 14:19:26 +0530
Subject: [PATCH 026/153] Remove unused code from footer

---
 src/components/AppFooter.vue | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/components/AppFooter.vue b/src/components/AppFooter.vue
index 53f3a0c5..bbcc11cf 100644
--- a/src/components/AppFooter.vue
+++ b/src/components/AppFooter.vue
@@ -2,15 +2,11 @@
 import { computed } from 'vue'
 import { useRoute } from 'vue-router'
 
-import { useAppStore } from '@/store/app'
 import { useUserStore } from '@/store/user'
 import { getImage } from '@/utils/getImage'
-import { useImage } from '@/utils/useImage'
 
 const userStore = useUserStore()
-const appStore = useAppStore()
 const route = useRoute()
-const getImageOld = useImage()
 
 const currentRoute = computed(() => {
   return route.name
@@ -20,13 +16,6 @@ function isCurrentRoute(pathName) {
   return currentRoute.value === pathName
 }
 
-function getAppropriateIcon(iconName, pathName) {
-  const isDark = appStore.theme === 'dark'
-  if (isCurrentRoute(pathName))
-    return getImage(iconName, isDark ? 'light' : 'dark')
-  else return getImage(iconName)
-}
-
 function getIcon(icon: string, pathName: string) {
   if (isCurrentRoute(pathName)) {
     return getImage(`${icon}-selected.svg`)

From 42408a2955f591b59af0da20eedf8b7238880e23 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 15 May 2023 17:59:41 +0530
Subject: [PATCH 027/153] Add wallet balance and asset screen

---
 src/assets/images/address-pic.svg     |   3 +
 src/assets/images/dark/buy-icon.svg   |   3 +
 src/assets/images/dark/plus.svg       |   3 +
 src/assets/images/dark/refresh.svg    |   3 +
 src/assets/images/dark/send-icon.svg  |   3 +
 src/assets/images/light/buy-icon.svg  |   3 +
 src/assets/images/light/plus.svg      |   3 +
 src/assets/images/light/refresh.svg   |   3 +
 src/assets/images/light/send-icon.svg |   3 +
 src/components/AssetsView.vue         |  95 +++++-------
 src/components/UserWallet.vue         | 203 ++++++++------------------
 src/components/WalletHeader.vue       |  55 ++++---
 src/pages/homeScreen.vue              |   7 +-
 src/store/user.ts                     |   4 +-
 14 files changed, 168 insertions(+), 223 deletions(-)
 create mode 100644 src/assets/images/address-pic.svg
 create mode 100644 src/assets/images/dark/buy-icon.svg
 create mode 100644 src/assets/images/dark/plus.svg
 create mode 100644 src/assets/images/dark/refresh.svg
 create mode 100644 src/assets/images/dark/send-icon.svg
 create mode 100644 src/assets/images/light/buy-icon.svg
 create mode 100644 src/assets/images/light/plus.svg
 create mode 100644 src/assets/images/light/refresh.svg
 create mode 100644 src/assets/images/light/send-icon.svg

diff --git a/src/assets/images/address-pic.svg b/src/assets/images/address-pic.svg
new file mode 100644
index 00000000..93f3f1d7
--- /dev/null
+++ b/src/assets/images/address-pic.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="12" cy="12" r="12" fill="#D9D9D9"/>
+</svg>
diff --git a/src/assets/images/dark/buy-icon.svg b/src/assets/images/dark/buy-icon.svg
new file mode 100644
index 00000000..f30e666f
--- /dev/null
+++ b/src/assets/images/dark/buy-icon.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.75 7.125C6.75 8.36764 7.75736 9.375 9 9.375C10.2426 9.375 11.25 8.36764 11.25 7.125M15.75 5.39996V12.6C15.75 13.44 15.7502 13.8602 15.5867 14.181C15.4429 14.4633 15.2131 14.6927 14.9308 14.8365C14.61 15 14.1902 15 13.3501 15H4.65015C3.81007 15 3.38972 15 3.06885 14.8365C2.7866 14.6927 2.5573 14.4633 2.41349 14.181C2.25 13.8602 2.25 13.44 2.25 12.6V5.39996C2.25 4.55988 2.25 4.1399 2.41349 3.81903C2.5573 3.53679 2.7866 3.3073 3.06885 3.16349C3.38972 3 3.81007 3 4.65015 3H13.3501C14.1902 3 14.61 3 14.9308 3.16349C15.2131 3.3073 15.4429 3.53679 15.5867 3.81903C15.7502 4.1399 15.75 4.55988 15.75 5.39996Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/dark/plus.svg b/src/assets/images/dark/plus.svg
new file mode 100644
index 00000000..1f15e439
--- /dev/null
+++ b/src/assets/images/dark/plus.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 10H15M10 15L10 5" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/dark/refresh.svg b/src/assets/images/dark/refresh.svg
new file mode 100644
index 00000000..a5b10820
--- /dev/null
+++ b/src/assets/images/dark/refresh.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.453 12.8927C20.1752 15.5026 18.6964 17.9483 16.2494 19.3611C12.1839 21.7083 6.98539 20.3153 4.63818 16.2499L4.38818 15.8168M3.54613 11.1066C3.82393 8.49674 5.30272 6.05102 7.74971 4.63825C11.8152 2.29104 17.0137 3.68398 19.3609 7.74947L19.6109 8.18248M3.49316 18.0657L4.22521 15.3336L6.95727 16.0657M17.0424 7.93364L19.7744 8.66569L20.5065 5.93364" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/dark/send-icon.svg b/src/assets/images/dark/send-icon.svg
new file mode 100644
index 00000000..7869a076
--- /dev/null
+++ b/src/assets/images/dark/send-icon.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.22754 13.7735L13.7735 4.22754M13.7735 4.22754H8.47046M13.7735 4.22754L13.7732 9.53084" stroke="#F7F7F7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/buy-icon.svg b/src/assets/images/light/buy-icon.svg
new file mode 100644
index 00000000..f30e666f
--- /dev/null
+++ b/src/assets/images/light/buy-icon.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.75 7.125C6.75 8.36764 7.75736 9.375 9 9.375C10.2426 9.375 11.25 8.36764 11.25 7.125M15.75 5.39996V12.6C15.75 13.44 15.7502 13.8602 15.5867 14.181C15.4429 14.4633 15.2131 14.6927 14.9308 14.8365C14.61 15 14.1902 15 13.3501 15H4.65015C3.81007 15 3.38972 15 3.06885 14.8365C2.7866 14.6927 2.5573 14.4633 2.41349 14.181C2.25 13.8602 2.25 13.44 2.25 12.6V5.39996C2.25 4.55988 2.25 4.1399 2.41349 3.81903C2.5573 3.53679 2.7866 3.3073 3.06885 3.16349C3.38972 3 3.81007 3 4.65015 3H13.3501C14.1902 3 14.61 3 14.9308 3.16349C15.2131 3.3073 15.4429 3.53679 15.5867 3.81903C15.7502 4.1399 15.75 4.55988 15.75 5.39996Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/plus.svg b/src/assets/images/light/plus.svg
new file mode 100644
index 00000000..1f15e439
--- /dev/null
+++ b/src/assets/images/light/plus.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 10H15M10 15L10 5" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/refresh.svg b/src/assets/images/light/refresh.svg
new file mode 100644
index 00000000..a5b10820
--- /dev/null
+++ b/src/assets/images/light/refresh.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.453 12.8927C20.1752 15.5026 18.6964 17.9483 16.2494 19.3611C12.1839 21.7083 6.98539 20.3153 4.63818 16.2499L4.38818 15.8168M3.54613 11.1066C3.82393 8.49674 5.30272 6.05102 7.74971 4.63825C11.8152 2.29104 17.0137 3.68398 19.3609 7.74947L19.6109 8.18248M3.49316 18.0657L4.22521 15.3336L6.95727 16.0657M17.0424 7.93364L19.7744 8.66569L20.5065 5.93364" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/send-icon.svg b/src/assets/images/light/send-icon.svg
new file mode 100644
index 00000000..7869a076
--- /dev/null
+++ b/src/assets/images/light/send-icon.svg
@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.22754 13.7735L13.7735 4.22754M13.7735 4.22754H8.47046M13.7735 4.22754L13.7732 9.53084" stroke="#F7F7F7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/AssetsView.vue b/src/components/AssetsView.vue
index 6be110d8..70cc56e0 100644
--- a/src/components/AssetsView.vue
+++ b/src/components/AssetsView.vue
@@ -8,6 +8,7 @@ import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
 import { getTokenBalance } from '@/utils/contractUtil'
 import { formatTokenDecimals, beautifyBalance } from '@/utils/formatTokens'
+import { getImage } from '@/utils/getImage'
 import { getStorage } from '@/utils/storageWrapper'
 import { getIconAsset } from '@/utils/useImage'
 
@@ -109,67 +110,51 @@ rpcStore.$subscribe(getAssetsBalance)
 </script>
 
 <template>
-  <div class="flex flex-col px-4 divide-y-[1px] divide-gray-600">
-    <div v-if="assets.length" class="flex flex-col py-5 gap-5">
-      <div
-        v-for="asset in assets"
-        :key="`asset-${asset.symbol}`"
-        class="flex justify-between items-center"
-      >
-        <div class="flex items-center gap-3">
-          <img
-            :src="getIconAsset(`token-logos/${asset.logo}`)"
-            class="w-[1.25rem] aspect-square rounded-full"
-          />
-          <span
-            class="assets-view__asset-name leading-none overflow-hidden whitespace-nowrap text-ellipsis"
-            :title="asset.name"
-            >{{ asset.name }}</span
-          >
-        </div>
+  <div class="flex flex-col gap-3">
+    <span class="uppercase font-lg font-bold">Assets</span>
+    <div class="card flex flex-col overflow-hidden">
+      <div v-if="assets.length" class="flex flex-col gap-4 p-4">
         <div
-          class="assets-view__asset-balance flex flex-wrap leading-none text-right overflow-hidden whitespace-nowrap text-ellipsis"
-          :title="`${
-            isNative(asset)
-              ? ethers.utils.formatEther(rpcStore.walletBalance)
-              : asset.balance.toFixed(asset.decimals)
-          } ${asset.symbol}`"
+          v-for="asset in assets"
+          :key="`asset-${asset.symbol}`"
+          class="flex justify-between items-center"
         >
-          {{ beautifyBalance(asset.balance) }}
-          {{ asset.symbol }}
+          <div class="flex items-center gap-3">
+            <img
+              :src="getIconAsset(`token-logos/${asset.logo}`)"
+              class="w-[1.25rem] aspect-square rounded-full"
+            />
+            <span
+              class="font-normal text-base overflow-hidden whitespace-nowrap text-ellipsis w-[12ch]"
+              :title="asset.name"
+              >{{ asset.name }}</span
+            >
+          </div>
+          <div
+            class="gap-1 font-normal text-base leading-none text-right"
+            :title="`${
+              isNative(asset)
+                ? ethers.utils.formatEther(rpcStore.walletBalance)
+                : asset.balance.toFixed(asset.decimals)
+            } ${asset.symbol}`"
+          >
+            <span class="overflow-hidden whitespace-nowrap text-ellipsis">{{
+              beautifyBalance(asset.balance)
+            }}</span>
+            {{ asset.symbol }}
+          </div>
         </div>
       </div>
-    </div>
-    <div v-else class="flex flex-col flex-grow py-5 gap-5">
-      <span class="color-secondary m-auto font-semibold text-sm sm:text-xs"
-        >No tokens added</span
-      >
-    </div>
-    <div class="flex justify-center">
-      <div
-        class="flex py-4 gap-2 items-center cursor-pointer"
+      <div v-else class="flex flex-col flex-grow py-5 gap-5">
+        <span class="m-auto font-normal text-base">No tokens added</span>
+      </div>
+      <button
+        class="flex py-3 gap-2 items-center justify-center flex-grow btn-quaternery border-r-0 border-l-0 border-b-0"
         @click.stop="handleAddToken"
       >
-        <img src="@/assets/images/plus.svg" class="invert dark:invert-0" />
-        <span class="assets-view__add-token-text leading-[1]">New</span>
-      </div>
+        <img :src="getImage('plus.svg')" class="h-lg w-lg" />
+        <span class="text-sm font-normal">New</span>
+      </button>
     </div>
   </div>
 </template>
-
-<style>
-.assets-view__add-token-text,
-.assets-view__asset-name,
-.assets-view__asset-balance {
-  font-size: var(--fs-350);
-}
-
-.assets-view__asset-name {
-  max-width: 12ch;
-  line-height: 1.5;
-}
-
-.assets-view__asset-balance {
-  max-width: 10ch;
-}
-</style>
diff --git a/src/components/UserWallet.vue b/src/components/UserWallet.vue
index a1d6639d..e078de2f 100644
--- a/src/components/UserWallet.vue
+++ b/src/components/UserWallet.vue
@@ -6,9 +6,7 @@ import { useToast } from 'vue-toastification'
 
 import AddNetwork from '@/components/AddNetwork.vue'
 import BuyTokens from '@/components/BuyTokens.vue'
-import ChangeChain from '@/components/ChangeChain.vue'
 import EditNetwork from '@/components/EditNetwork.vue'
-import ReceiveTokens from '@/components/ReceiveTokens.vue'
 import SendTokens from '@/components/SendTokens.vue'
 import {
   getExchangeRate,
@@ -17,13 +15,11 @@ import {
 import { useModalStore } from '@/store/modal'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
-import { HIDE_ON_RAMP } from '@/utils/constants'
+import { getImage } from '@/utils/getImage'
 import { isSupportedByOnRampMoney } from '@/utils/onrampmoney.ramp'
 import { getRampSupportedNetworks } from '@/utils/rampsdk'
 import { getRequestHandler } from '@/utils/requestHandlerSingleton'
 import { getTransakSupportedNetworks } from '@/utils/transak'
-import { truncateToTwoDecimals } from '@/utils/truncateToTwoDecimal'
-import { useImage } from '@/utils/useImage'
 
 type UserWalletProps = {
   walletBalance?: string
@@ -46,8 +42,6 @@ type ModalState =
 const userStore = useUserStore()
 const modalStore = useModalStore()
 const rpcStore = useRpcStore()
-const toast = useToast()
-const getImage = useImage()
 const showModal: Ref<ModalState> = ref(false)
 const { currency } = storeToRefs(rpcStore)
 const totalAmountInUSD: Ref<string | null> = ref(null)
@@ -78,29 +72,6 @@ const onRampMoney = computed(() => {
   }
 })
 
-// See above
-
-const explorerUrl = computed(() => {
-  if (
-    rpcStore.selectedRpcConfig &&
-    rpcStore.selectedRpcConfig.blockExplorerUrls?.length
-  ) {
-    const blockExplorerUrl = rpcStore.selectedRpcConfig.blockExplorerUrls[0]
-    const walletAddress = userStore.walletAddress
-    return `${blockExplorerUrl}/address/${walletAddress}`
-  }
-  return undefined
-})
-
-async function copyToClipboard(value: string) {
-  try {
-    await navigator.clipboard.writeText(value)
-    toast.success('Wallet address copied')
-  } catch (err) {
-    toast.error('Failed to copy wallet address')
-  }
-}
-
 function showLoader(message: string) {
   emit('show-loader', { message })
 }
@@ -133,11 +104,6 @@ function openSendTokens(open) {
   }
 }
 
-function openReceiveTokens(open) {
-  modalStore.setShowModal(open)
-  showModal.value = open ? 'receive' : false
-}
-
 async function getCurrencyExchangeRate() {
   showLoader('Fetching Currency Rate')
   totalAmountInUSD.value = totalAmountInUSD.value || null
@@ -166,6 +132,16 @@ function handleBuy(open: boolean) {
   showModal.value = open ? 'buy' : false
 }
 
+function hasWalletBalanceAfterDecimals() {
+  if (props.walletBalance?.includes('.')) {
+    const balance = props.walletBalance.split('.')
+    if (Number(balance[1]) > 0) {
+      return true
+    }
+  }
+  return false
+}
+
 onMounted(() => {
   if (props.walletBalance) {
     getCurrencyExchangeRate()
@@ -195,130 +171,69 @@ watch(
 
 <template>
   <div>
-    <div class="wallet__card rounded-[10px] flex flex-1 flex-col mb-6">
-      <div class="px-4 py-5 sm:p-2 h-full flex flex-col justify-between">
-        <div class="flex flex-col justify-center items-center space-y-2">
-          <div class="flex items-center space-x-1">
-            <p class="text-xl sm:text-sm">
-              {{ userStore.walletAddressShrinked }}
-            </p>
-            <button
-              class="h-4"
-              @click="copyToClipboard(userStore.walletAddress)"
-            >
-              <img
-                :src="getImage('copy-icon')"
-                alt="copy icon"
-                class="h-full"
-              />
-            </button>
-          </div>
-          <div class="flex items-center space-x-1 gap-4">
-            <a
-              v-if="explorerUrl"
-              :href="explorerUrl"
-              target="_blank"
-              class="flex items-center space-x-1"
-            >
-              <img
-                :src="getImage('arrow-up-right-icon')"
-                alt="Explore"
-                class="h-4"
-              />
-              <span class="text-xs">View on Explorer</span>
-            </a>
-            <button class="flex items-center" @click="handleRefresh">
-              <img
-                :src="getImage('refresh-icon')"
-                alt="Refresh wallet balance"
-                class="w-4"
-              />
-              <span class="text-xs">Refresh</span>
-            </button>
-          </div>
-        </div>
-        <div class="space-y-1 relative pb-14 sm:pb-8 mt-4">
-          <p class="text-xs text-zinc-400">Network</p>
-          <div class="w-full rounded-lg absolute">
-            <ChangeChain
-              @add-network="openAddNetwork(true)"
-              @edit-network="(chainId) => openEditNetwork(true, chainId)"
-            />
-          </div>
-        </div>
-        <div
-          v-if="props.walletBalance"
-          class="flex-1 w-full rounded-lg mx-auto flex flex-col justify-center items-center space-y-2 sm:space-y-0 debossed-card mt-5"
-        >
-          <div
-            class="p-4 sm:p-2 h-full flex flex-col justify-between space-y-5 sm:space-y-3 overflow-auto"
-          >
-            <div
-              class="flex-1 w-full rounded-lg mx-auto flex flex-col justify-center items-center space-y-2 sm:space-y-0"
-            >
-              <p class="text-sm sm:text-xs">Total Balance</p>
-              <div
-                v-if="totalAmountInUSD"
-                class="space-y-2 sm:space-y-0 flex flex-col items-center"
-              >
-                <p class="text-2xl sm:text-base text-center">
-                  {{ totalAmountInUSD }}
-                </p>
-                <div class="flex text-zinc-400 text-sm space-x-1">
-                  <p :title="props.walletBalance">
-                    {{ truncateToTwoDecimals(props.walletBalance) }}
-                  </p>
-                  <p>{{ currency }}</p>
-                </div>
-              </div>
-              <div v-else>
-                <div class="flex text-2xl sm:text-base space-x-1">
-                  <p :title="props.walletBalance">
-                    {{ truncateToTwoDecimals(props.walletBalance) }}
-                  </p>
-                  <p>{{ currency }}</p>
-                </div>
-              </div>
-            </div>
-          </div>
+    <div class="card p-4 flex flex-col">
+      <div class="flex justify-between items-center">
+        <div class="flex gap-1">
+          <img
+            src="@/assets/images/address-pic.svg"
+            class="w-xl h-xl rounded-full"
+          />
+          <span class="font-bold text-lg">{{
+            userStore.walletAddressShrinked
+          }}</span>
         </div>
-        <div class="flex space-x-3 mt-5">
-          <button
-            class="text-sm sm:text-xs font-semibold rounded-xl border-2 border-solid border-black dark:border-white flex-1 uppercase"
-            @click="openSendTokens(true)"
+        <button class="w-xl h-xl rounded-full" @click.stop="handleRefresh()">
+          <img :src="getImage('refresh.svg')" />
+        </button>
+      </div>
+      <div class="mt-4 flex flex-col">
+        <span class="font-normal text-sm text-gray-100">Total Balance:</span>
+        <div>
+          <span class="font-bold text-xxl">{{
+            props.walletBalance?.split('.')[0]
+          }}</span>
+          <span
+            v-if="hasWalletBalanceAfterDecimals()"
+            class="font-bold text-xxl"
+            >.</span
           >
-            Send
-          </button>
-          <button
-            v-if="walletBalance && !HIDE_ON_RAMP"
-            :disabled="!transakNetwork && !rampNetwork && onRampMoney !== false"
-            class="text-sm sm:text-xs font-semibold rounded-xl border-2 border-solid border-black dark:border-white flex-1 uppercase disabled:opacity-50"
-            @click="handleBuy(true)"
+          <span
+            v-if="hasWalletBalanceAfterDecimals()"
+            class="font-bold text-base"
+            >{{ props.walletBalance?.split('.')[1] }}</span
           >
-            Buy
-          </button>
-          <button
-            class="text-sm sm:text-xs font-semibold rounded-xl border-2 border-solid border-black dark:border-white flex-1 uppercase"
-            @click="openReceiveTokens(true)"
+          <span v-if="currency" class="font-bold text-base ml-1">
+            {{ currency }}</span
           >
-            Receive
-          </button>
         </div>
       </div>
+      <div class="mt-6 flex gap-3">
+        <button
+          class="btn-secondary flex gap-1 justify-center p-2 items-center font-bold text-sm uppercase w-full"
+          @click.stop="openSendTokens(true)"
+        >
+          <img :src="getImage('send-icon.svg')" class="w-md h-md" />
+          Send
+        </button>
+        <button
+          class="btn-secondary flex gap-1 justify-center p-2 items-center font-bold text-sm uppercase w-full"
+          :disabled="!transakNetwork && !rampNetwork && onRampMoney === false"
+          @click.stop="handleBuy(true)"
+        >
+          <img :src="getImage('buy-icon.svg')" class="w-md h-md" />
+          Buy
+        </button>
+      </div>
     </div>
     <Teleport v-if="showModal" to="#modal-container">
       <SendTokens v-if="showModal === 'send'" @close="openSendTokens(false)" />
-      <ReceiveTokens
-        v-if="showModal === 'receive'"
-        @close="openReceiveTokens(false)"
-      />
       <AddNetwork
         v-if="showModal === 'add-network'"
         @close="openAddNetwork(false)"
       />
       <EditNetwork
         v-if="showModal === 'edit-network'"
-        :chain-id="chainSelectedForEdit as number"
+        :chain-id="(chainSelectedForEdit as number)"
         @close="openEditNetwork(false)"
       />
       <BuyTokens
diff --git a/src/components/WalletHeader.vue b/src/components/WalletHeader.vue
index cec4d139..485061f3 100644
--- a/src/components/WalletHeader.vue
+++ b/src/components/WalletHeader.vue
@@ -1,27 +1,48 @@
 <script setup lang="ts">
+import { ref, type Ref } from 'vue'
+
+import ReceiveTokens from '@/components/ReceiveTokens.vue'
 import { useAppStore } from '@/store/app'
+import { useModalStore } from '@/store/modal'
 import { getImage } from '@/utils/getImage'
 
+type ModalState = 'receive' | false
+
 const appStore = useAppStore()
+const showModal: Ref<ModalState> = ref(false)
+const modalStore = useModalStore()
+
+function openReceiveTokens(open) {
+  modalStore.setShowModal(open)
+  showModal.value = open ? 'receive' : false
+}
 </script>
 
 <template>
-  <header class="flex justify-between px-4 py-2">
-    <div class="flex items-center gap-2">
-      <img
-        :src="appStore.appLogo?.horizontal"
-        alt="App Logo"
-        class="w-xl h-xl"
+  <div>
+    <header class="flex justify-between px-4 py-2">
+      <div class="flex items-center gap-2">
+        <img
+          :src="appStore.appLogo?.horizontal"
+          alt="App Logo"
+          class="w-xl h-xl"
+        />
+        <span class="font-bold text-lg">{{ appStore.name }}</span>
+      </div>
+      <nav class="flex items-center gap-3">
+        <button class="w-xl h-xl rounded-full">
+          <img :src="`/chain-logos/ethereum-icon.png`" alt="Network Icon" />
+        </button>
+        <button class="w-xl h-xl" @click.stop="openReceiveTokens(true)">
+          <img :src="getImage('qr-code.svg')" alt="Wallet Icon" />
+        </button>
+      </nav>
+    </header>
+    <Teleport v-if="showModal" to="#modal-container">
+      <ReceiveTokens
+        v-if="showModal === 'receive'"
+        @close="openReceiveTokens(false)"
       />
-      <span class="font-bold text-lg">{{ appStore.name }}</span>
-    </div>
-    <nav class="flex items-center gap-3">
-      <button class="w-xl h-xl rounded-full">
-        <img :src="`/chain-logos/ethereum-icon.png`" alt="Network Icon" />
-      </button>
-      <button class="w-xl h-xl">
-        <img :src="getImage('qr-code.svg')" alt="Wallet Icon" />
-      </button>
-    </nav>
-  </header>
+    </Teleport>
+  </div>
 </template>
diff --git a/src/pages/homeScreen.vue b/src/pages/homeScreen.vue
index 85d2d8c4..4d5c55c8 100644
--- a/src/pages/homeScreen.vue
+++ b/src/pages/homeScreen.vue
@@ -90,11 +90,8 @@ watch(
       :wallet-balance="walletBalance"
       @refresh="handleRefresh"
     />
-    <div class="pb-5 flex flex-col gap-1">
-      <div class="font-semibold">Assets</div>
-      <div class="wallet__card rounded-[10px] flex flex-1 flex-col">
-        <AssetsView />
-      </div>
+    <div class="mt-8">
+      <AssetsView />
     </div>
   </div>
 </template>
diff --git a/src/store/user.ts b/src/store/user.ts
index 7b53bf70..ed5e2b8b 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -32,8 +32,8 @@ export const useUserStore = defineStore('user', {
     walletAddressShrinked(state: UserState): string {
       const { walletAddress } = state
       const walletAddressLength = walletAddress.length
-      return `${walletAddress.slice(0, 7)}....${walletAddress.slice(
-        walletAddressLength - 7
+      return `${walletAddress.slice(0, 5)}....${walletAddress.slice(
+        walletAddressLength - 5
       )}`
     },
   },

From 927e8a1e92677e604b7d475caa98f85f2ca71cea Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 15 May 2023 18:16:23 +0530
Subject: [PATCH 028/153] Convert chain Id to number before saving

---
 src/components/AssetsView.vue |  6 ++----
 src/pages/AddTokenScreen.vue  | 12 +++++++++---
 src/pages/homeScreen.vue      |  2 +-
 src/store/rpc.ts              |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/components/AssetsView.vue b/src/components/AssetsView.vue
index 70cc56e0..66e17123 100644
--- a/src/components/AssetsView.vue
+++ b/src/components/AssetsView.vue
@@ -131,16 +131,14 @@ rpcStore.$subscribe(getAssetsBalance)
             >
           </div>
           <div
-            class="gap-1 font-normal text-base leading-none text-right"
+            class="gap-1 font-normal text-base leading-none text-right overflow-hidden whitespace-nowrap text-ellipsis"
             :title="`${
               isNative(asset)
                 ? ethers.utils.formatEther(rpcStore.walletBalance)
                 : asset.balance.toFixed(asset.decimals)
             } ${asset.symbol}`"
           >
-            <span class="overflow-hidden whitespace-nowrap text-ellipsis">{{
-              beautifyBalance(asset.balance)
-            }}</span>
+            {{ beautifyBalance(asset.balance) }}
             {{ asset.symbol }}
           </div>
         </div>
diff --git a/src/pages/AddTokenScreen.vue b/src/pages/AddTokenScreen.vue
index 07a74bbf..9d416b08 100644
--- a/src/pages/AddTokenScreen.vue
+++ b/src/pages/AddTokenScreen.vue
@@ -67,7 +67,9 @@ async function addTokenContract() {
       return toast.error('Enter all the details to continue')
     }
     const assetContractsString = storage.local.getItem(
-      `${userStore.walletAddress}/${rpcStore.selectedRpcConfig?.chainId}/asset-contracts`
+      `${userStore.walletAddress}/${Number(
+        rpcStore.selectedRpcConfig?.chainId
+      )}/asset-contracts`
     )
     let assetContracts: AssetContract[] = []
     if (assetContractsString) {
@@ -75,7 +77,9 @@ async function addTokenContract() {
     }
     assetContracts.push({ ...tokenContract })
     storage.local.setItem(
-      `${userStore.walletAddress}/${rpcStore.selectedRpcConfig?.chainId}/asset-contracts`,
+      `${userStore.walletAddress}/${Number(
+        rpcStore.selectedRpcConfig?.chainId
+      )}/asset-contracts`,
       JSON.stringify(assetContracts)
     )
     loader.show = false
@@ -89,7 +93,9 @@ async function addTokenContract() {
 
 function isContractInLocalStorage() {
   const assetContractsString = storage.local.getItem(
-    `${userStore.walletAddress}/${rpcStore.selectedRpcConfig?.chainId}/asset-contracts`
+    `${userStore.walletAddress}/${Number(
+      rpcStore.selectedRpcConfig?.chainId
+    )}/asset-contracts`
   )
   if (assetContractsString) {
     const assetContracts = JSON.parse(assetContractsString) as AssetContract[]
diff --git a/src/pages/homeScreen.vue b/src/pages/homeScreen.vue
index 4d5c55c8..969e5df4 100644
--- a/src/pages/homeScreen.vue
+++ b/src/pages/homeScreen.vue
@@ -90,7 +90,7 @@ watch(
       :wallet-balance="walletBalance"
       @refresh="handleRefresh"
     />
-    <div class="mt-8">
+    <div class="my-8">
       <AssetsView />
     </div>
   </div>
diff --git a/src/store/rpc.ts b/src/store/rpc.ts
index b396609f..ac6e2f72 100644
--- a/src/store/rpc.ts
+++ b/src/store/rpc.ts
@@ -84,7 +84,7 @@ export const useRpcStore = defineStore('rpcStore', {
     },
     isEthereumMainnet() {
       const selectedRpcConfig: RpcConfigWallet = this.selectedRpcConfig
-      return selectedRpcConfig.chainId === `1`
+      return Number(selectedRpcConfig.chainId) === 1
     },
   },
   actions: {

From 2464fefed58c626fff9ed61a8313eed0b59f6857 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 15 May 2023 18:37:31 +0530
Subject: [PATCH 029/153] Add secured by arcana logo

---
 src/App.vue                                   |  5 ++-
 src/assets/images/dark/secured-by-arcana.svg  | 42 +++++++++++++++++++
 src/assets/images/light/secured-by-arcana.svg | 42 +++++++++++++++++++
 tailwind.config.js                            |  1 +
 4 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/images/dark/secured-by-arcana.svg
 create mode 100644 src/assets/images/light/secured-by-arcana.svg

diff --git a/src/App.vue b/src/App.vue
index 8a0d4919..2284acf2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,6 +11,7 @@ import { useAppStore } from '@/store/app'
 import { useModalStore } from '@/store/modal'
 import { useParentConnectionStore } from '@/store/parentConnection'
 import { useRequestStore } from '@/store/request'
+import { getImage } from '@/utils/getImage'
 import { initializeOnRampMoney } from '@/utils/onrampmoney.ramp'
 import { fetchTransakNetworks } from '@/utils/transak'
 
@@ -87,8 +88,9 @@ function onClickOfHeader() {
         class="flex-grow wallet__container p-4"
         :class="{ 'rounded-b-xl p-0': compactMode }"
       >
-        <RouterView class="min-h-full" />
+        <RouterView class="min-h-fullxs flex-grow" />
         <BaseModal v-if="modal.show" />
+        <img :src="getImage('secured-by-arcana.svg')" class="h-xs" />
       </div>
       <WalletFooter v-if="showFooter" />
     </div>
@@ -133,7 +135,6 @@ body {
 .wallet__container {
   display: flex;
   flex-direction: column;
-  justify-content: space-around;
   overflow-x: hidden;
   color: var(--fg-color);
   background: var(--container-bg-color);
diff --git a/src/assets/images/dark/secured-by-arcana.svg b/src/assets/images/dark/secured-by-arcana.svg
new file mode 100644
index 00000000..90cc21d2
--- /dev/null
+++ b/src/assets/images/dark/secured-by-arcana.svg
@@ -0,0 +1,42 @@
+<svg width="116" height="13" viewBox="0 0 116 13" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.32 3.64C3.13333 3.64 2.94333 3.65667 2.75 3.69C2.56333 3.72333 2.39333 3.78333 2.24 3.87C2.08667 3.95 1.96 4.06333 1.86 4.21C1.76667 4.35 1.72 4.53 1.72 4.75C1.72 5.01667 1.79 5.23333 1.93 5.4C2.07 5.56 2.24 5.68333 2.44 5.77C2.6 5.83667 2.77 5.89333 2.95 5.94C3.13 5.98667 3.31333 6.03 3.5 6.07C3.69333 6.11 3.88 6.15 4.06 6.19C4.24667 6.23 4.42667 6.28 4.6 6.34C5.00667 6.48 5.33 6.68 5.57 6.94C5.81667 7.2 5.94 7.54333 5.94 7.97C5.94 8.37 5.87 8.7 5.73 8.96C5.59667 9.22 5.41333 9.43333 5.18 9.6C4.95333 9.76667 4.68667 9.89 4.38 9.97C4.08 10.0433 3.76 10.08 3.42 10.08C3.08 10.08 2.75333 10.0467 2.44 9.98C2.13333 9.91333 1.85333 9.80333 1.6 9.65C1.34667 9.49667 1.13 9.29667 0.95 9.05C0.77 8.80333 0.643333 8.50333 0.57 8.15H1.48C1.54667 8.37667 1.65 8.56333 1.79 8.71C1.93 8.85667 2.09 8.97333 2.27 9.06C2.45 9.14667 2.64333 9.20667 2.85 9.24C3.06333 9.27333 3.27333 9.29 3.48 9.29C3.68 9.29 3.87333 9.27 4.06 9.23C4.25333 9.18333 4.42333 9.11333 4.57 9.02C4.71667 8.92667 4.83333 8.80667 4.92 8.66C5.00667 8.51333 5.05 8.33667 5.05 8.13C5.05 7.81667 4.96667 7.58333 4.8 7.43C4.63333 7.27667 4.41 7.16 4.13 7.08C3.94333 7.02 3.74667 6.97 3.54 6.93C3.33333 6.89 3.12667 6.84667 2.92 6.8C2.71333 6.75333 2.51 6.7 2.31 6.64C2.11 6.57333 1.92667 6.49667 1.76 6.41C1.49333 6.28333 1.27 6.09 1.09 5.83C0.91 5.56333 0.82 5.23 0.82 4.83C0.82 4.45667 0.893333 4.14333 1.04 3.89C1.18667 3.63667 1.37667 3.43333 1.61 3.28C1.84333 3.12667 2.10333 3.01667 2.39 2.95C2.68333 2.88333 2.99333 2.85 3.32 2.85C3.58667 2.85667 3.82667 2.88 4.04 2.92C4.26 2.95333 4.46667 3.01667 4.66 3.11C4.96 3.24333 5.21 3.44333 5.41 3.71C5.61 3.97667 5.72 4.32 5.74 4.74H4.89C4.86333 4.53333 4.8 4.36 4.7 4.22C4.60667 4.08 4.49 3.96667 4.35 3.88C4.21 3.79333 4.05 3.73333 3.87 3.7C3.69667 3.66 3.51333 3.64 3.32 3.64ZM7.85344 7.68C7.87344 7.91333 7.9201 8.13 7.99344 8.33C8.07344 8.52333 8.1801 8.69333 8.31344 8.84C8.44677 8.98667 8.6101 9.10333 8.80344 9.19C9.00344 9.27 9.23344 9.31 9.49344 9.31C9.6201 9.31 9.7501 9.3 9.88344 9.28C10.0234 9.25333 10.1534 9.21333 10.2734 9.16C10.3934 9.1 10.5001 9.02333 10.5934 8.93C10.6868 8.83667 10.7568 8.72333 10.8034 8.59H11.6734C11.6134 8.84333 11.5101 9.06333 11.3634 9.25C11.2234 9.43667 11.0534 9.59 10.8534 9.71C10.6601 9.83 10.4434 9.92 10.2034 9.98C9.96344 10.0333 9.7201 10.06 9.47344 10.06C9.05344 10.06 8.68677 9.99333 8.37344 9.86C8.06677 9.72667 7.8101 9.54333 7.60344 9.31C7.39677 9.07 7.24344 8.78667 7.14344 8.46C7.04344 8.12667 6.99344 7.76333 6.99344 7.37C6.99344 6.97667 7.04677 6.61667 7.15344 6.29C7.26677 5.95667 7.42677 5.67 7.63344 5.43C7.8401 5.19 8.09344 5.00333 8.39344 4.87C8.69344 4.73667 9.0501 4.67 9.46344 4.67C9.88344 4.67 10.2468 4.75333 10.5534 4.92C10.8601 5.08667 11.1068 5.30667 11.2934 5.58C11.4801 5.84667 11.6101 6.13667 11.6834 6.45C11.7634 6.76333 11.7968 7.05333 11.7834 7.32C11.7834 7.38 11.7801 7.44 11.7734 7.5C11.7734 7.56 11.7701 7.62 11.7634 7.68H7.85344ZM10.9234 6.94C10.9101 6.49333 10.7701 6.13 10.5034 5.85C10.2368 5.57 9.8801 5.43 9.43344 5.43C9.18677 5.43 8.9701 5.47 8.78344 5.55C8.59677 5.63 8.4401 5.74 8.31344 5.88C8.18677 6.02 8.08677 6.18333 8.01344 6.37C7.9401 6.55 7.89344 6.74 7.87344 6.94H10.9234ZM15.2735 10.06C14.8535 10.06 14.4902 9.99333 14.1835 9.86C13.8768 9.72667 13.6235 9.54 13.4235 9.3C13.2235 9.06 13.0735 8.77667 12.9735 8.45C12.8735 8.12333 12.8235 7.76667 12.8235 7.38C12.8235 7.00667 12.8768 6.65667 12.9835 6.33C13.0902 5.99667 13.2468 5.71 13.4535 5.47C13.6602 5.22333 13.9202 5.03 14.2335 4.89C14.5468 4.74333 14.9268 4.67 15.3735 4.67C15.6402 4.67 15.8768 4.7 16.0835 4.76C16.2902 4.81333 16.4835 4.90333 16.6635 5.03C16.8502 5.15 17.0102 5.31 17.1435 5.51C17.2768 5.71 17.3735 5.95333 17.4335 6.24H16.5635C16.4635 5.94667 16.3035 5.73667 16.0835 5.61C15.8702 5.48333 15.6168 5.42333 15.3235 5.43C15.0368 5.43 14.7835 5.48667 14.5635 5.6C14.3502 5.70667 14.1768 5.85 14.0435 6.03C13.9168 6.21 13.8235 6.42 13.7635 6.66C13.7035 6.89333 13.6735 7.13333 13.6735 7.38C13.6735 7.64 13.7035 7.88667 13.7635 8.12C13.8302 8.35333 13.9268 8.56 14.0535 8.74C14.1868 8.91333 14.3568 9.05333 14.5635 9.16C14.7702 9.26 15.0168 9.31 15.3035 9.31C15.4435 9.31 15.5802 9.29667 15.7135 9.27C15.8535 9.24333 15.9802 9.2 16.0935 9.14C16.2135 9.07333 16.3168 8.98667 16.4035 8.88C16.4902 8.77333 16.5535 8.64333 16.5935 8.49H17.4735C17.4202 8.76333 17.3235 9 17.1835 9.2C17.0502 9.39333 16.8835 9.55667 16.6835 9.69C16.4835 9.81667 16.2635 9.91 16.0235 9.97C15.7835 10.03 15.5335 10.06 15.2735 10.06ZM20.7509 9.31C21.2309 9.31 21.5809 9.16667 21.8009 8.88C22.0275 8.58667 22.1409 8.18 22.1409 7.66V4.73H22.9909V7.7C22.9909 8.5 22.7975 9.09333 22.4109 9.48C22.0309 9.86667 21.4775 10.06 20.7509 10.06C20.0242 10.06 19.4709 9.86667 19.0909 9.48C18.7175 9.09333 18.5309 8.5 18.5309 7.7V4.73H19.3809V7.66C19.3809 8.18 19.4942 8.58667 19.7209 8.88C19.9475 9.16667 20.2909 9.31 20.7509 9.31ZM24.3126 10V4.73H25.1326L25.1726 5.55C25.3659 5.24333 25.6126 5.02 25.9126 4.88C26.2126 4.74 26.5526 4.67 26.9326 4.67H27.2026V5.47H26.8926C26.5792 5.47 26.3126 5.52333 26.0926 5.63C25.8726 5.73 25.6926 5.87 25.5526 6.05C25.4192 6.22333 25.3192 6.43 25.2526 6.67C25.1926 6.91 25.1626 7.16333 25.1626 7.43V10H24.3126ZM28.6054 7.68C28.6254 7.91333 28.6721 8.13 28.7454 8.33C28.8254 8.52333 28.9321 8.69333 29.0654 8.84C29.1987 8.98667 29.3621 9.10333 29.5554 9.19C29.7554 9.27 29.9854 9.31 30.2454 9.31C30.3721 9.31 30.5021 9.3 30.6354 9.28C30.7754 9.25333 30.9054 9.21333 31.0254 9.16C31.1454 9.1 31.2521 9.02333 31.3454 8.93C31.4387 8.83667 31.5087 8.72333 31.5554 8.59H32.4254C32.3654 8.84333 32.2621 9.06333 32.1154 9.25C31.9754 9.43667 31.8054 9.59 31.6054 9.71C31.4121 9.83 31.1954 9.92 30.9554 9.98C30.7154 10.0333 30.4721 10.06 30.2254 10.06C29.8054 10.06 29.4387 9.99333 29.1254 9.86C28.8187 9.72667 28.5621 9.54333 28.3554 9.31C28.1487 9.07 27.9954 8.78667 27.8954 8.46C27.7954 8.12667 27.7454 7.76333 27.7454 7.37C27.7454 6.97667 27.7987 6.61667 27.9054 6.29C28.0187 5.95667 28.1787 5.67 28.3854 5.43C28.5921 5.19 28.8454 5.00333 29.1454 4.87C29.4454 4.73667 29.8021 4.67 30.2154 4.67C30.6354 4.67 30.9987 4.75333 31.3054 4.92C31.6121 5.08667 31.8587 5.30667 32.0454 5.58C32.2321 5.84667 32.3621 6.13667 32.4354 6.45C32.5154 6.76333 32.5487 7.05333 32.5354 7.32C32.5354 7.38 32.5321 7.44 32.5254 7.5C32.5254 7.56 32.5221 7.62 32.5154 7.68H28.6054ZM31.6754 6.94C31.6621 6.49333 31.5221 6.13 31.2554 5.85C30.9887 5.57 30.6321 5.43 30.1854 5.43C29.9387 5.43 29.7221 5.47 29.5354 5.55C29.3487 5.63 29.1921 5.74 29.0654 5.88C28.9387 6.02 28.8387 6.18333 28.7654 6.37C28.6921 6.55 28.6454 6.74 28.6254 6.94H31.6754ZM38.3778 10H37.5678L37.5278 9.21C37.3478 9.51 37.0978 9.72667 36.7778 9.86C36.4645 9.99333 36.1345 10.06 35.7878 10.06C35.3878 10.0533 35.0411 9.98333 34.7478 9.85C34.4545 9.71 34.2145 9.52 34.0278 9.28C33.8411 9.04 33.7011 8.76 33.6078 8.44C33.5211 8.11333 33.4778 7.76 33.4778 7.38C33.4778 7 33.5245 6.64667 33.6178 6.32C33.7111 5.98667 33.8545 5.7 34.0478 5.46C34.2411 5.21333 34.4845 5.02 34.7778 4.88C35.0711 4.74 35.4211 4.67 35.8278 4.67C36.1345 4.67 36.4445 4.72667 36.7578 4.84C37.0711 4.95333 37.3278 5.13667 37.5278 5.39V2.93H38.3778V10ZM35.8978 5.43C35.6111 5.43 35.3678 5.48333 35.1678 5.59C34.9678 5.69 34.8045 5.82667 34.6778 6C34.5578 6.17333 34.4678 6.38 34.4078 6.62C34.3545 6.85333 34.3278 7.11 34.3278 7.39C34.3278 7.67 34.3545 7.92333 34.4078 8.15C34.4611 8.37 34.5511 8.56667 34.6778 8.74C34.8045 8.91333 34.9678 9.05333 35.1678 9.16C35.3678 9.26 35.6145 9.31 35.9078 9.31C36.2478 9.31 36.5278 9.23 36.7478 9.07C36.9678 8.91 37.1445 8.71 37.2778 8.47C37.3711 8.30333 37.4378 8.12333 37.4778 7.93C37.5178 7.73 37.5378 7.53333 37.5378 7.34C37.5378 7.1 37.5145 6.88 37.4678 6.68C37.4278 6.48 37.3511 6.29333 37.2378 6.12C37.1045 5.92667 36.9278 5.76333 36.7078 5.63C36.4878 5.49667 36.2178 5.43 35.8978 5.43ZM42.5983 2.93H45.0783C45.4183 2.93 45.7249 2.95 45.9983 2.99C46.2783 3.03 46.5283 3.12333 46.7483 3.27C46.9416 3.39667 47.1049 3.57667 47.2383 3.81C47.3716 4.04333 47.4383 4.34 47.4383 4.7C47.4383 5.06 47.3549 5.38 47.1883 5.66C47.0283 5.94 46.7783 6.14667 46.4383 6.28C46.8916 6.36 47.2316 6.55333 47.4583 6.86C47.6849 7.16 47.7983 7.55 47.7983 8.03C47.7783 8.47 47.6849 8.81333 47.5183 9.06C47.3516 9.30667 47.1383 9.5 46.8783 9.64C46.6183 9.78 46.3249 9.87667 45.9983 9.93C45.6783 9.97667 45.3549 10 45.0283 10H42.5983V2.93ZM43.4683 3.72V6.03H44.8283C45.0149 6.03 45.2083 6.01667 45.4083 5.99C45.6083 5.96333 45.7883 5.90667 45.9483 5.82C46.1349 5.72667 46.2849 5.6 46.3983 5.44C46.5183 5.27333 46.5816 5.04667 46.5883 4.76C46.5883 4.53333 46.5483 4.35333 46.4683 4.22C46.3883 4.08 46.2783 3.97333 46.1383 3.9C45.9983 3.82667 45.8383 3.78 45.6583 3.76C45.4783 3.73333 45.2883 3.72 45.0883 3.72H43.4683ZM44.9983 9.21C45.2116 9.21 45.4249 9.2 45.6383 9.18C45.8583 9.16 46.0649 9.11 46.2583 9.03C46.4583 8.94333 46.6183 8.82 46.7383 8.66C46.8583 8.49333 46.9183 8.27 46.9183 7.99C46.9183 7.75 46.8716 7.55333 46.7783 7.4C46.6916 7.24667 46.5716 7.12667 46.4183 7.04C46.2716 6.95333 46.1016 6.89333 45.9083 6.86C45.7149 6.82667 45.5183 6.81 45.3183 6.81H43.4683V9.21H44.9983ZM53.591 4.73V10C53.591 10.7667 53.391 11.35 52.991 11.75C52.591 12.1567 52.021 12.36 51.281 12.36C50.8343 12.3533 50.431 12.2933 50.071 12.18C49.7177 12.0733 49.391 11.88 49.091 11.6L49.461 10.93C49.721 11.1367 49.9977 11.3 50.291 11.42C50.591 11.54 50.9043 11.6 51.231 11.6C51.5043 11.6 51.7377 11.5567 51.931 11.47C52.1243 11.39 52.281 11.2733 52.401 11.12C52.5277 10.9733 52.6177 10.7967 52.671 10.59C52.731 10.3833 52.761 10.16 52.761 9.92V9.29C52.6743 9.42333 52.5643 9.54333 52.431 9.65C52.3043 9.75 52.1643 9.83333 52.011 9.9C51.8643 9.96 51.7043 10.0033 51.531 10.03C51.3643 10.0633 51.1943 10.08 51.021 10.08C50.621 10.0733 50.2877 10.01 50.021 9.89C49.761 9.77 49.551 9.60333 49.391 9.39C49.2377 9.17667 49.1277 8.92333 49.061 8.63C48.9943 8.33 48.961 8 48.961 7.64V4.73H49.811V7.4C49.811 7.64 49.8243 7.87667 49.851 8.11C49.8843 8.34333 49.9477 8.55 50.041 8.73C50.1343 8.91 50.271 9.05667 50.451 9.17C50.631 9.27667 50.871 9.33 51.171 9.33C51.471 9.33 51.7243 9.26667 51.931 9.14C52.1443 9.01333 52.3077 8.85333 52.421 8.66C52.5477 8.46 52.631 8.24 52.671 8C52.7177 7.76 52.741 7.51333 52.741 7.26V4.73H53.591Z" fill="#AAAAAA"/>
+<path d="M78.9725 9.78155C78.4823 9.78155 78.0354 9.66166 77.6321 9.42189C77.2322 9.17869 76.914 8.84644 76.6776 8.42512C76.4446 8.00038 76.3281 7.51741 76.3281 6.9762C76.3281 6.4487 76.4411 5.976 76.6672 5.55811C76.8932 5.1368 77.2044 4.80454 77.6008 4.56134C78.0007 4.31472 78.4579 4.19141 78.9725 4.19141C79.3516 4.19141 79.7045 4.26334 80.0313 4.4072C80.3617 4.54764 80.6312 4.7446 80.8398 4.99807V4.35582H82.441V9.61713H80.8398V8.9235C80.5964 9.20096 80.3165 9.41333 80 9.56062C79.6836 9.70791 79.3411 9.78155 78.9725 9.78155ZM79.4472 8.44053C79.7254 8.44053 79.9722 8.37888 80.1878 8.25556C80.4034 8.12883 80.5721 7.95585 80.6938 7.73663C80.8155 7.51741 80.8763 7.26736 80.8763 6.98648C80.8763 6.70218 80.8137 6.45213 80.6885 6.23633C80.5668 6.01711 80.3982 5.84584 80.1826 5.72253C79.9705 5.59579 79.7254 5.53242 79.4472 5.53242C79.1725 5.53242 78.9273 5.59579 78.7117 5.72253C78.4962 5.84584 78.3258 6.01711 78.2006 6.23633C78.0754 6.45555 78.0128 6.7056 78.0128 6.98648C78.0128 7.26736 78.0737 7.51741 78.1954 7.73663C78.3206 7.95585 78.4909 8.12883 78.7065 8.25556C78.9221 8.37888 79.169 8.44053 79.4472 8.44053Z" fill="white"/>
+<path d="M84.3246 9.61713V4.35582H85.9259V5.11111C86.1241 4.81653 86.3657 4.59046 86.6508 4.43289C86.9395 4.2719 87.2489 4.19141 87.5793 4.19141C87.767 4.19141 87.9618 4.21881 88.1634 4.27361C88.3651 4.32842 88.5338 4.39864 88.6694 4.48427L88.0017 5.81501C87.8835 5.73623 87.7444 5.67458 87.5845 5.63005C87.428 5.58209 87.282 5.55811 87.1463 5.55811C86.9377 5.55811 86.7395 5.61121 86.5518 5.71739C86.364 5.82358 86.2127 5.9623 86.098 6.13357C85.9832 6.30141 85.9259 6.48295 85.9259 6.6782V9.61713H84.3246Z" fill="white"/>
+<path d="M91.998 9.78155C91.5912 9.78155 91.207 9.70962 90.8453 9.56575C90.4872 9.42189 90.1708 9.22322 89.8961 8.96975C89.6214 8.71285 89.4058 8.41656 89.2493 8.08087C89.0928 7.74176 89.0146 7.37868 89.0146 6.99162C89.0146 6.61825 89.0876 6.26373 89.2336 5.92805C89.3832 5.59237 89.5918 5.29436 89.8595 5.03404C90.1308 4.77371 90.4472 4.56819 90.8088 4.41748C91.1739 4.26676 91.5686 4.19141 91.9928 4.19141C92.3371 4.19141 92.6674 4.23936 92.9838 4.33527C93.3037 4.43118 93.561 4.55449 93.7558 4.70521L93.2081 5.76877C92.9473 5.58038 92.6239 5.48618 92.238 5.48618C91.9076 5.48618 91.6277 5.55811 91.3982 5.70198C91.1687 5.84584 90.9931 6.03252 90.8714 6.26202C90.7532 6.49152 90.6941 6.733 90.6941 6.98648C90.6941 7.26393 90.7584 7.5174 90.8871 7.7469C91.0157 7.97297 91.1965 8.1528 91.4295 8.28639C91.666 8.41998 91.9389 8.48677 92.2484 8.48677C92.4396 8.48677 92.6187 8.46109 92.7856 8.40971C92.9525 8.35833 93.0933 8.28982 93.2081 8.20419L93.7558 9.26775C93.5576 9.41504 93.302 9.53664 92.989 9.63255C92.6761 9.73188 92.3457 9.78155 91.998 9.78155Z" fill="white"/>
+<path d="M97.2278 9.78155C96.7376 9.78155 96.2907 9.66166 95.8874 9.42189C95.4875 9.17869 95.1693 8.84644 94.9329 8.42512C94.6999 8.00038 94.5834 7.51741 94.5834 6.9762C94.5834 6.4487 94.6964 5.976 94.9225 5.55811C95.1485 5.1368 95.4597 4.80454 95.8561 4.56134C96.256 4.31472 96.7132 4.19141 97.2278 4.19141C97.6069 4.19141 97.9598 4.26334 98.2867 4.4072C98.617 4.54764 98.8865 4.7446 99.0951 4.99807V4.35582H100.696V9.61713H99.0951V8.9235C98.8517 9.20096 98.5718 9.41333 98.2554 9.56062C97.9389 9.70791 97.5964 9.78155 97.2278 9.78155ZM97.7025 8.44053C97.9807 8.44053 98.2275 8.37888 98.4431 8.25556C98.6587 8.12883 98.8274 7.95585 98.9491 7.73663C99.0708 7.51741 99.1316 7.26736 99.1316 6.98648C99.1316 6.70218 99.069 6.45213 98.9438 6.23633C98.8221 6.01711 98.6535 5.84584 98.4379 5.72253C98.2258 5.59579 97.9807 5.53242 97.7025 5.53242C97.4278 5.53242 97.1826 5.59579 96.9671 5.72253C96.7515 5.84584 96.5811 6.01711 96.4559 6.23633C96.3307 6.45555 96.2681 6.7056 96.2681 6.98648C96.2681 7.26736 96.329 7.51741 96.4507 7.73663C96.5759 7.95585 96.7463 8.12883 96.9618 8.25556C97.1774 8.37888 97.4243 8.44053 97.7025 8.44053Z" fill="white"/>
+<path d="M102.58 9.61713V4.35582H104.181V4.94155C104.386 4.71548 104.642 4.53394 104.948 4.39693C105.257 4.25991 105.598 4.19141 105.97 4.19141C106.38 4.19141 106.74 4.28046 107.05 4.45858C107.363 4.63327 107.608 4.87819 107.785 5.19332C107.963 5.50502 108.051 5.86982 108.051 6.28771V9.61713H106.45V6.62168C106.45 6.24489 106.349 5.95203 106.148 5.74308C105.949 5.53071 105.676 5.42453 105.329 5.42453C105.092 5.42453 104.887 5.47248 104.713 5.56839C104.543 5.66087 104.411 5.78932 104.317 5.95374C104.226 6.11473 104.181 6.29799 104.181 6.50351V9.61713H102.58Z" fill="white"/>
+<path d="M112.06 9.78155C111.57 9.78155 111.123 9.66166 110.72 9.42189C110.32 9.17869 110.002 8.84644 109.765 8.42512C109.532 8.00038 109.416 7.51741 109.416 6.9762C109.416 6.4487 109.529 5.976 109.755 5.55811C109.981 5.1368 110.292 4.80454 110.689 4.56134C111.088 4.31472 111.546 4.19141 112.06 4.19141C112.439 4.19141 112.792 4.26334 113.119 4.4072C113.449 4.54764 113.719 4.7446 113.928 4.99807V4.35582H115.529V9.61713H113.928V8.9235C113.684 9.20096 113.404 9.41333 113.088 9.56062C112.771 9.70791 112.429 9.78155 112.06 9.78155ZM112.535 8.44053C112.813 8.44053 113.06 8.37888 113.276 8.25556C113.491 8.12883 113.66 7.95585 113.781 7.73663C113.903 7.51741 113.964 7.26736 113.964 6.98648C113.964 6.70218 113.901 6.45213 113.776 6.23633C113.655 6.01711 113.486 5.84584 113.27 5.72253C113.058 5.59579 112.813 5.53242 112.535 5.53242C112.26 5.53242 112.015 5.59579 111.799 5.72253C111.584 5.84584 111.414 6.01711 111.288 6.23633C111.163 6.45555 111.101 6.7056 111.101 6.98648C111.101 7.26736 111.161 7.51741 111.283 7.73663C111.408 7.95585 111.579 8.12883 111.794 8.25556C112.01 8.37888 112.257 8.44053 112.535 8.44053Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M64.7231 10.9963C64.2733 11.5528 63.6207 11.9083 62.9085 11.9846C62.1964 12.0609 61.4831 11.8517 60.9254 11.403C60.3859 10.9325 60.0557 10.2673 60.0072 9.55376C59.9587 8.84018 60.196 8.13659 60.6668 7.59765L64.5272 3.00363C64.9769 2.44711 65.6295 2.09166 66.3416 2.01539C67.0537 1.93913 67.7669 2.1483 68.3246 2.59692C68.8641 3.06737 69.1943 3.73245 69.2429 4.44596C69.2914 5.15948 69.0542 5.86304 68.5834 6.40199L64.7231 10.9963ZM61.8907 10.2541C62.1441 10.458 62.4683 10.5531 62.792 10.5185C63.1157 10.4839 63.4123 10.3223 63.6167 10.0693L67.4766 5.47628C67.6906 5.2313 67.7984 4.91153 67.7764 4.58723C67.7543 4.26292 67.6042 3.96062 67.3591 3.74674C67.1056 3.54286 66.7814 3.4478 66.4578 3.48244C66.1342 3.51708 65.8375 3.6786 65.6331 3.9315L61.7729 8.5236C61.6668 8.64493 61.5857 8.78594 61.5342 8.93858C61.4827 9.09123 61.4618 9.25251 61.4727 9.41321C61.4837 9.57392 61.5262 9.73089 61.5979 9.87517C61.6696 10.0195 61.7691 10.1482 61.8907 10.2541Z" fill="#EDEDED"/>
+<g filter="url(#filter0_f_1521_3854)">
+<path d="M65.3994 8.29235L66.9185 6.48598L67.4547 6.94624L65.9364 8.75248L65.3994 8.29235Z" fill="#B6B6B6"/>
+</g>
+<g filter="url(#filter1_f_1521_3854)">
+<path d="M62.6842 5.82804L64.1636 4.17438L64.7352 4.43843L63.2565 6.09187L62.6842 5.82804Z" fill="#B6B6B6"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M68.5007 10.9769C68.7186 11.2578 68.991 11.4919 69.3017 11.6651C69.6123 11.8383 69.9548 11.9471 70.3086 11.985C70.6623 12.0228 71.0201 11.989 71.3604 11.8854C71.7008 11.7819 72.0167 11.6108 72.2892 11.3824C72.5618 11.154 72.7854 10.8729 72.9466 10.5562C73.1078 10.2394 73.2033 9.89338 73.2274 9.53886C73.2515 9.18434 73.2037 8.8286 73.0868 8.49297C72.97 8.15734 72.7865 7.84873 72.5473 7.58563L68.6961 3.00147C68.2474 2.44615 67.5963 2.09146 66.8859 2.01536C66.1756 1.93926 65.464 2.14798 64.9076 2.59564C64.3695 3.06508 64.04 3.72872 63.9916 4.44071C63.9431 5.15269 64.1798 5.85474 64.6494 6.39254L68.5007 10.9769ZM71.3264 10.2364C71.0735 10.4399 70.7501 10.5348 70.4272 10.5002C70.1043 10.4656 69.8083 10.3044 69.6044 10.052L65.7531 5.46881C65.5397 5.22436 65.4321 4.90528 65.4541 4.58167C65.4761 4.25806 65.6258 3.95641 65.8704 3.74299C66.1233 3.53947 66.4467 3.44456 66.7697 3.47914C67.0926 3.51371 67.3886 3.67492 67.5926 3.92735L71.4439 8.50959C71.5497 8.63064 71.6307 8.77134 71.6821 8.92365C71.7335 9.07595 71.7543 9.23688 71.7435 9.39724C71.7326 9.5576 71.6902 9.71424 71.6186 9.85822C71.5471 10.0022 71.4477 10.1307 71.3264 10.2364Z" fill="#EDEDED"/>
+<g filter="url(#filter2_f_1521_3854)">
+<path d="M68.9808 3.733L70.1664 5.36528L69.518 5.45759L68.3322 3.82576L68.9808 3.733Z" fill="#B6B6B6"/>
+</g>
+<path d="M67.6666 5.18138L68.6987 6.25897C70.1181 4.27931 68.5063 2.06351 66.8228 2.00586L66.3887 3.49437C67.4102 3.33062 68.0611 4.33457 67.6666 5.18138Z" fill="url(#paint0_linear_1521_3854)"/>
+<defs>
+<filter id="filter0_f_1521_3854" x="63.0604" y="4.14734" width="6.73315" height="6.94458" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="1.16949" result="effect1_foregroundBlur_1521_3854"/>
+</filter>
+<filter id="filter1_f_1521_3854" x="60.3451" y="1.83582" width="6.72925" height="6.59497" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="1.16949" result="effect1_foregroundBlur_1521_3854"/>
+</filter>
+<filter id="filter2_f_1521_3854" x="65.993" y="1.39441" width="6.51245" height="6.40259" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="1.16949" result="effect1_foregroundBlur_1521_3854"/>
+</filter>
+<linearGradient id="paint0_linear_1521_3854" x1="67.4516" y1="2.78341" x2="68.3598" y2="6.13986" gradientUnits="userSpaceOnUse">
+<stop stop-color="#EDEDED"/>
+<stop offset="1" stop-color="#ECECEC"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/assets/images/light/secured-by-arcana.svg b/src/assets/images/light/secured-by-arcana.svg
new file mode 100644
index 00000000..90cc21d2
--- /dev/null
+++ b/src/assets/images/light/secured-by-arcana.svg
@@ -0,0 +1,42 @@
+<svg width="116" height="13" viewBox="0 0 116 13" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.32 3.64C3.13333 3.64 2.94333 3.65667 2.75 3.69C2.56333 3.72333 2.39333 3.78333 2.24 3.87C2.08667 3.95 1.96 4.06333 1.86 4.21C1.76667 4.35 1.72 4.53 1.72 4.75C1.72 5.01667 1.79 5.23333 1.93 5.4C2.07 5.56 2.24 5.68333 2.44 5.77C2.6 5.83667 2.77 5.89333 2.95 5.94C3.13 5.98667 3.31333 6.03 3.5 6.07C3.69333 6.11 3.88 6.15 4.06 6.19C4.24667 6.23 4.42667 6.28 4.6 6.34C5.00667 6.48 5.33 6.68 5.57 6.94C5.81667 7.2 5.94 7.54333 5.94 7.97C5.94 8.37 5.87 8.7 5.73 8.96C5.59667 9.22 5.41333 9.43333 5.18 9.6C4.95333 9.76667 4.68667 9.89 4.38 9.97C4.08 10.0433 3.76 10.08 3.42 10.08C3.08 10.08 2.75333 10.0467 2.44 9.98C2.13333 9.91333 1.85333 9.80333 1.6 9.65C1.34667 9.49667 1.13 9.29667 0.95 9.05C0.77 8.80333 0.643333 8.50333 0.57 8.15H1.48C1.54667 8.37667 1.65 8.56333 1.79 8.71C1.93 8.85667 2.09 8.97333 2.27 9.06C2.45 9.14667 2.64333 9.20667 2.85 9.24C3.06333 9.27333 3.27333 9.29 3.48 9.29C3.68 9.29 3.87333 9.27 4.06 9.23C4.25333 9.18333 4.42333 9.11333 4.57 9.02C4.71667 8.92667 4.83333 8.80667 4.92 8.66C5.00667 8.51333 5.05 8.33667 5.05 8.13C5.05 7.81667 4.96667 7.58333 4.8 7.43C4.63333 7.27667 4.41 7.16 4.13 7.08C3.94333 7.02 3.74667 6.97 3.54 6.93C3.33333 6.89 3.12667 6.84667 2.92 6.8C2.71333 6.75333 2.51 6.7 2.31 6.64C2.11 6.57333 1.92667 6.49667 1.76 6.41C1.49333 6.28333 1.27 6.09 1.09 5.83C0.91 5.56333 0.82 5.23 0.82 4.83C0.82 4.45667 0.893333 4.14333 1.04 3.89C1.18667 3.63667 1.37667 3.43333 1.61 3.28C1.84333 3.12667 2.10333 3.01667 2.39 2.95C2.68333 2.88333 2.99333 2.85 3.32 2.85C3.58667 2.85667 3.82667 2.88 4.04 2.92C4.26 2.95333 4.46667 3.01667 4.66 3.11C4.96 3.24333 5.21 3.44333 5.41 3.71C5.61 3.97667 5.72 4.32 5.74 4.74H4.89C4.86333 4.53333 4.8 4.36 4.7 4.22C4.60667 4.08 4.49 3.96667 4.35 3.88C4.21 3.79333 4.05 3.73333 3.87 3.7C3.69667 3.66 3.51333 3.64 3.32 3.64ZM7.85344 7.68C7.87344 7.91333 7.9201 8.13 7.99344 8.33C8.07344 8.52333 8.1801 8.69333 8.31344 8.84C8.44677 8.98667 8.6101 9.10333 8.80344 9.19C9.00344 9.27 9.23344 9.31 9.49344 9.31C9.6201 9.31 9.7501 9.3 9.88344 9.28C10.0234 9.25333 10.1534 9.21333 10.2734 9.16C10.3934 9.1 10.5001 9.02333 10.5934 8.93C10.6868 8.83667 10.7568 8.72333 10.8034 8.59H11.6734C11.6134 8.84333 11.5101 9.06333 11.3634 9.25C11.2234 9.43667 11.0534 9.59 10.8534 9.71C10.6601 9.83 10.4434 9.92 10.2034 9.98C9.96344 10.0333 9.7201 10.06 9.47344 10.06C9.05344 10.06 8.68677 9.99333 8.37344 9.86C8.06677 9.72667 7.8101 9.54333 7.60344 9.31C7.39677 9.07 7.24344 8.78667 7.14344 8.46C7.04344 8.12667 6.99344 7.76333 6.99344 7.37C6.99344 6.97667 7.04677 6.61667 7.15344 6.29C7.26677 5.95667 7.42677 5.67 7.63344 5.43C7.8401 5.19 8.09344 5.00333 8.39344 4.87C8.69344 4.73667 9.0501 4.67 9.46344 4.67C9.88344 4.67 10.2468 4.75333 10.5534 4.92C10.8601 5.08667 11.1068 5.30667 11.2934 5.58C11.4801 5.84667 11.6101 6.13667 11.6834 6.45C11.7634 6.76333 11.7968 7.05333 11.7834 7.32C11.7834 7.38 11.7801 7.44 11.7734 7.5C11.7734 7.56 11.7701 7.62 11.7634 7.68H7.85344ZM10.9234 6.94C10.9101 6.49333 10.7701 6.13 10.5034 5.85C10.2368 5.57 9.8801 5.43 9.43344 5.43C9.18677 5.43 8.9701 5.47 8.78344 5.55C8.59677 5.63 8.4401 5.74 8.31344 5.88C8.18677 6.02 8.08677 6.18333 8.01344 6.37C7.9401 6.55 7.89344 6.74 7.87344 6.94H10.9234ZM15.2735 10.06C14.8535 10.06 14.4902 9.99333 14.1835 9.86C13.8768 9.72667 13.6235 9.54 13.4235 9.3C13.2235 9.06 13.0735 8.77667 12.9735 8.45C12.8735 8.12333 12.8235 7.76667 12.8235 7.38C12.8235 7.00667 12.8768 6.65667 12.9835 6.33C13.0902 5.99667 13.2468 5.71 13.4535 5.47C13.6602 5.22333 13.9202 5.03 14.2335 4.89C14.5468 4.74333 14.9268 4.67 15.3735 4.67C15.6402 4.67 15.8768 4.7 16.0835 4.76C16.2902 4.81333 16.4835 4.90333 16.6635 5.03C16.8502 5.15 17.0102 5.31 17.1435 5.51C17.2768 5.71 17.3735 5.95333 17.4335 6.24H16.5635C16.4635 5.94667 16.3035 5.73667 16.0835 5.61C15.8702 5.48333 15.6168 5.42333 15.3235 5.43C15.0368 5.43 14.7835 5.48667 14.5635 5.6C14.3502 5.70667 14.1768 5.85 14.0435 6.03C13.9168 6.21 13.8235 6.42 13.7635 6.66C13.7035 6.89333 13.6735 7.13333 13.6735 7.38C13.6735 7.64 13.7035 7.88667 13.7635 8.12C13.8302 8.35333 13.9268 8.56 14.0535 8.74C14.1868 8.91333 14.3568 9.05333 14.5635 9.16C14.7702 9.26 15.0168 9.31 15.3035 9.31C15.4435 9.31 15.5802 9.29667 15.7135 9.27C15.8535 9.24333 15.9802 9.2 16.0935 9.14C16.2135 9.07333 16.3168 8.98667 16.4035 8.88C16.4902 8.77333 16.5535 8.64333 16.5935 8.49H17.4735C17.4202 8.76333 17.3235 9 17.1835 9.2C17.0502 9.39333 16.8835 9.55667 16.6835 9.69C16.4835 9.81667 16.2635 9.91 16.0235 9.97C15.7835 10.03 15.5335 10.06 15.2735 10.06ZM20.7509 9.31C21.2309 9.31 21.5809 9.16667 21.8009 8.88C22.0275 8.58667 22.1409 8.18 22.1409 7.66V4.73H22.9909V7.7C22.9909 8.5 22.7975 9.09333 22.4109 9.48C22.0309 9.86667 21.4775 10.06 20.7509 10.06C20.0242 10.06 19.4709 9.86667 19.0909 9.48C18.7175 9.09333 18.5309 8.5 18.5309 7.7V4.73H19.3809V7.66C19.3809 8.18 19.4942 8.58667 19.7209 8.88C19.9475 9.16667 20.2909 9.31 20.7509 9.31ZM24.3126 10V4.73H25.1326L25.1726 5.55C25.3659 5.24333 25.6126 5.02 25.9126 4.88C26.2126 4.74 26.5526 4.67 26.9326 4.67H27.2026V5.47H26.8926C26.5792 5.47 26.3126 5.52333 26.0926 5.63C25.8726 5.73 25.6926 5.87 25.5526 6.05C25.4192 6.22333 25.3192 6.43 25.2526 6.67C25.1926 6.91 25.1626 7.16333 25.1626 7.43V10H24.3126ZM28.6054 7.68C28.6254 7.91333 28.6721 8.13 28.7454 8.33C28.8254 8.52333 28.9321 8.69333 29.0654 8.84C29.1987 8.98667 29.3621 9.10333 29.5554 9.19C29.7554 9.27 29.9854 9.31 30.2454 9.31C30.3721 9.31 30.5021 9.3 30.6354 9.28C30.7754 9.25333 30.9054 9.21333 31.0254 9.16C31.1454 9.1 31.2521 9.02333 31.3454 8.93C31.4387 8.83667 31.5087 8.72333 31.5554 8.59H32.4254C32.3654 8.84333 32.2621 9.06333 32.1154 9.25C31.9754 9.43667 31.8054 9.59 31.6054 9.71C31.4121 9.83 31.1954 9.92 30.9554 9.98C30.7154 10.0333 30.4721 10.06 30.2254 10.06C29.8054 10.06 29.4387 9.99333 29.1254 9.86C28.8187 9.72667 28.5621 9.54333 28.3554 9.31C28.1487 9.07 27.9954 8.78667 27.8954 8.46C27.7954 8.12667 27.7454 7.76333 27.7454 7.37C27.7454 6.97667 27.7987 6.61667 27.9054 6.29C28.0187 5.95667 28.1787 5.67 28.3854 5.43C28.5921 5.19 28.8454 5.00333 29.1454 4.87C29.4454 4.73667 29.8021 4.67 30.2154 4.67C30.6354 4.67 30.9987 4.75333 31.3054 4.92C31.6121 5.08667 31.8587 5.30667 32.0454 5.58C32.2321 5.84667 32.3621 6.13667 32.4354 6.45C32.5154 6.76333 32.5487 7.05333 32.5354 7.32C32.5354 7.38 32.5321 7.44 32.5254 7.5C32.5254 7.56 32.5221 7.62 32.5154 7.68H28.6054ZM31.6754 6.94C31.6621 6.49333 31.5221 6.13 31.2554 5.85C30.9887 5.57 30.6321 5.43 30.1854 5.43C29.9387 5.43 29.7221 5.47 29.5354 5.55C29.3487 5.63 29.1921 5.74 29.0654 5.88C28.9387 6.02 28.8387 6.18333 28.7654 6.37C28.6921 6.55 28.6454 6.74 28.6254 6.94H31.6754ZM38.3778 10H37.5678L37.5278 9.21C37.3478 9.51 37.0978 9.72667 36.7778 9.86C36.4645 9.99333 36.1345 10.06 35.7878 10.06C35.3878 10.0533 35.0411 9.98333 34.7478 9.85C34.4545 9.71 34.2145 9.52 34.0278 9.28C33.8411 9.04 33.7011 8.76 33.6078 8.44C33.5211 8.11333 33.4778 7.76 33.4778 7.38C33.4778 7 33.5245 6.64667 33.6178 6.32C33.7111 5.98667 33.8545 5.7 34.0478 5.46C34.2411 5.21333 34.4845 5.02 34.7778 4.88C35.0711 4.74 35.4211 4.67 35.8278 4.67C36.1345 4.67 36.4445 4.72667 36.7578 4.84C37.0711 4.95333 37.3278 5.13667 37.5278 5.39V2.93H38.3778V10ZM35.8978 5.43C35.6111 5.43 35.3678 5.48333 35.1678 5.59C34.9678 5.69 34.8045 5.82667 34.6778 6C34.5578 6.17333 34.4678 6.38 34.4078 6.62C34.3545 6.85333 34.3278 7.11 34.3278 7.39C34.3278 7.67 34.3545 7.92333 34.4078 8.15C34.4611 8.37 34.5511 8.56667 34.6778 8.74C34.8045 8.91333 34.9678 9.05333 35.1678 9.16C35.3678 9.26 35.6145 9.31 35.9078 9.31C36.2478 9.31 36.5278 9.23 36.7478 9.07C36.9678 8.91 37.1445 8.71 37.2778 8.47C37.3711 8.30333 37.4378 8.12333 37.4778 7.93C37.5178 7.73 37.5378 7.53333 37.5378 7.34C37.5378 7.1 37.5145 6.88 37.4678 6.68C37.4278 6.48 37.3511 6.29333 37.2378 6.12C37.1045 5.92667 36.9278 5.76333 36.7078 5.63C36.4878 5.49667 36.2178 5.43 35.8978 5.43ZM42.5983 2.93H45.0783C45.4183 2.93 45.7249 2.95 45.9983 2.99C46.2783 3.03 46.5283 3.12333 46.7483 3.27C46.9416 3.39667 47.1049 3.57667 47.2383 3.81C47.3716 4.04333 47.4383 4.34 47.4383 4.7C47.4383 5.06 47.3549 5.38 47.1883 5.66C47.0283 5.94 46.7783 6.14667 46.4383 6.28C46.8916 6.36 47.2316 6.55333 47.4583 6.86C47.6849 7.16 47.7983 7.55 47.7983 8.03C47.7783 8.47 47.6849 8.81333 47.5183 9.06C47.3516 9.30667 47.1383 9.5 46.8783 9.64C46.6183 9.78 46.3249 9.87667 45.9983 9.93C45.6783 9.97667 45.3549 10 45.0283 10H42.5983V2.93ZM43.4683 3.72V6.03H44.8283C45.0149 6.03 45.2083 6.01667 45.4083 5.99C45.6083 5.96333 45.7883 5.90667 45.9483 5.82C46.1349 5.72667 46.2849 5.6 46.3983 5.44C46.5183 5.27333 46.5816 5.04667 46.5883 4.76C46.5883 4.53333 46.5483 4.35333 46.4683 4.22C46.3883 4.08 46.2783 3.97333 46.1383 3.9C45.9983 3.82667 45.8383 3.78 45.6583 3.76C45.4783 3.73333 45.2883 3.72 45.0883 3.72H43.4683ZM44.9983 9.21C45.2116 9.21 45.4249 9.2 45.6383 9.18C45.8583 9.16 46.0649 9.11 46.2583 9.03C46.4583 8.94333 46.6183 8.82 46.7383 8.66C46.8583 8.49333 46.9183 8.27 46.9183 7.99C46.9183 7.75 46.8716 7.55333 46.7783 7.4C46.6916 7.24667 46.5716 7.12667 46.4183 7.04C46.2716 6.95333 46.1016 6.89333 45.9083 6.86C45.7149 6.82667 45.5183 6.81 45.3183 6.81H43.4683V9.21H44.9983ZM53.591 4.73V10C53.591 10.7667 53.391 11.35 52.991 11.75C52.591 12.1567 52.021 12.36 51.281 12.36C50.8343 12.3533 50.431 12.2933 50.071 12.18C49.7177 12.0733 49.391 11.88 49.091 11.6L49.461 10.93C49.721 11.1367 49.9977 11.3 50.291 11.42C50.591 11.54 50.9043 11.6 51.231 11.6C51.5043 11.6 51.7377 11.5567 51.931 11.47C52.1243 11.39 52.281 11.2733 52.401 11.12C52.5277 10.9733 52.6177 10.7967 52.671 10.59C52.731 10.3833 52.761 10.16 52.761 9.92V9.29C52.6743 9.42333 52.5643 9.54333 52.431 9.65C52.3043 9.75 52.1643 9.83333 52.011 9.9C51.8643 9.96 51.7043 10.0033 51.531 10.03C51.3643 10.0633 51.1943 10.08 51.021 10.08C50.621 10.0733 50.2877 10.01 50.021 9.89C49.761 9.77 49.551 9.60333 49.391 9.39C49.2377 9.17667 49.1277 8.92333 49.061 8.63C48.9943 8.33 48.961 8 48.961 7.64V4.73H49.811V7.4C49.811 7.64 49.8243 7.87667 49.851 8.11C49.8843 8.34333 49.9477 8.55 50.041 8.73C50.1343 8.91 50.271 9.05667 50.451 9.17C50.631 9.27667 50.871 9.33 51.171 9.33C51.471 9.33 51.7243 9.26667 51.931 9.14C52.1443 9.01333 52.3077 8.85333 52.421 8.66C52.5477 8.46 52.631 8.24 52.671 8C52.7177 7.76 52.741 7.51333 52.741 7.26V4.73H53.591Z" fill="#AAAAAA"/>
+<path d="M78.9725 9.78155C78.4823 9.78155 78.0354 9.66166 77.6321 9.42189C77.2322 9.17869 76.914 8.84644 76.6776 8.42512C76.4446 8.00038 76.3281 7.51741 76.3281 6.9762C76.3281 6.4487 76.4411 5.976 76.6672 5.55811C76.8932 5.1368 77.2044 4.80454 77.6008 4.56134C78.0007 4.31472 78.4579 4.19141 78.9725 4.19141C79.3516 4.19141 79.7045 4.26334 80.0313 4.4072C80.3617 4.54764 80.6312 4.7446 80.8398 4.99807V4.35582H82.441V9.61713H80.8398V8.9235C80.5964 9.20096 80.3165 9.41333 80 9.56062C79.6836 9.70791 79.3411 9.78155 78.9725 9.78155ZM79.4472 8.44053C79.7254 8.44053 79.9722 8.37888 80.1878 8.25556C80.4034 8.12883 80.5721 7.95585 80.6938 7.73663C80.8155 7.51741 80.8763 7.26736 80.8763 6.98648C80.8763 6.70218 80.8137 6.45213 80.6885 6.23633C80.5668 6.01711 80.3982 5.84584 80.1826 5.72253C79.9705 5.59579 79.7254 5.53242 79.4472 5.53242C79.1725 5.53242 78.9273 5.59579 78.7117 5.72253C78.4962 5.84584 78.3258 6.01711 78.2006 6.23633C78.0754 6.45555 78.0128 6.7056 78.0128 6.98648C78.0128 7.26736 78.0737 7.51741 78.1954 7.73663C78.3206 7.95585 78.4909 8.12883 78.7065 8.25556C78.9221 8.37888 79.169 8.44053 79.4472 8.44053Z" fill="white"/>
+<path d="M84.3246 9.61713V4.35582H85.9259V5.11111C86.1241 4.81653 86.3657 4.59046 86.6508 4.43289C86.9395 4.2719 87.2489 4.19141 87.5793 4.19141C87.767 4.19141 87.9618 4.21881 88.1634 4.27361C88.3651 4.32842 88.5338 4.39864 88.6694 4.48427L88.0017 5.81501C87.8835 5.73623 87.7444 5.67458 87.5845 5.63005C87.428 5.58209 87.282 5.55811 87.1463 5.55811C86.9377 5.55811 86.7395 5.61121 86.5518 5.71739C86.364 5.82358 86.2127 5.9623 86.098 6.13357C85.9832 6.30141 85.9259 6.48295 85.9259 6.6782V9.61713H84.3246Z" fill="white"/>
+<path d="M91.998 9.78155C91.5912 9.78155 91.207 9.70962 90.8453 9.56575C90.4872 9.42189 90.1708 9.22322 89.8961 8.96975C89.6214 8.71285 89.4058 8.41656 89.2493 8.08087C89.0928 7.74176 89.0146 7.37868 89.0146 6.99162C89.0146 6.61825 89.0876 6.26373 89.2336 5.92805C89.3832 5.59237 89.5918 5.29436 89.8595 5.03404C90.1308 4.77371 90.4472 4.56819 90.8088 4.41748C91.1739 4.26676 91.5686 4.19141 91.9928 4.19141C92.3371 4.19141 92.6674 4.23936 92.9838 4.33527C93.3037 4.43118 93.561 4.55449 93.7558 4.70521L93.2081 5.76877C92.9473 5.58038 92.6239 5.48618 92.238 5.48618C91.9076 5.48618 91.6277 5.55811 91.3982 5.70198C91.1687 5.84584 90.9931 6.03252 90.8714 6.26202C90.7532 6.49152 90.6941 6.733 90.6941 6.98648C90.6941 7.26393 90.7584 7.5174 90.8871 7.7469C91.0157 7.97297 91.1965 8.1528 91.4295 8.28639C91.666 8.41998 91.9389 8.48677 92.2484 8.48677C92.4396 8.48677 92.6187 8.46109 92.7856 8.40971C92.9525 8.35833 93.0933 8.28982 93.2081 8.20419L93.7558 9.26775C93.5576 9.41504 93.302 9.53664 92.989 9.63255C92.6761 9.73188 92.3457 9.78155 91.998 9.78155Z" fill="white"/>
+<path d="M97.2278 9.78155C96.7376 9.78155 96.2907 9.66166 95.8874 9.42189C95.4875 9.17869 95.1693 8.84644 94.9329 8.42512C94.6999 8.00038 94.5834 7.51741 94.5834 6.9762C94.5834 6.4487 94.6964 5.976 94.9225 5.55811C95.1485 5.1368 95.4597 4.80454 95.8561 4.56134C96.256 4.31472 96.7132 4.19141 97.2278 4.19141C97.6069 4.19141 97.9598 4.26334 98.2867 4.4072C98.617 4.54764 98.8865 4.7446 99.0951 4.99807V4.35582H100.696V9.61713H99.0951V8.9235C98.8517 9.20096 98.5718 9.41333 98.2554 9.56062C97.9389 9.70791 97.5964 9.78155 97.2278 9.78155ZM97.7025 8.44053C97.9807 8.44053 98.2275 8.37888 98.4431 8.25556C98.6587 8.12883 98.8274 7.95585 98.9491 7.73663C99.0708 7.51741 99.1316 7.26736 99.1316 6.98648C99.1316 6.70218 99.069 6.45213 98.9438 6.23633C98.8221 6.01711 98.6535 5.84584 98.4379 5.72253C98.2258 5.59579 97.9807 5.53242 97.7025 5.53242C97.4278 5.53242 97.1826 5.59579 96.9671 5.72253C96.7515 5.84584 96.5811 6.01711 96.4559 6.23633C96.3307 6.45555 96.2681 6.7056 96.2681 6.98648C96.2681 7.26736 96.329 7.51741 96.4507 7.73663C96.5759 7.95585 96.7463 8.12883 96.9618 8.25556C97.1774 8.37888 97.4243 8.44053 97.7025 8.44053Z" fill="white"/>
+<path d="M102.58 9.61713V4.35582H104.181V4.94155C104.386 4.71548 104.642 4.53394 104.948 4.39693C105.257 4.25991 105.598 4.19141 105.97 4.19141C106.38 4.19141 106.74 4.28046 107.05 4.45858C107.363 4.63327 107.608 4.87819 107.785 5.19332C107.963 5.50502 108.051 5.86982 108.051 6.28771V9.61713H106.45V6.62168C106.45 6.24489 106.349 5.95203 106.148 5.74308C105.949 5.53071 105.676 5.42453 105.329 5.42453C105.092 5.42453 104.887 5.47248 104.713 5.56839C104.543 5.66087 104.411 5.78932 104.317 5.95374C104.226 6.11473 104.181 6.29799 104.181 6.50351V9.61713H102.58Z" fill="white"/>
+<path d="M112.06 9.78155C111.57 9.78155 111.123 9.66166 110.72 9.42189C110.32 9.17869 110.002 8.84644 109.765 8.42512C109.532 8.00038 109.416 7.51741 109.416 6.9762C109.416 6.4487 109.529 5.976 109.755 5.55811C109.981 5.1368 110.292 4.80454 110.689 4.56134C111.088 4.31472 111.546 4.19141 112.06 4.19141C112.439 4.19141 112.792 4.26334 113.119 4.4072C113.449 4.54764 113.719 4.7446 113.928 4.99807V4.35582H115.529V9.61713H113.928V8.9235C113.684 9.20096 113.404 9.41333 113.088 9.56062C112.771 9.70791 112.429 9.78155 112.06 9.78155ZM112.535 8.44053C112.813 8.44053 113.06 8.37888 113.276 8.25556C113.491 8.12883 113.66 7.95585 113.781 7.73663C113.903 7.51741 113.964 7.26736 113.964 6.98648C113.964 6.70218 113.901 6.45213 113.776 6.23633C113.655 6.01711 113.486 5.84584 113.27 5.72253C113.058 5.59579 112.813 5.53242 112.535 5.53242C112.26 5.53242 112.015 5.59579 111.799 5.72253C111.584 5.84584 111.414 6.01711 111.288 6.23633C111.163 6.45555 111.101 6.7056 111.101 6.98648C111.101 7.26736 111.161 7.51741 111.283 7.73663C111.408 7.95585 111.579 8.12883 111.794 8.25556C112.01 8.37888 112.257 8.44053 112.535 8.44053Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M64.7231 10.9963C64.2733 11.5528 63.6207 11.9083 62.9085 11.9846C62.1964 12.0609 61.4831 11.8517 60.9254 11.403C60.3859 10.9325 60.0557 10.2673 60.0072 9.55376C59.9587 8.84018 60.196 8.13659 60.6668 7.59765L64.5272 3.00363C64.9769 2.44711 65.6295 2.09166 66.3416 2.01539C67.0537 1.93913 67.7669 2.1483 68.3246 2.59692C68.8641 3.06737 69.1943 3.73245 69.2429 4.44596C69.2914 5.15948 69.0542 5.86304 68.5834 6.40199L64.7231 10.9963ZM61.8907 10.2541C62.1441 10.458 62.4683 10.5531 62.792 10.5185C63.1157 10.4839 63.4123 10.3223 63.6167 10.0693L67.4766 5.47628C67.6906 5.2313 67.7984 4.91153 67.7764 4.58723C67.7543 4.26292 67.6042 3.96062 67.3591 3.74674C67.1056 3.54286 66.7814 3.4478 66.4578 3.48244C66.1342 3.51708 65.8375 3.6786 65.6331 3.9315L61.7729 8.5236C61.6668 8.64493 61.5857 8.78594 61.5342 8.93858C61.4827 9.09123 61.4618 9.25251 61.4727 9.41321C61.4837 9.57392 61.5262 9.73089 61.5979 9.87517C61.6696 10.0195 61.7691 10.1482 61.8907 10.2541Z" fill="#EDEDED"/>
+<g filter="url(#filter0_f_1521_3854)">
+<path d="M65.3994 8.29235L66.9185 6.48598L67.4547 6.94624L65.9364 8.75248L65.3994 8.29235Z" fill="#B6B6B6"/>
+</g>
+<g filter="url(#filter1_f_1521_3854)">
+<path d="M62.6842 5.82804L64.1636 4.17438L64.7352 4.43843L63.2565 6.09187L62.6842 5.82804Z" fill="#B6B6B6"/>
+</g>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M68.5007 10.9769C68.7186 11.2578 68.991 11.4919 69.3017 11.6651C69.6123 11.8383 69.9548 11.9471 70.3086 11.985C70.6623 12.0228 71.0201 11.989 71.3604 11.8854C71.7008 11.7819 72.0167 11.6108 72.2892 11.3824C72.5618 11.154 72.7854 10.8729 72.9466 10.5562C73.1078 10.2394 73.2033 9.89338 73.2274 9.53886C73.2515 9.18434 73.2037 8.8286 73.0868 8.49297C72.97 8.15734 72.7865 7.84873 72.5473 7.58563L68.6961 3.00147C68.2474 2.44615 67.5963 2.09146 66.8859 2.01536C66.1756 1.93926 65.464 2.14798 64.9076 2.59564C64.3695 3.06508 64.04 3.72872 63.9916 4.44071C63.9431 5.15269 64.1798 5.85474 64.6494 6.39254L68.5007 10.9769ZM71.3264 10.2364C71.0735 10.4399 70.7501 10.5348 70.4272 10.5002C70.1043 10.4656 69.8083 10.3044 69.6044 10.052L65.7531 5.46881C65.5397 5.22436 65.4321 4.90528 65.4541 4.58167C65.4761 4.25806 65.6258 3.95641 65.8704 3.74299C66.1233 3.53947 66.4467 3.44456 66.7697 3.47914C67.0926 3.51371 67.3886 3.67492 67.5926 3.92735L71.4439 8.50959C71.5497 8.63064 71.6307 8.77134 71.6821 8.92365C71.7335 9.07595 71.7543 9.23688 71.7435 9.39724C71.7326 9.5576 71.6902 9.71424 71.6186 9.85822C71.5471 10.0022 71.4477 10.1307 71.3264 10.2364Z" fill="#EDEDED"/>
+<g filter="url(#filter2_f_1521_3854)">
+<path d="M68.9808 3.733L70.1664 5.36528L69.518 5.45759L68.3322 3.82576L68.9808 3.733Z" fill="#B6B6B6"/>
+</g>
+<path d="M67.6666 5.18138L68.6987 6.25897C70.1181 4.27931 68.5063 2.06351 66.8228 2.00586L66.3887 3.49437C67.4102 3.33062 68.0611 4.33457 67.6666 5.18138Z" fill="url(#paint0_linear_1521_3854)"/>
+<defs>
+<filter id="filter0_f_1521_3854" x="63.0604" y="4.14734" width="6.73315" height="6.94458" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="1.16949" result="effect1_foregroundBlur_1521_3854"/>
+</filter>
+<filter id="filter1_f_1521_3854" x="60.3451" y="1.83582" width="6.72925" height="6.59497" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="1.16949" result="effect1_foregroundBlur_1521_3854"/>
+</filter>
+<filter id="filter2_f_1521_3854" x="65.993" y="1.39441" width="6.51245" height="6.40259" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="1.16949" result="effect1_foregroundBlur_1521_3854"/>
+</filter>
+<linearGradient id="paint0_linear_1521_3854" x1="67.4516" y1="2.78341" x2="68.3598" y2="6.13986" gradientUnits="userSpaceOnUse">
+<stop stop-color="#EDEDED"/>
+<stop offset="1" stop-color="#ECECEC"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/tailwind.config.js b/tailwind.config.js
index 0d27b87f..b6d5c7fb 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -58,6 +58,7 @@ module.exports = {
         xl: '24px',
         xxl: '32px',
         xxxl: '34px',
+        fullxs: 'calc(100vh - 14px)',
       },
       borderWidth: {
         1: '1px',

From 50ceef6005f75b8dcff83c033a45ea20ec27b4db Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 15 May 2023 18:52:51 +0530
Subject: [PATCH 030/153] Add margin to secured with arcana

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 2284acf2..b9f0ee43 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -90,7 +90,7 @@ function onClickOfHeader() {
       >
         <RouterView class="min-h-fullxs flex-grow" />
         <BaseModal v-if="modal.show" />
-        <img :src="getImage('secured-by-arcana.svg')" class="h-xs" />
+        <img :src="getImage('secured-by-arcana.svg')" class="h-xs mb-2" />
       </div>
       <WalletFooter v-if="showFooter" />
     </div>

From f5a1e26ff202f8c16a791f04878f722bcdfd171c Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 16 May 2023 10:38:10 +0530
Subject: [PATCH 031/153] Update some styles for nav

---
 src/components/AppFooter.vue    | 4 ++--
 src/components/WalletHeader.vue | 4 ++--
 src/index.css                   | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/components/AppFooter.vue b/src/components/AppFooter.vue
index bbcc11cf..3e347364 100644
--- a/src/components/AppFooter.vue
+++ b/src/components/AppFooter.vue
@@ -27,7 +27,7 @@ function getIcon(icon: string, pathName: string) {
 
 <template>
   <footer class="flex items-center px-12 py-2 dark:bg-black-400">
-    <div v-if="userStore.isLoggedIn" class="flex flex-grow justify-between">
+    <nav v-if="userStore.isLoggedIn" class="flex flex-grow justify-between">
       <router-link
         :to="{ name: 'home' }"
         title="Assets"
@@ -103,6 +103,6 @@ function getIcon(icon: string, pathName: string) {
           >Activity</span
         >
       </router-link>
-    </div>
+    </nav>
   </footer>
 </template>
diff --git a/src/components/WalletHeader.vue b/src/components/WalletHeader.vue
index 485061f3..7dc34040 100644
--- a/src/components/WalletHeader.vue
+++ b/src/components/WalletHeader.vue
@@ -29,14 +29,14 @@ function openReceiveTokens(open) {
         />
         <span class="font-bold text-lg">{{ appStore.name }}</span>
       </div>
-      <nav class="flex items-center gap-3">
+      <div class="flex items-center gap-3">
         <button class="w-xl h-xl rounded-full">
           <img :src="`/chain-logos/ethereum-icon.png`" alt="Network Icon" />
         </button>
         <button class="w-xl h-xl" @click.stop="openReceiveTokens(true)">
           <img :src="getImage('qr-code.svg')" alt="Wallet Icon" />
         </button>
-      </nav>
+      </div>
     </header>
     <Teleport v-if="showModal" to="#modal-container">
       <ReceiveTokens
diff --git a/src/index.css b/src/index.css
index aec5b578..d9c1a6f1 100644
--- a/src/index.css
+++ b/src/index.css
@@ -41,10 +41,6 @@
           transition-all duration-200 ease-in-out
           disabled:opacity-60;
   }
-
-  nav {
-    @apply dark:bg-black-400;
-  }
 }
 
 @layer components {

From 7e6971f25061907272efbd8d9f552bb20f42978f Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 16 May 2023 17:00:42 +0530
Subject: [PATCH 032/153] Update css

---
 src/App.vue   | 31 +++++++++++++++++++++----------
 src/index.css |  2 +-
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b9f0ee43..55cd61a9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -82,8 +82,16 @@ function onClickOfHeader() {
 
 <template>
   <div v-if="sdkVersion === 'v3'" class="flex flex-col h-full">
-    <div v-show="expandWallet" class="flex flex-col h-full dark:bg-black-300">
-      <WalletHeader @click="onClickOfHeader" />
+    <div
+      v-show="expandWallet"
+      class="flex flex-col h-full dark:bg-black-300 rounded-md overflow-hidden"
+    >
+      <div class="flex justify-center mt-2 mb-2">
+        <button @click="onClickOfHeader">
+          <img src="@/assets/images/collapse-arrow.svg" />
+        </button>
+      </div>
+      <WalletHeader />
       <div
         class="flex-grow wallet__container p-4"
         :class="{ 'rounded-b-xl p-0': compactMode }"
@@ -94,7 +102,7 @@ function onClickOfHeader() {
       </div>
       <WalletFooter v-if="showFooter" />
     </div>
-    <div v-show="!expandWallet" class="h-full dark:bg-black-300">
+    <div v-show="!expandWallet" class="h-full dark:bg-black-300 rounded-t-sm">
       <WalletButton />
     </div>
   </div>
@@ -111,16 +119,19 @@ function onClickOfHeader() {
 </template>
 
 <style>
-::-webkit-scrollbar {
-  width: 0.75rem;
-  height: 0.75rem;
+*::-webkit-scrollbar {
+  width: 0.15rem;
+  height: 0.15rem;
 }
 
-::-webkit-scrollbar-thumb {
-  background-color: var(--scrollbar-thumb-color);
-  background-clip: padding-box;
-  border: 0.25rem solid transparent;
+*::-webkit-scrollbar-thumb {
+  background-color: #8d8d8d00;
   border-radius: 10px;
+  transition: all 0.3s ease-in-out;
+}
+
+:hover::-webkit-scrollbar-thumb {
+  background-color: #8d8d8dff;
 }
 
 body {
diff --git a/src/index.css b/src/index.css
index d9c1a6f1..3b4e6bfe 100644
--- a/src/index.css
+++ b/src/index.css
@@ -68,7 +68,7 @@
   }
 
   .input-field {
-    @apply dark:bg-gray-300 rounded-sm;
+    @apply dark:bg-gray-300 rounded-sm p-[10px];
   }
 
   .input-active {

From f1c77884c8de3dce2d151488d8640085df721a22 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 16 May 2023 17:00:58 +0530
Subject: [PATCH 033/153] Add collapse and expand arrows

---
 src/assets/images/collapse-arrow.svg    | 3 +++
 src/assets/images/dark/back-arrow.svg   | 3 +++
 src/assets/images/dark/expand-arrow.svg | 3 +++
 src/assets/images/light/back-arrow.svg  | 3 +++
 4 files changed, 12 insertions(+)
 create mode 100644 src/assets/images/collapse-arrow.svg
 create mode 100644 src/assets/images/dark/back-arrow.svg
 create mode 100644 src/assets/images/dark/expand-arrow.svg
 create mode 100644 src/assets/images/light/back-arrow.svg

diff --git a/src/assets/images/collapse-arrow.svg b/src/assets/images/collapse-arrow.svg
new file mode 100644
index 00000000..275b1197
--- /dev/null
+++ b/src/assets/images/collapse-arrow.svg
@@ -0,0 +1,3 @@
+<svg width="50" height="10" viewBox="0 0 50 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 2.99029C0 4.15885 0.824815 5.16496 1.97068 5.39414L24.0194 9.80388C24.6667 9.93335 25.3333 9.93335 25.9806 9.80388L48.0293 5.39414C49.1752 5.16496 50 4.15885 50 2.99029C50 1.44331 48.5847 0.283056 47.0678 0.586444L25.9806 4.80388C25.3333 4.93335 24.6667 4.93335 24.0194 4.80388L2.93222 0.586444C1.41528 0.283056 0 1.44331 0 2.99029Z" fill="#363636"/>
+</svg>
diff --git a/src/assets/images/dark/back-arrow.svg b/src/assets/images/dark/back-arrow.svg
new file mode 100644
index 00000000..208f4cb7
--- /dev/null
+++ b/src/assets/images/dark/back-arrow.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 12H4M4 12L10 18M4 12L10 6" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/dark/expand-arrow.svg b/src/assets/images/dark/expand-arrow.svg
new file mode 100644
index 00000000..6023e135
--- /dev/null
+++ b/src/assets/images/dark/expand-arrow.svg
@@ -0,0 +1,3 @@
+<svg width="50" height="10" viewBox="0 0 50 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 7.00971C0 5.84115 0.824815 4.83504 1.97068 4.60586L24.0194 0.196116C24.6667 0.0666538 25.3333 0.066654 25.9806 0.196116L48.0293 4.60586C49.1752 4.83504 50 5.84115 50 7.00971C50 8.55669 48.5847 9.71694 47.0678 9.41356L25.9806 5.19612C25.3333 5.06665 24.6667 5.06665 24.0194 5.19612L2.93222 9.41356C1.41528 9.71694 0 8.55669 0 7.00971Z" fill="#363636"/>
+</svg>
diff --git a/src/assets/images/light/back-arrow.svg b/src/assets/images/light/back-arrow.svg
new file mode 100644
index 00000000..208f4cb7
--- /dev/null
+++ b/src/assets/images/light/back-arrow.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 12H4M4 12L10 18M4 12L10 6" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

From 259c2623ed133b16068403685d072340613db61f Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 16 May 2023 17:01:18 +0530
Subject: [PATCH 034/153] Update types to resolve errors

---
 src/assets/images/light/expand-arrow.svg | 3 +++
 src/models/Connection.ts                 | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/images/light/expand-arrow.svg

diff --git a/src/assets/images/light/expand-arrow.svg b/src/assets/images/light/expand-arrow.svg
new file mode 100644
index 00000000..6023e135
--- /dev/null
+++ b/src/assets/images/light/expand-arrow.svg
@@ -0,0 +1,3 @@
+<svg width="50" height="10" viewBox="0 0 50 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 7.00971C0 5.84115 0.824815 4.83504 1.97068 4.60586L24.0194 0.196116C24.6667 0.0666538 25.3333 0.066654 25.9806 0.196116L48.0293 4.60586C49.1752 4.83504 50 5.84115 50 7.00971C50 8.55669 48.5847 9.71694 47.0678 9.41356L25.9806 5.19612C25.3333 5.06665 24.6667 5.06665 24.0194 5.19612L2.93222 9.41356C1.41528 9.71694 0 8.55669 0 7.00971Z" fill="#363636"/>
+</svg>
diff --git a/src/models/Connection.ts b/src/models/Connection.ts
index f0b5399f..ba2ce5af 100644
--- a/src/models/Connection.ts
+++ b/src/models/Connection.ts
@@ -68,7 +68,7 @@ type ParentConnectionApi = {
   getAppMode(): Promise<AppMode>
   triggerSocialLogin(type: SocialLoginType): void
   triggerPasswordlessLogin(email: string): void
-  setIframeStyle(styles: CSSStyleDeclaration): void
+  setIframeStyle(styles: Partial<CSSStyleDeclaration>): void
   getWalletPosition(): Position
   getSDKVersion(): SDKVersion
 }
@@ -77,7 +77,7 @@ type InitParentConnectionApi = {
   getLoginSource(): string
   getPasswordlessParams(): { sessionId: string; setToken: string }
   error(e: string): void
-  setIframeStyle(styles: CSSStyleDeclaration): void
+  setIframeStyle(styles: Partial<CSSStyleDeclaration>): void
 }
 
 export { requirePermission, PERMISSIONS }

From 308c0182b6ddb981727c2de1341af4ecdf239ee0 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 16 May 2023 17:02:30 +0530
Subject: [PATCH 035/153] Fix tailwind errors

---
 src/index.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/index.css b/src/index.css
index 3b4e6bfe..6e9d60a7 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,5 +1,8 @@
+/* stylelint-disable-next-line scss/at-rule-no-unknown */
 @tailwind base;
+/* stylelint-disable-next-line scss/at-rule-no-unknown */
 @tailwind components;
+/* stylelint-disable-next-line scss/at-rule-no-unknown */
 @tailwind utilities;
 
 @font-face {

From e2770ebd9269e3eec146195be41527494d4eb566 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 16 May 2023 17:02:45 +0530
Subject: [PATCH 036/153] Update iframe styling

---
 src/store/app.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/store/app.ts b/src/store/app.ts
index 92c9ef05..995ed8bc 100644
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -50,15 +50,16 @@ export const useAppStore = defineStore('app', {
           ? compactMode
             ? '200px'
             : '80vh'
-          : '66px'
+          : '20px'
         : '0'
-      style.width = showWallet ? (expandWallet ? '360px' : '68px') : '0'
+      style.width = showWallet ? (expandWallet ? '360px' : '100px') : '0'
       style.right =
-        walletPosition === 'right' ? (expandWallet ? '18px' : '2px') : ''
+        walletPosition === 'right' ? (expandWallet ? '30px' : '30px') : ''
       style.left =
-        walletPosition === 'left' ? (expandWallet ? '18px' : '2px') : ''
-      style.bottom = '4px'
+        walletPosition === 'left' ? (expandWallet ? '30px' : '30px') : ''
+      style.bottom = expandWallet ? '30px' : '0'
       style.transition = 'all 300ms ease-in-out'
+      style.position = 'fixed'
       return style
     },
   },

From 3741233b7c02b288dd4332287bb4c5b426f187d7 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 16 May 2023 17:04:04 +0530
Subject: [PATCH 037/153] Make send tokens page

---
 src/{components => pages}/SendTokens.vue | 229 ++++++++++-------------
 src/routes/index.ts                      |   6 +
 src/store/app.ts                         |   6 +-
 3 files changed, 106 insertions(+), 135 deletions(-)
 rename src/{components => pages}/SendTokens.vue (65%)

diff --git a/src/components/SendTokens.vue b/src/pages/SendTokens.vue
similarity index 65%
rename from src/components/SendTokens.vue
rename to src/pages/SendTokens.vue
index be6982e0..b2daeb29 100644
--- a/src/components/SendTokens.vue
+++ b/src/pages/SendTokens.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
 import { ethers } from 'ethers'
 import { onMounted, onUnmounted, ref, Ref, watch } from 'vue'
+import { useRouter } from 'vue-router'
 import { useToast } from 'vue-toastification'
 
 import AppLoader from '@/components/AppLoader.vue'
 import GasPrice from '@/components/GasPrice.vue'
-import SendTokensPreview from '@/components/SendTokensPreview.vue'
+// import SendTokensPreview from '@/components/SendTokensPreview.vue'
 import {
   getGasPrice,
   GAS_AVAILABLE_CHAIN_IDS,
@@ -14,19 +15,19 @@ import { useActivitiesStore } from '@/store/activities'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
 import { getTokenBalance } from '@/utils/contractUtil'
+import { getImage } from '@/utils/getImage'
 import { convertGweiToEth } from '@/utils/gweiToEth'
 import { getRequestHandler } from '@/utils/requestHandlerSingleton'
 import { getStorage } from '@/utils/storageWrapper'
 import { truncateToTwoDecimals } from '@/utils/truncateToTwoDecimal'
 import { useImage } from '@/utils/useImage'
 
-const emits = defineEmits(['close'])
-
 const showPreview = ref(false)
 const rpcStore = useRpcStore()
 const userStore = useUserStore()
 const activitiesStore = useActivitiesStore()
-const getImage = useImage()
+const router = useRouter()
+const getImageOld = useImage()
 const toast = useToast()
 const isWalletAddressFocused = ref(false)
 const isAmountFocused = ref(false)
@@ -213,7 +214,6 @@ async function handleSendToken() {
     }
   } finally {
     showPreview.value = false
-    emits('close')
     hideLoader()
     clearForm()
   }
@@ -271,144 +271,111 @@ function handleTokenChange(e) {
   <div v-if="loader.show" class="h-full flex justify-center items-center">
     <AppLoader :message="loader.message" />
   </div>
-  <div v-else class="w-full">
-    <SendTokensPreview
-      v-if="showPreview"
-      :preview-data="{
-        senderWalletAddress: userStore.walletAddress,
-        recipientWalletAddress: setHexPrefix(recipientWalletAddress),
-        amount,
-        gasFee: gasFeeInEth,
-        selectedToken: selectedToken.symbol,
-        estimatedGas,
-      }"
-      @close="showPreview = false"
-      @submit="handleSendToken"
-    />
-    <div v-else class="space-y-3 overflow-auto flex flex-col justify-between">
-      <div class="flex flex-col space-y-3 sm:space-y-2">
-        <div class="flex justify-between">
-          <p class="text-xl sm:text-sm font-semibold">Send Tokens</p>
-          <button class="h-auto" @click="emits('close')">
-            <img :src="getImage('close-icon')" alt="close icon" />
-          </button>
-        </div>
-        <p class="text-xs text-zinc-400">
-          Transfer tokens to the specified address. Please specify gas while
-          transferring.
-        </p>
-      </div>
+  <div v-else class="flex flex-col gap-8">
+    <div class="relative flex justify-center items-center">
+      <button class="absolute left-0" @click.stop="router.go(-1)">
+        <img :src="getImage('back-arrow.svg')" class="w-6 h-6" />
+      </button>
+      <span class="text-lg font-bold">Send Token</span>
+    </div>
+    <form class="flex flex-col gap-8" @submit.prevent="void 0">
+      <label class="text-sm font-medium" for="recipientWalletAddress">
+        Recipient’s Wallet Address
+      </label>
+      <input
+        id="recipientWalletAddress"
+        v-model="recipientWalletAddress"
+        required
+        type="text"
+        class="input-field font-normal text-base"
+        :class="{ 'input-field-active': isWalletAddressFocused }"
+        placeholder="Enter Recipient’s Wallet Address"
+        @focus="isWalletAddressFocused = true"
+        @blur="isWalletAddressFocused = false"
+      />
       <div class="space-y-1">
-        <p class="text-xs text-zinc-400 font-semibold">Network</p>
-        <p class="text-base sm:text-sm flex gap-2">
-          <img
-            :src="getImage(rpcStore.selectedRpcConfig.favicon)"
-            class="w-6 h-6"
-          />
-          {{ rpcStore.selectedRpcConfig?.chainName }}
-        </p>
-      </div>
-      <form
-        class="space-y-4 sm:space-y-3 px-[1px]"
-        @submit.prevent="handleShowPreview"
-      >
-        <div class="space-y-1">
-          <label
-            class="text-xs text-zinc-400 font-semibold"
-            for="recipientWalletAddress"
-          >
-            Recipient’s Wallet Address
+        <div class="flex justify-between sm:flex-col sm:space-y-1">
+          <label class="text-xs text-zinc-400 font-semibold" for="amount">
+            Amount
           </label>
-          <div
-            class="flex space-x-1 px-2 py-4 sm:p-1 input rounded-lg"
-            :class="{
-              'outline-black dark:outline-white outline-1 outline':
-                isWalletAddressFocused,
-            }"
-          >
-            <input
-              id="recipientWalletAddress"
-              v-model="recipientWalletAddress"
-              required
-              type="text"
-              class="text-base sm:text-sm w-full bg-transparent rounded-lg border-none outline-none overflow-hidden text-ellipsis"
-              placeholder="6yhjtikn7..."
-              @focus="isWalletAddressFocused = true"
-              @blur="isWalletAddressFocused = false"
-            />
-          </div>
+          <p class="space-x-1 text-xs text-zinc-400">
+            <span class="font-semibold">Total Balance:</span>
+            <span :title="selectedTokenBalance">{{
+              truncateToTwoDecimals(selectedTokenBalance)
+            }}</span>
+          </p>
         </div>
-        <div class="space-y-1">
-          <div class="flex justify-between sm:flex-col sm:space-y-1">
-            <label class="text-xs text-zinc-400 font-semibold" for="amount">
-              Amount
-            </label>
-            <p class="space-x-1 text-xs text-zinc-400">
-              <span class="font-semibold">Total Balance:</span>
-              <span :title="selectedTokenBalance">{{
-                truncateToTwoDecimals(selectedTokenBalance)
-              }}</span>
-            </p>
-          </div>
+        <div
+          class="flex space-x-1 p-2 sm:p-1 input rounded-lg"
+          :class="{
+            'outline-black dark:outline-white outline-1 outline':
+              isAmountFocused,
+          }"
+        >
+          <input
+            id="amount"
+            v-model="amount"
+            autocomplete="off"
+            required
+            type="text"
+            class="text-base sm:text-sm bg-transparent w-full rounded-lg border-none outline-none"
+            placeholder="0.5"
+            @focus="isAmountFocused = true"
+            @blur="isAmountFocused = false"
+          />
           <div
-            class="flex space-x-1 p-2 sm:p-1 input rounded-lg"
+            v-if="tokenList.length"
+            class="p-2"
             :class="{
-              'outline-black dark:outline-white outline-1 outline':
-                isAmountFocused,
+              'border-l-[1px] border-l-slate-400 px-1': tokenList.length,
             }"
           >
-            <input
-              id="amount"
-              v-model="amount"
-              autocomplete="off"
-              required
-              type="text"
-              class="text-base sm:text-sm bg-transparent w-full rounded-lg border-none outline-none"
-              placeholder="0.5"
+            <select
+              :model-value="selectedToken.symbol"
+              name="tokens"
+              class="bg-transparent outline-none w-[6ch] text-ellipsis whitespace-nowrap overflow-hidden"
               @focus="isAmountFocused = true"
               @blur="isAmountFocused = false"
-            />
-            <div
-              v-if="tokenList.length"
-              class="p-2"
-              :class="{
-                'border-l-[1px] border-l-slate-400 px-1': tokenList.length,
-              }"
+              @change="handleTokenChange"
             >
-              <select
-                :model-value="selectedToken.symbol"
-                name="tokens"
-                class="bg-transparent outline-none w-[6ch] text-ellipsis whitespace-nowrap overflow-hidden"
-                @focus="isAmountFocused = true"
-                @blur="isAmountFocused = false"
-                @change="handleTokenChange"
+              <option
+                v-for="token in tokenList"
+                :key="token.address"
+                class="text-black hover:text-white"
+                :value="JSON.stringify(token)"
               >
-                <option
-                  v-for="token in tokenList"
-                  :key="token.address"
-                  class="text-black hover:text-white"
-                  :value="JSON.stringify(token)"
-                >
-                  {{ token.symbol }}
-                </option>
-              </select>
-            </div>
+                {{ token.symbol }}
+              </option>
+            </select>
           </div>
         </div>
-        <GasPrice
-          :gas-price="gasFeeInGwei"
-          :gas-prices="gasPrices"
-          :base-fee="baseFee"
-          @gas-price-input="handleSetGasPrice"
-        />
-        <div class="flex justify-center">
-          <button
-            class="text-sm sm:text-xs rounded-xl text-white dark:bg-white bg-black dark:text-black w-36 h-9 sm:w-20 sm:h-8 uppercase"
-          >
-            Proceed
-          </button>
-        </div>
-      </form>
-    </div>
+      </div>
+      <GasPrice
+        :gas-price="gasFeeInGwei"
+        :gas-prices="gasPrices"
+        :base-fee="baseFee"
+        @gas-price-input="handleSetGasPrice"
+      />
+      <div class="flex justify-center">
+        <button
+          class="text-sm sm:text-xs rounded-xl text-white dark:bg-white bg-black dark:text-black w-36 h-9 sm:w-20 sm:h-8 uppercase"
+        >
+          Proceed
+        </button>
+      </div>
+    </form>
+    <!-- <SendTokensPreview
+      v-if="showPreview"
+      :preview-data="{
+        senderWalletAddress: userStore.walletAddress,
+        recipientWalletAddress: setHexPrefix(recipientWalletAddress),
+        amount,
+        gasFee: gasFeeInEth,
+        selectedToken: selectedToken.symbol,
+        estimatedGas,
+      }"
+      @close="showPreview = false"
+      @submit="handleSendToken"
+    /> -->
   </div>
 </template>
diff --git a/src/routes/index.ts b/src/routes/index.ts
index d94764e8..a299789e 100644
--- a/src/routes/index.ts
+++ b/src/routes/index.ts
@@ -18,6 +18,7 @@ import NFTScreen from '@/pages/NFTScreen.vue'
 import ProfileScreen from '@/pages/profileScreen.vue'
 import RequestsScreen from '@/pages/RequestsScreen.vue'
 import SelectNftScreen from '@/pages/SelectNftScreen.vue'
+import SendTokens from '@/pages/SendTokens.vue'
 import SignInV2 from '@/pages/signInV2.vue'
 
 const routes: RouteRecordRaw[] = [
@@ -123,6 +124,11 @@ const routes: RouteRecordRaw[] = [
         path: '/activities',
         component: Activities,
       },
+      {
+        name: 'SendTokens',
+        path: 'tokens/send',
+        component: SendTokens,
+      },
     ],
   },
 ]
diff --git a/src/store/app.ts b/src/store/app.ts
index 995ed8bc..aee8266a 100644
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -53,10 +53,8 @@ export const useAppStore = defineStore('app', {
           : '20px'
         : '0'
       style.width = showWallet ? (expandWallet ? '360px' : '100px') : '0'
-      style.right =
-        walletPosition === 'right' ? (expandWallet ? '30px' : '30px') : ''
-      style.left =
-        walletPosition === 'left' ? (expandWallet ? '30px' : '30px') : ''
+      style.right = walletPosition === 'right' ? '30px' : ''
+      style.left = walletPosition === 'left' ? '30px' : ''
       style.bottom = expandWallet ? '30px' : '0'
       style.transition = 'all 300ms ease-in-out'
       style.position = 'fixed'

From 9065788a2ead283c81ba84e5522d4302154a32fd Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 16 May 2023 17:04:17 +0530
Subject: [PATCH 038/153] Update base modal styling

---
 src/components/BaseModal.vue | 62 ++++++++++++++++++++++++++++++------
 1 file changed, 53 insertions(+), 9 deletions(-)

diff --git a/src/components/BaseModal.vue b/src/components/BaseModal.vue
index ce959cff..eea8386f 100644
--- a/src/components/BaseModal.vue
+++ b/src/components/BaseModal.vue
@@ -1,11 +1,30 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+
+import { useModalStore } from '@/store/modal'
+
+const canModalCollapse = ref(false)
+const modalStore = useModalStore()
+
+function handleCollapse() {
+  canModalCollapse.value = true
+  setTimeout(() => modalStore.setShowModal(false), 300)
+}
+</script>
+
 <template>
-  <div
-    class="backdrop-blur-sm fixed flex justify-center items-center inset-0 z-50 p-3 overlay"
-  >
+  <div class="fixed flex justify-center items-center inset-0 z-50 p-3 overlay">
     <div
-      id="modal-container"
-      class="container p-3 sm:p-2 w-full max-w-[40rem] rounded-lg overflow-auto max-h-full"
-    ></div>
+      class="card absolute flex flex-col pt-2"
+      :class="{ collapse: canModalCollapse }"
+    >
+      <div class="flex justify-center">
+        <button @click="handleCollapse">
+          <img src="@/assets/images/collapse-arrow.svg" />
+        </button>
+      </div>
+      <div id="modal-container" class="p-4"></div>
+    </div>
   </div>
 </template>
 
@@ -14,8 +33,33 @@
   background: rgb(18 18 18 / 90%);
 }
 
-.container {
-  background: var(--card-bg);
-  box-shadow: var(--card-shadow);
+.card {
+  bottom: -100%;
+  transition: all 0.3s ease-in-out;
+  animation: slide-up 0.3s ease-in-out forwards;
+}
+
+.collapse {
+  animation: slide-down 0.3s ease-in-out forwards;
+}
+
+@keyframes slide-up {
+  0% {
+    bottom: -100%;
+  }
+
+  100% {
+    bottom: 0;
+  }
+}
+
+@keyframes slide-down {
+  0% {
+    bottom: 0;
+  }
+
+  100% {
+    bottom: -100%;
+  }
 }
 </style>

From 7561f7c19fa35fc7e0d214f42ed9c925dc28f778 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 16 May 2023 17:04:44 +0530
Subject: [PATCH 039/153] Update wallet button

---
 src/components/UserWallet.vue   | 29 +++++++++++++----------------
 src/components/WalletButton.vue | 19 ++++---------------
 src/components/WalletHeader.vue |  7 ++-----
 3 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/src/components/UserWallet.vue b/src/components/UserWallet.vue
index e078de2f..ddd96314 100644
--- a/src/components/UserWallet.vue
+++ b/src/components/UserWallet.vue
@@ -2,12 +2,10 @@
 import { storeToRefs } from 'pinia'
 import { computed, onMounted, ref, watch, type Ref } from 'vue'
 import { useRouter } from 'vue-router'
-import { useToast } from 'vue-toastification'
 
 import AddNetwork from '@/components/AddNetwork.vue'
 import BuyTokens from '@/components/BuyTokens.vue'
 import EditNetwork from '@/components/EditNetwork.vue'
-import SendTokens from '@/components/SendTokens.vue'
 import {
   getExchangeRate,
   CurrencySymbol,
@@ -16,7 +14,7 @@ import { useModalStore } from '@/store/modal'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
 import { getImage } from '@/utils/getImage'
-import { isSupportedByOnRampMoney } from '@/utils/onrampmoney.ramp'
+// import { isSupportedByOnRampMoney } from '@/utils/onrampmoney.ramp'
 import { getRampSupportedNetworks } from '@/utils/rampsdk'
 import { getRequestHandler } from '@/utils/requestHandlerSingleton'
 import { getTransakSupportedNetworks } from '@/utils/transak'
@@ -64,12 +62,13 @@ const rampNetwork = computed(() => {
 })
 
 const onRampMoney = computed(() => {
-  const selectedChainId = Number(rpcStore.selectedChainId)
-  if (isSupportedByOnRampMoney(selectedChainId)) {
-    return selectedChainId
-  } else {
-    return false
-  }
+  // const selectedChainId = Number(rpcStore.selectedChainId)
+  // if (isSupportedByOnRampMoney(selectedChainId)) {
+  //   return selectedChainId
+  // } else {
+  //   return false
+  // }
+  return false
 })
 
 function showLoader(message: string) {
@@ -95,12 +94,11 @@ function openEditNetwork(open, chainId: number | null = null) {
   showModal.value = open ? 'edit-network' : false
 }
 
-function openSendTokens(open) {
+function goToSendTokens() {
   if (props.page === 'nft') {
-    return router.push({ name: 'SelectNft' })
+    router.push({ name: 'SelectNft' })
   } else {
-    modalStore.setShowModal(open)
-    showModal.value = open ? 'send' : false
+    router.push({ name: 'SendTokens' })
   }
 }
 
@@ -210,7 +208,7 @@ watch(
       <div class="mt-6 flex gap-3">
         <button
           class="btn-secondary flex gap-1 justify-center p-2 items-center font-bold text-sm uppercase w-full"
-          @click.stop="openSendTokens(true)"
+          @click.stop="goToSendTokens()"
         >
           <img :src="getImage('send-icon.svg')" class="w-md h-md" />
           Send
@@ -226,7 +224,6 @@ watch(
       </div>
     </div>
     <Teleport v-if="showModal" to="#modal-container">
-      <SendTokens v-if="showModal === 'send'" @close="openSendTokens(false)" />
       <AddNetwork
         v-if="showModal === 'add-network'"
         @close="openAddNetwork(false)"
@@ -240,7 +237,7 @@ watch(
         v-if="showModal === 'buy'"
         :transak-network="transakNetwork?.value"
         :ramp-network="rampNetwork?.value"
-        :on-ramp-money="onRampMoney"
+        :on-ramp-money="(onRampMoney as false)"
         @close="handleBuy(false)"
       />
     </Teleport>
diff --git a/src/components/WalletButton.vue b/src/components/WalletButton.vue
index 1ee982d9..db149337 100644
--- a/src/components/WalletButton.vue
+++ b/src/components/WalletButton.vue
@@ -1,16 +1,13 @@
 <script setup lang="ts">
-import { Wallet } from 'ethers'
-import { computed, toRefs } from 'vue'
+import { computed } from 'vue'
 
 import RequestCountBadge from '@/components/RequestCountBadge.vue'
 import { useAppStore } from '@/store/app'
 import { useRequestStore } from '@/store/request'
-import { useImage } from '@/utils/useImage'
+import { getImage } from '@/utils/getImage'
 
 const appStore = useAppStore()
 const requestStore = useRequestStore()
-const getImage = useImage()
-const { walletPosition } = toRefs(appStore)
 
 function onClickOfButton() {
   appStore.expandWallet = true
@@ -31,18 +28,10 @@ const showRequestCountBadge = computed(() => {
       <RequestCountBadge :request-count="requestCount" />
     </div>
     <button
-      class="container | absolute bottom-0 w-14 h-11 flex justify-center items-center cursor-pointer"
-      :class="[
-        walletPosition === 'right' ? 'rounded-l-[10px]' : 'rounded-r-[10px]',
-        walletPosition === 'right' ? 'right-0' : 'left-0',
-      ]"
+      class="flex items-center justify-center flex-grow h-full w-full"
       @click="onClickOfButton"
     >
-      <img
-        :src="getImage('arrow-icon')"
-        alt="arrow icon"
-        :class="[walletPosition === 'right' ? 'rotate-90' : 'rotate-[270deg]']"
-      />
+      <img :src="getImage('expand-arrow.svg')" />
     </button>
   </div>
 </template>
diff --git a/src/components/WalletHeader.vue b/src/components/WalletHeader.vue
index 7dc34040..9b9c07eb 100644
--- a/src/components/WalletHeader.vue
+++ b/src/components/WalletHeader.vue
@@ -38,11 +38,8 @@ function openReceiveTokens(open) {
         </button>
       </div>
     </header>
-    <Teleport v-if="showModal" to="#modal-container">
-      <ReceiveTokens
-        v-if="showModal === 'receive'"
-        @close="openReceiveTokens(false)"
-      />
+    <Teleport v-if="modalStore.show" to="#modal-container">
+      <ReceiveTokens v-if="showModal === 'receive'" />
     </Teleport>
   </div>
 </template>

From ae0d28d1fb9852ab6497534413c87b46a8778c1d Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 16 May 2023 17:05:17 +0530
Subject: [PATCH 040/153] Update logic

---
 src/components/AssetsView.vue      |  9 +++++++--
 src/components/SendTransaction.vue |  1 -
 src/pages/backCompat/signIn.vue    |  2 +-
 src/pages/homeScreen.vue           |  2 +-
 src/pages/loggedInView.vue         | 13 ++++++-------
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/components/AssetsView.vue b/src/components/AssetsView.vue
index 66e17123..1ae13906 100644
--- a/src/components/AssetsView.vue
+++ b/src/components/AssetsView.vue
@@ -35,7 +35,9 @@ function fetchNativeAsset() {
   return {
     address: 'native',
     name: rpcStore.nativeCurrency.name,
-    balance: Number(ethers.utils.formatEther(rpcStore.walletBalance)),
+    balance: !rpcStore.walletBalance
+      ? 0
+      : Number(ethers.utils.formatEther(rpcStore.walletBalance)),
     decimals: rpcStore.nativeCurrency.decimals,
     symbol: rpcStore.nativeCurrency.symbol,
     logo:
@@ -113,7 +115,10 @@ rpcStore.$subscribe(getAssetsBalance)
   <div class="flex flex-col gap-3">
     <span class="uppercase font-lg font-bold">Assets</span>
     <div class="card flex flex-col overflow-hidden">
-      <div v-if="assets.length" class="flex flex-col gap-4 p-4">
+      <div
+        v-if="assets.length"
+        class="flex flex-col gap-4 p-4 max-h-[120px] overflow-y-auto"
+      >
         <div
           v-for="asset in assets"
           :key="`asset-${asset.symbol}`"
diff --git a/src/components/SendTransaction.vue b/src/components/SendTransaction.vue
index 8219467b..96bc2def 100644
--- a/src/components/SendTransaction.vue
+++ b/src/components/SendTransaction.vue
@@ -71,7 +71,6 @@ onMounted(async () => {
 })
 
 function handleSetGasPrice(value) {
-  console.log('handleSetGasPrice', { value })
   const requestId = props.request.request.id
   customGasPrice.value = value
   emits('gasPriceInput', {
diff --git a/src/pages/backCompat/signIn.vue b/src/pages/backCompat/signIn.vue
index c73c9c44..a6b86693 100644
--- a/src/pages/backCompat/signIn.vue
+++ b/src/pages/backCompat/signIn.vue
@@ -78,7 +78,7 @@ function storeUserInfoAndRedirect(userInfo: GetInfoOutput) {
   storage.session.setItem('isLoggedIn', JSON.stringify(true))
   user.setUserInfo(userInfo)
   user.setLoginStatus(true)
-  router.push('/')
+  router.push({ name: 'home' })
 }
 
 const channelEventHandler = (ev: MessageEvent) => {
diff --git a/src/pages/homeScreen.vue b/src/pages/homeScreen.vue
index 969e5df4..fca81f1d 100644
--- a/src/pages/homeScreen.vue
+++ b/src/pages/homeScreen.vue
@@ -90,7 +90,7 @@ watch(
       :wallet-balance="walletBalance"
       @refresh="handleRefresh"
     />
-    <div class="my-8">
+    <div class="my-6">
       <AssetsView />
     </div>
   </div>
diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index 7fa9b9e2..87957f9e 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -59,7 +59,7 @@ onMounted(async () => {
   await getAccountDetails()
   appStore.showWallet = true
   await setMFABannerState()
-  // router.push({ name: 'home' })
+  router.push({ name: 'home' })
   const requestHandler = getRequestHandler()
   if (requestHandler) {
     requestHandler.setConnection(parentConnection)
@@ -101,11 +101,6 @@ async function setMFABannerState() {
   const hasMfaDnd = mfaDnd && mfaDnd === '1'
   const hasMfaSkip =
     mfaSkipUntil && loginCount && Number(loginCount) < Number(mfaSkipUntil)
-  if (requestStore.areRequestsPendingForApproval) {
-    router.push({ name: 'requests', params: { appId: appStore.id } })
-  } else {
-    router.push({ name: 'home' })
-  }
   if (!userStore.hasMfa && !hasMfaDnd && !hasMfaSkip && !appStore.compactMode) {
     showMfaBanner.value = true
   }
@@ -120,7 +115,11 @@ async function initKeeper() {
     userStore.privateKey,
     rpcStore.selectedRpcConfig.rpcUrls[0]
   )
-  setRequestHandler(accountHandler)
+  try {
+    setRequestHandler(accountHandler)
+  } catch (e) {
+    // Do nothing
+  }
 }
 
 async function initAccountHandler() {

From 5e16a3b876bd1c6242cfc66b3f38b592d4fe14dc Mon Sep 17 00:00:00 2001
From: Karthik Durai <iamkarthiksiddarth@gmail.com>
Date: Tue, 16 May 2023 17:27:19 +0530
Subject: [PATCH 041/153] [AR-6084] changes for chain management (#312)

* implement service fn to get configured chain list

* wrap with try catch

* await setRpcConfig in request handler

* repalce with chains list fetched from API

* check for chainId

* fix spelling mistake of file

* remove unnecessary text in console.log

* implement code to validate RPC and Chain Id

* convert to Number (dec) before adding to payload

* if RPC URL is not valid, show a error toast

* use normal letters

* implement code to eliminate duplication
and store with new chain id

* prevent editing of selected chain

* implement code validate RPC URL and chain ID
---
 src/components/AddNetwork.vue               | 74 +++++++--------
 src/components/EditNetwork.vue              | 83 ++++++++++-------
 src/components/UserWallet.vue               | 12 ++-
 src/pages/backCompat/initPage.vue           |  2 +-
 src/pages/backCompat/signIn.vue             |  2 +-
 src/pages/initPageV2.vue                    |  2 +-
 src/pages/loggedInView.vue                  | 99 +++++++++++----------
 src/pages/signInV2.vue                      |  2 +-
 src/services/chainlist.service.ts           | 12 +++
 src/store/activities.ts                     | 23 +++--
 src/store/rpc.ts                            | 29 +++---
 src/utils/{emailSheme.js => emailScheme.ts} |  0
 src/utils/requestHandler.ts                 | 14 +--
 src/utils/requestManagement.ts              | 47 +++++++---
 14 files changed, 240 insertions(+), 161 deletions(-)
 create mode 100644 src/services/chainlist.service.ts
 rename src/utils/{emailSheme.js => emailScheme.ts} (100%)

diff --git a/src/components/AddNetwork.vue b/src/components/AddNetwork.vue
index ccf6a0b9..4d522e38 100644
--- a/src/components/AddNetwork.vue
+++ b/src/components/AddNetwork.vue
@@ -37,44 +37,48 @@ function isExistingChain(chainId) {
 }
 
 async function handleSubmit() {
-  const rpcUrl = rpcConfig.value.rpcUrl
-  const chainId = rpcConfig.value.chainId
-  const existingChain = isExistingChain(chainId)
-  if (isExistingRpcUrl(rpcUrl)) {
-    return toast.error(
-      `RPC URL - ${rpcUrl} already exists, please use different one`
-    )
-  } else {
-    const provider = new ethers.providers.StaticJsonRpcProvider(
-      rpcConfig.value.rpcUrl
-    )
-    const chainId = await provider.getNetwork()
-    if (Number(chainId.chainId) !== Number(rpcConfig.value.chainId)) {
-      return toast(`Incorrect combination of chainId and rpcUrl`)
-    }
-    if (existingChain) {
-      rpcStore.setRpcConfig({
-        ...existingChain,
-        rpcUrls: [rpcConfig.value.rpcUrl],
-      })
-      rpcStore.setSelectedChainId(existingChain.chainId)
+  try {
+    const rpcUrl = rpcConfig.value.rpcUrl
+    const chainId = rpcConfig.value.chainId
+    const existingChain = isExistingChain(chainId)
+    if (isExistingRpcUrl(rpcUrl)) {
+      return toast.error(
+        `RPC URL - ${rpcUrl} already exists, please use different one`
+      )
     } else {
-      const payload = {
-        chainName: rpcConfig.value.networkName,
-        chainId: rpcConfig.value.chainId,
-        blockExplorerUrls: [rpcConfig.value.explorerUrl],
-        rpcUrls: [rpcConfig.value.rpcUrl],
-        favicon: 'blockchain-icon',
-        nativeCurrency: {
-          symbol: rpcConfig.value.currencySymbol,
-          decimals: 18,
-        },
-        isCustom: true,
+      const provider = new ethers.providers.StaticJsonRpcProvider(
+        rpcConfig.value.rpcUrl
+      )
+      const chainId = await provider.getNetwork()
+      if (Number(chainId.chainId) !== Number(rpcConfig.value.chainId)) {
+        return toast(`Incorrect combination of chain Id and RPC URL`)
+      }
+      if (existingChain) {
+        rpcStore.setRpcConfig({
+          ...existingChain,
+          rpcUrls: [rpcConfig.value.rpcUrl],
+        })
+        rpcStore.setSelectedChainId(existingChain.chainId)
+      } else {
+        const payload = {
+          chainName: rpcConfig.value.networkName,
+          chainId: rpcConfig.value.chainId,
+          blockExplorerUrls: [rpcConfig.value.explorerUrl],
+          rpcUrls: [rpcConfig.value.rpcUrl],
+          favicon: 'blockchain-icon',
+          nativeCurrency: {
+            symbol: rpcConfig.value.currencySymbol,
+            decimals: 18,
+          },
+          isCustom: true,
+        }
+        rpcStore.addNetwork(payload)
+        rpcStore.setSelectedChainId(payload.chainId)
       }
-      rpcStore.addNetwork(payload)
-      rpcStore.setSelectedChainId(payload.chainId)
+      emit('close')
     }
-    emit('close')
+  } catch (e) {
+    toast.error('Invalid RPC URL')
   }
 }
 </script>
diff --git a/src/components/EditNetwork.vue b/src/components/EditNetwork.vue
index e3975e6a..48632f43 100644
--- a/src/components/EditNetwork.vue
+++ b/src/components/EditNetwork.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { ethers } from 'ethers'
 import { ref } from 'vue'
 import { useToast } from 'vue-toastification'
 
@@ -44,39 +45,57 @@ function isExistingChainId(chainId: number) {
   )
 }
 
-function handleSubmit() {
-  const rpcUrl = rpcConfig.value.rpcUrl
-  const chainId = rpcConfig.value.chainId
-  if (isExistingRpcUrl(rpcUrl as string)) {
-    toast.error(`RPC URL - ${rpcUrl} already exists, please use different one`)
-  } else if (isExistingChainId(Number(rpcConfig.value.chainId))) {
-    toast.error(
-      `Chain ID - ${chainId} already exists, please use different one`
-    )
-  } else {
-    const payload = {
-      chainName: rpcConfig.value.chainName,
-      chainId: rpcConfig.value.chainId as string,
-      blockExplorerUrls: [rpcConfig.value.explorerUrl as string],
-      rpcUrls: [rpcConfig.value.rpcUrl as string],
-      favicon: rpcConfigForEdit?.favicon as string,
-      isCustom: true,
-      nativeCurrency: {
-        symbol: rpcConfig.value.currencySymbol as string,
-        decimals: 18,
-      },
-    }
-    rpcStore.editNetwork(Number(props.chainId), payload)
-    if (Number(props.chainId) === Number(rpcStore.selectedRPCConfig.chainId)) {
-      rpcStore.setSelectedRPCConfig(payload)
-    }
-    if (Number(props.chainId) === Number(rpcStore.selectedRPCConfig.chainId)) {
-      getRequestHandler().setRpcConfig({
-        ...payload,
-        chainId: Number(payload.chainId),
-      })
+async function validateRPCandChainID(rpcUrl, chainId) {
+  const provider = new ethers.providers.StaticJsonRpcProvider(rpcUrl)
+  const { chainId: fetchedChainId } = await provider.getNetwork()
+  return Number(fetchedChainId) === Number(chainId)
+}
+
+async function handleSubmit() {
+  try {
+    const rpcUrl = rpcConfig.value.rpcUrl
+    const chainId = rpcConfig.value.chainId
+    if (isExistingRpcUrl(rpcUrl as string)) {
+      toast.error(
+        `RPC URL - ${rpcUrl} already exists, please use different one`
+      )
+    } else if (isExistingChainId(Number(rpcConfig.value.chainId))) {
+      toast.error(
+        `Chain ID - ${chainId} already exists, please use different one`
+      )
+    } else if (!(await validateRPCandChainID(rpcUrl, chainId))) {
+      toast(`Incorrect combination of chain Id and RPC URL`)
+    } else {
+      const payload = {
+        chainName: rpcConfig.value.chainName,
+        chainId: rpcConfig.value.chainId as string,
+        blockExplorerUrls: [rpcConfig.value.explorerUrl as string],
+        rpcUrls: [rpcConfig.value.rpcUrl as string],
+        favicon: rpcConfigForEdit?.favicon as string,
+        isCustom: true,
+        nativeCurrency: {
+          symbol: rpcConfig.value.currencySymbol as string,
+          decimals: 18,
+        },
+      }
+      rpcStore.editNetwork(Number(props.chainId), payload)
+      if (
+        Number(props.chainId) === Number(rpcStore.selectedRPCConfig.chainId)
+      ) {
+        rpcStore.setSelectedRPCConfig(payload)
+      }
+      if (
+        Number(props.chainId) === Number(rpcStore.selectedRPCConfig.chainId)
+      ) {
+        await getRequestHandler().setRpcConfig({
+          ...payload,
+          chainId: Number(payload.chainId),
+        })
+      }
+      emit('close')
     }
-    emit('close')
+  } catch (e) {
+    toast.error('Invalid RPC URL')
   }
 }
 
diff --git a/src/components/UserWallet.vue b/src/components/UserWallet.vue
index 6079da70..62de84e7 100644
--- a/src/components/UserWallet.vue
+++ b/src/components/UserWallet.vue
@@ -119,9 +119,15 @@ function openAddNetwork(open) {
 }
 
 function openEditNetwork(open, chainId: number | null = null) {
-  chainSelectedForEdit.value = chainId
-  modalStore.setShowModal(open)
-  showModal.value = open ? 'edit-network' : false
+  if (Number(rpcStore.selectedRpcConfig.chainId) === Number(chainId)) {
+    toast.error(
+      'This network is current selected, please chose a different one and try again'
+    )
+  } else {
+    chainSelectedForEdit.value = chainId
+    modalStore.setShowModal(open)
+    showModal.value = open ? 'edit-network' : false
+  }
 }
 
 function openSendTokens(open) {
diff --git a/src/pages/backCompat/initPage.vue b/src/pages/backCompat/initPage.vue
index 20214df5..2dffe077 100644
--- a/src/pages/backCompat/initPage.vue
+++ b/src/pages/backCompat/initPage.vue
@@ -9,7 +9,7 @@ import type { InitParentConnectionApi } from '@/models/Connection'
 import { useAppStore } from '@/store/app'
 import { useUserStore } from '@/store/user'
 import { createInitParentConnection } from '@/utils/createParentConnection'
-import emailScheme from '@/utils/emailSheme'
+import emailScheme from '@/utils/emailScheme'
 import { getAuthProvider } from '@/utils/getAuthProvider'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
diff --git a/src/pages/backCompat/signIn.vue b/src/pages/backCompat/signIn.vue
index c73c9c44..6e65ac98 100644
--- a/src/pages/backCompat/signIn.vue
+++ b/src/pages/backCompat/signIn.vue
@@ -14,7 +14,7 @@ import type { ParentConnectionApi } from '@/models/Connection'
 import { useAppStore } from '@/store/app'
 import { useUserStore } from '@/store/user'
 import { createParentConnection } from '@/utils/createParentConnection'
-import emailScheme from '@/utils/emailSheme'
+import emailScheme from '@/utils/emailScheme'
 import { getAuthProvider } from '@/utils/getAuthProvider'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
diff --git a/src/pages/initPageV2.vue b/src/pages/initPageV2.vue
index a744f8f8..2a91b37b 100644
--- a/src/pages/initPageV2.vue
+++ b/src/pages/initPageV2.vue
@@ -9,7 +9,7 @@ import type { InitParentConnectionApi } from '@/models/Connection'
 import { useAppStore } from '@/store/app'
 import { useUserStore } from '@/store/user'
 import { createInitParentConnection } from '@/utils/createParentConnection'
-import emailScheme from '@/utils/emailSheme'
+import emailScheme from '@/utils/emailScheme'
 import { getAuthProvider } from '@/utils/getAuthProvider'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index 7fa9b9e2..bb729403 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -8,7 +8,7 @@ import { useRouter, onBeforeRouteLeave } from 'vue-router'
 
 import AppLoader from '@/components/AppLoader.vue'
 import type { ParentConnectionApi } from '@/models/Connection'
-import { CHAIN_LIST } from '@/models/RpcConfigList'
+import { getEnabledChainList } from '@/services/chainlist.service'
 import { useAppStore } from '@/store/app'
 import { useParentConnectionStore } from '@/store/parentConnection'
 import { useRequestStore } from '@/store/request'
@@ -44,6 +44,7 @@ const loader = ref({
 })
 let parentConnection: Connection<ParentConnectionApi>
 const storage = getStorage()
+const enabledChainList = ref([])
 
 onBeforeMount(() => {
   userStore.hasMfa =
@@ -51,31 +52,35 @@ onBeforeMount(() => {
 })
 
 onMounted(async () => {
-  setRpcConfigs()
-  initKeeper()
-  connectToParent()
-  await setTheme()
-  await getRpcConfig()
-  await getAccountDetails()
-  appStore.showWallet = true
-  await setMFABannerState()
-  // router.push({ name: 'home' })
-  const requestHandler = getRequestHandler()
-  if (requestHandler) {
-    requestHandler.setConnection(parentConnection)
-    const { chainId, ...rpcConfig } = rpcStore.selectedRpcConfig
-    const selectedChainId = Number(chainId)
-    await requestHandler.setRpcConfig({
-      chainId: selectedChainId,
-      ...rpcConfig,
-    })
-    const parentConnectionInstance = await parentConnection.promise
-    parentConnectionInstance.onEvent('connect', {
-      chainId: selectedChainId,
-    })
-    watchRequestQueue(requestHandler)
+  try {
+    await setRpcConfigs()
+    await getRpcConfig()
+    initKeeper()
+    connectToParent()
+    await setTheme()
+    await getAccountDetails()
+    appStore.showWallet = true
+    await setMFABannerState()
+    const requestHandler = getRequestHandler()
+    if (requestHandler) {
+      requestHandler.setConnection(parentConnection)
+      const { chainId, ...rpcConfig } = rpcStore.selectedRpcConfig
+      const selectedChainId = Number(chainId)
+      await requestHandler.setRpcConfig({
+        chainId: selectedChainId,
+        ...rpcConfig,
+      })
+      const parentConnectionInstance = await parentConnection.promise
+      parentConnectionInstance.onEvent('connect', {
+        chainId: selectedChainId,
+      })
+      watchRequestQueue(requestHandler)
+    }
+  } catch (e) {
+    console.log(e)
+  } finally {
+    loader.value.show = false
   }
-  loader.value.show = false
 })
 
 async function setMFABannerState() {
@@ -214,34 +219,30 @@ async function handleLogout() {
   }
 }
 
-function setRpcConfigs() {
-  if (!rpcStore.rpcConfigs) rpcStore.setRpcConfigs(CHAIN_LIST)
+async function setRpcConfigs() {
+  const { chains } = await getEnabledChainList(appStore.id)
+  enabledChainList.value = chains.map((chain) => ({
+    chainId: chain.chain_id,
+    rpcUrls: [chain.rpc_url],
+    chainName: chain.name,
+    chainType: chain.chain_type,
+    blockExplorerUrls: [chain.exp_url],
+    isCustom: false,
+    nativeCurrency: {
+      symbol: chain.currency,
+      decimals: 18,
+    },
+    defaultChain: chain.default_chain,
+  }))
+  if (!rpcStore.rpcConfigs) rpcStore.setRpcConfigs(enabledChainList.value)
 }
 
 async function getRpcConfig() {
   try {
-    if (parentConnection) {
-      const parentConnectionInstance = await parentConnection.promise
-      let rpcConfig = await parentConnectionInstance.getRpcConfig()
-      if ([40404, 40405].includes(Number(rpcConfig.chainId))) {
-        rpcConfig = CHAIN_LIST[0]
-      }
-      if (rpcConfig) {
-        const selectedChain = CHAIN_LIST.find(
-          (chain) => Number(chain.chainId) === Number(rpcConfig.chainId)
-        )
-        rpcStore.setSelectedRPCConfig({
-          ...rpcConfig,
-          favicon: selectedChain ? selectedChain.favicon : 'blockchain-icon',
-          isCustom: false,
-        })
-        rpcStore.setRpcConfig({
-          ...rpcConfig,
-          favicon: selectedChain ? selectedChain.favicon : 'blockchain-icon',
-          isCustom: false,
-        })
-      }
-    }
+    let rpcConfig = enabledChainList.value.find((chain) => chain.defaultChain)
+    rpcStore.setSelectedRPCConfig(rpcConfig)
+    rpcStore.setRpcConfig(rpcConfig)
+    await getRequestHandler().setRpcConfig(rpcConfig)
   } catch (err) {
     console.log({ err })
   }
diff --git a/src/pages/signInV2.vue b/src/pages/signInV2.vue
index d773e544..83e83dc1 100644
--- a/src/pages/signInV2.vue
+++ b/src/pages/signInV2.vue
@@ -13,7 +13,7 @@ import { useAppStore } from '@/store/app'
 import { useUserStore } from '@/store/user'
 import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
 import { createParentConnection } from '@/utils/createParentConnection'
-import emailScheme from '@/utils/emailSheme'
+import emailScheme from '@/utils/emailScheme'
 import { getAuthProvider } from '@/utils/getAuthProvider'
 import { PasswordlessLoginHandler } from '@/utils/PasswordlessLoginHandler'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
diff --git a/src/services/chainlist.service.ts b/src/services/chainlist.service.ts
new file mode 100644
index 00000000..2f0eecbe
--- /dev/null
+++ b/src/services/chainlist.service.ts
@@ -0,0 +1,12 @@
+import axios from 'axios'
+
+const gatewayUrl = process.env.VUE_APP_WALLET_GATEWAY
+
+const chainListAPI = '/api/v1/chains'
+
+async function getEnabledChainList(appId) {
+  const url = new URL(`${chainListAPI}/${appId}/`, gatewayUrl)
+  return (await axios.get(url.toString())).data
+}
+
+export { getEnabledChainList }
diff --git a/src/store/activities.ts b/src/store/activities.ts
index c382730b..b93d6f34 100644
--- a/src/store/activities.ts
+++ b/src/store/activities.ts
@@ -96,7 +96,7 @@ type CustomTokenActivity = {
 
 type TransactionFetchParams = {
   txHash: string
-  chainId: ChainId
+  chainId: ChainId | undefined
   customToken?: CustomTokenActivity
   recipientAddress?: string
 }
@@ -160,11 +160,13 @@ export const useActivitiesStore = defineStore('activitiesStore', {
     },
   },
   actions: {
-    saveActivity(chainId: ChainId, activity: Activity) {
-      if (this.activitiesByChainId[chainId]) {
-        this.activitiesByChainId[chainId].unshift(activity)
-      } else {
-        this.activitiesByChainId[chainId] = [activity]
+    saveActivity(chainId: ChainId | undefined, activity: Activity) {
+      if (chainId) {
+        if (this.activitiesByChainId[chainId]) {
+          this.activitiesByChainId[chainId].unshift(activity)
+        } else {
+          this.activitiesByChainId[chainId] = [activity]
+        }
       }
     },
     updateActivityStatusByTxHash(
@@ -213,7 +215,7 @@ export const useActivitiesStore = defineStore('activitiesStore', {
         const txInterval = setInterval(async () => {
           const remoteTransaction =
             await accountHandler.provider.getTransaction(txHash)
-          if (remoteTransaction.blockNumber) {
+          if (remoteTransaction.blockNumber && chainId) {
             this.updateActivityStatusByTxHash(chainId, txHash, 'Success')
             clearInterval(txInterval)
           }
@@ -270,7 +272,7 @@ export const useActivitiesStore = defineStore('activitiesStore', {
       }
     },
     async saveFileActivity(
-      chainId: ChainId,
+      chainId: ChainId | undefined,
       fileTransaction: ContractFileActivityMessage,
       forwarderAddress: string
     ) {
@@ -297,7 +299,10 @@ export const useActivitiesStore = defineStore('activitiesStore', {
         file,
       }
       this.saveActivity(chainId, activity)
-      const currentActivity = this.activitiesByChainId[chainId][0]
+      let currentActivity
+      if (chainId) {
+        currentActivity = this.activitiesByChainId[chainId][0]
+      }
 
       const filter: EventFilter = {
         address: forwarderAddress,
diff --git a/src/store/rpc.ts b/src/store/rpc.ts
index b396609f..99653537 100644
--- a/src/store/rpc.ts
+++ b/src/store/rpc.ts
@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
 
-import { RpcConfigWallet, CHAIN_LIST } from '@/models/RpcConfigList'
+import { RpcConfigWallet } from '@/models/RpcConfigList'
 import { getRequestHandler } from '@/utils/requestHandlerSingleton'
 
 const BALANCE_POLLING_INTERVAL = 10 * 1000
@@ -11,11 +11,11 @@ type RpcConfigs = {
 }
 
 type RpcConfigState = {
-  selectedRPCConfig: RpcConfigWallet
-  selectedChainId: string | number
+  selectedRPCConfig: RpcConfigWallet | null
+  selectedChainId: string | number | null
 
   walletBalance: string
-  walletBalanceChainId: string
+  walletBalanceChainId: string | undefined
   walletBalancePollingIntervalID: NodeJS.Timer | null
   walletBalancePollingCleanupID: NodeJS.Timer | null
 
@@ -26,8 +26,8 @@ type RpcConfigState = {
 export const useRpcStore = defineStore('rpcStore', {
   state: () =>
     ({
-      selectedRPCConfig: CHAIN_LIST[0],
-      selectedChainId: CHAIN_LIST[0].chainId,
+      selectedRPCConfig: null,
+      selectedChainId: null,
 
       walletBalance: '',
       walletBalanceChainId: '',
@@ -51,7 +51,8 @@ export const useRpcStore = defineStore('rpcStore', {
       return chainName.includes('arcana')
     },
     nativeCurrency() {
-      const rpcConfig: RpcConfigWallet = this.selectedRpcConfig
+      if (!this.selectedRPCConfig) return null
+      const rpcConfig: RpcConfigWallet | null = this.selectedRpcConfig
       if (this.isArcanaNetwork) {
         return {
           name: 'Arcana',
@@ -71,7 +72,7 @@ export const useRpcStore = defineStore('rpcStore', {
         decimals: 0,
       }
     },
-    selectedRpcConfig(state: RpcConfigState): RpcConfigWallet {
+    selectedRpcConfig(state: RpcConfigState): RpcConfigWallet | null {
       return state.selectedRPCConfig
     },
     rpcConfigList(state: RpcConfigState): Array<RpcConfigWallet> {
@@ -83,8 +84,8 @@ export const useRpcStore = defineStore('rpcStore', {
       return null
     },
     isEthereumMainnet() {
-      const selectedRpcConfig: RpcConfigWallet = this.selectedRpcConfig
-      return selectedRpcConfig.chainId === `1`
+      const selectedRpcConfig: RpcConfigWallet | null = this.selectedRpcConfig
+      return selectedRpcConfig?.chainId === `1`
     },
   },
   actions: {
@@ -97,14 +98,18 @@ export const useRpcStore = defineStore('rpcStore', {
       else this.rpcConfigs = { [rpcConfig.chainId]: rpcConfig }
     },
     editNetwork(chainId: number, rpcConfig: RpcConfigWallet): void {
-      if (this.rpcConfigs) this.rpcConfigs[chainId] = rpcConfig
+      if (this.rpcConfigs) {
+        if (Number(rpcConfig.chainId) !== Number(chainId))
+          delete this.rpcConfigs[rpcConfig.chainId]
+        else this.rpcConfigs[rpcConfig.chainId] = rpcConfig
+      }
     },
     deleteNetwork(chainId: number): void {
       if (this.rpcConfigs) delete this.rpcConfigs[chainId]
     },
     setWalletBalance(balance): void {
       this.walletBalance = balance
-      this.walletBalanceChainId = this.selectedRPCConfig.chainId
+      this.walletBalanceChainId = this.selectedRPCConfig?.chainId
     },
     setSelectedChainId(chainId: string): void {
       this.selectedRPCConfig = this.rpcConfigs
diff --git a/src/utils/emailSheme.js b/src/utils/emailScheme.ts
similarity index 100%
rename from src/utils/emailSheme.js
rename to src/utils/emailScheme.ts
diff --git a/src/utils/requestHandler.ts b/src/utils/requestHandler.ts
index 17491ddc..2aa6de80 100644
--- a/src/utils/requestHandler.ts
+++ b/src/utils/requestHandler.ts
@@ -37,11 +37,15 @@ class RequestHandler {
   constructor(private accountHandler: AccountHandler) {}
 
   public async setRpcConfig(c: RpcConfig) {
-    this.handler = this.initRpcEngine(c)
-    this.accountHandler.setProvider(c.rpcUrls[0])
-    // Emit `chainChanged` event
-    const chainId = await this.accountHandler.getChainId()
-    this.emitEvent('chainChanged', { chainId })
+    try {
+      this.handler = this.initRpcEngine(c)
+      this.accountHandler.setProvider(c.rpcUrls[0])
+      // Emit `chainChanged` event
+      const chainId = await this.accountHandler.getChainId()
+      this.emitEvent('chainChanged', { chainId })
+    } catch (e) {
+      console.log({ e })
+    }
   }
 
   public async emitEvent(e: string, params?: ProviderEvent) {
diff --git a/src/utils/requestManagement.ts b/src/utils/requestManagement.ts
index 3c3a34e6..24b05857 100644
--- a/src/utils/requestManagement.ts
+++ b/src/utils/requestManagement.ts
@@ -1,6 +1,7 @@
 // Todo: Find a better place for these functions
 import { AppMode } from '@arcana/auth'
 import { ethErrors, serializeError } from 'eth-rpc-errors'
+import { ethers } from 'ethers'
 import { watch } from 'vue'
 import { useToast } from 'vue-toastification'
 
@@ -77,16 +78,15 @@ function getEtherInvalidParamsError(msg) {
 async function switchChain(request, keeper) {
   const { chainId: id } = request.params[0]
   rpcStore.setSelectedChainId(`${parseInt(id)}`)
-  const { chainId, ...rpcConfig } = rpcStore.selectedRpcConfig
 
-  const selectedChainId = Number(chainId)
+  const selectedChainId = Number(rpcStore.selectedRpcConfig?.chainId)
   await keeper.setRpcConfig({
-    ...rpcConfig,
+    ...rpcStore.selectedRpcConfig,
     chainId: selectedChainId,
   })
 
   keeper.reply(request.method, {
-    result: `Chain changed to ${rpcStore.selectedRpcConfig.chainName}`,
+    result: `Chain changed to ${rpcStore.selectedRpcConfig?.chainName}`,
     id: request.id,
   })
   router.push({ name: 'home' })
@@ -130,11 +130,31 @@ function validateSwitchChainParams({ chainId }) {
   return result
 }
 
-async function validateAddNetworkParams(networkInfo) {
+async function validateRPCandChainID(rpcURL, chainId) {
   const result: { isValid: boolean; error: unknown } = {
     isValid: false,
     error: null,
   }
+  try {
+    const provider = new ethers.providers.StaticJsonRpcProvider(rpcURL)
+    const { chainId: fetchedChainId } = await provider.getNetwork()
+    const isValidChainId = Number(fetchedChainId) === Number(chainId)
+    result.isValid = isValidChainId
+    result.error = isValidChainId
+      ? ''
+      : 'Incorrect combination of chain Id and RPC URL'
+  } catch (e) {
+    result.isValid = false
+    result.error = 'Invalid RPC URL'
+  }
+  return result
+}
+
+async function validateAddNetworkParams(networkInfo) {
+  let result: { isValid: boolean; error: unknown } = {
+    isValid: false,
+    error: null,
+  }
 
   if (
     !networkInfo.chainName?.length ||
@@ -153,8 +173,10 @@ async function validateAddNetworkParams(networkInfo) {
       `RPC URL - ${networkInfo.rpcUrls[0]} already exists, please use different one`
     )
   } else {
-    result.error = ''
-    result.isValid = true
+    result = await validateRPCandChainID(
+      networkInfo.rpcUrls[0],
+      networkInfo.chainId
+    )
   }
   return result
 }
@@ -162,7 +184,7 @@ async function validateAddNetworkParams(networkInfo) {
 async function validateAddTokensParams(params) {
   return await validatePopulateContractForToken({
     walletAddress: userStore.walletAddress,
-    chainId: rpcStore.selectedRpcConfig.chainId,
+    chainId: rpcStore.selectedRpcConfig?.chainId,
     tokenContract: params,
     isEthereumMainnet: rpcStore.isEthereumMainnet,
   })
@@ -171,7 +193,7 @@ async function validateAddTokensParams(params) {
 async function validateAddNftParams(tokenType, params) {
   return await validatePopulateContractForNft({
     walletAddress: userStore.walletAddress,
-    chainId: rpcStore.selectedRpcConfig.chainId,
+    chainId: rpcStore.selectedRpcConfig?.chainId,
     nftContract: { type: tokenType, ...params },
     isEthereumMainnet: rpcStore.isEthereumMainnet,
   })
@@ -182,7 +204,7 @@ async function addNetwork(request, keeper) {
   const networkInfo = params[0]
   const name: string = networkInfo.chainName || ''
   const rpcUrls: string[] = networkInfo.rpcUrls || []
-  const chainId = networkInfo.chainId
+  const chainId = `${Number(networkInfo.chainId)}`
   const symbol: string = networkInfo.nativeCurrency.symbol || ''
   const existingChain = isExistingChain(chainId)
   if (existingChain) {
@@ -366,10 +388,11 @@ async function handleRequest(request, requestStore, appStore, keeper) {
     ) {
       error = getEtherInvalidParamsError('required params missing')
     } else if (
+      rpcStore.selectedRPCConfig?.chainId &&
       parseInt(params.domain.chainId) !==
-      parseInt(rpcStore.selectedRPCConfig.chainId)
+        parseInt(rpcStore.selectedRPCConfig.chainId)
     ) {
-      error = `domain chain ID ${params.domain.chainId} does not match network chain id ${rpcStore.selectedRPCConfig.chainId}`
+      error = `domain chain ID ${params.domain.chainId} does not match network chain id ${rpcStore.selectedRPCConfig?.chainId}`
     }
     if (error) {
       await keeper.reply(request.method, {

From e401fbb8d3ddad0b75deeb930c3cfaba2a2f12d6 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 16 May 2023 18:16:31 +0530
Subject: [PATCH 042/153] Remove static qrious and install vue qrious

---
 package-lock.json    |  48 +++
 package.json         |   1 +
 public/index.html    |   1 -
 public/qrious.min.js | 911 -------------------------------------------
 4 files changed, 49 insertions(+), 912 deletions(-)
 delete mode 100644 public/qrious.min.js

diff --git a/package-lock.json b/package-lock.json
index de93ab05..ff8f5fef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,6 +42,7 @@
         "vue-class-component": "^8.0.0-0",
         "vue-gtag": "^2.0.1",
         "vue-json-viewer": "^3.0.4",
+        "vue-qrious": "^3.1.0",
         "vue-router": "^4.0.14",
         "vue-slider-component": "^4.1.0-beta.2",
         "vue-toastification": "^2.0.0-rc.5",
@@ -14819,6 +14820,12 @@
         "node": ">=6"
       }
     },
+    "node_modules/qrious": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/qrious/-/qrious-4.0.2.tgz",
+      "integrity": "sha512-xWPJIrK1zu5Ypn898fBp8RHkT/9ibquV2Kv24S/JY9VYEhMBMKur1gHVsOiNUh7PHP9uCgejjpZUHUIXXKoU/g==",
+      "peer": true
+    },
     "node_modules/qs": {
       "version": "6.5.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
@@ -17896,6 +17903,26 @@
         "node": ">=8"
       }
     },
+    "node_modules/vue-qrious": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/vue-qrious/-/vue-qrious-3.1.0.tgz",
+      "integrity": "sha512-qC5jw94b/VbUHFxYfumwqhSXKBJNEmaimhpwEmudqOiORMd5yPCFn/mPInnP5nWobvhvcV+S+U3Ger6w2dLyfQ==",
+      "dependencies": {
+        "tslib": "^2.4.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/rxts"
+      },
+      "peerDependencies": {
+        "qrious": "^4.0.0",
+        "vue": "^2.7.0 || ^3.0.0"
+      }
+    },
+    "node_modules/vue-qrious/node_modules/tslib": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+    },
     "node_modules/vue-router": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.3.tgz",
@@ -29767,6 +29794,12 @@
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true
     },
+    "qrious": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/qrious/-/qrious-4.0.2.tgz",
+      "integrity": "sha512-xWPJIrK1zu5Ypn898fBp8RHkT/9ibquV2Kv24S/JY9VYEhMBMKur1gHVsOiNUh7PHP9uCgejjpZUHUIXXKoU/g==",
+      "peer": true
+    },
     "qs": {
       "version": "6.5.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
@@ -32107,6 +32140,21 @@
         }
       }
     },
+    "vue-qrious": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/vue-qrious/-/vue-qrious-3.1.0.tgz",
+      "integrity": "sha512-qC5jw94b/VbUHFxYfumwqhSXKBJNEmaimhpwEmudqOiORMd5yPCFn/mPInnP5nWobvhvcV+S+U3Ger6w2dLyfQ==",
+      "requires": {
+        "tslib": "^2.4.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+          "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+        }
+      }
+    },
     "vue-router": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.3.tgz",
diff --git a/package.json b/package.json
index 5a2a5a1c..3e9deb45 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
     "vue-class-component": "^8.0.0-0",
     "vue-gtag": "^2.0.1",
     "vue-json-viewer": "^3.0.4",
+    "vue-qrious": "^3.1.0",
     "vue-router": "^4.0.14",
     "vue-slider-component": "^4.1.0-beta.2",
     "vue-toastification": "^2.0.0-rc.5",
diff --git a/public/index.html b/public/index.html
index 1e69bfd5..fdd2ce36 100644
--- a/public/index.html
+++ b/public/index.html
@@ -16,7 +16,6 @@
         overflow-y: auto !important;
       }
     </style>
-    <script src="/qrious.min.js"></script>
   </head>
   <body>
     <noscript>
diff --git a/public/qrious.min.js b/public/qrious.min.js
deleted file mode 100644
index ba1637ca..00000000
--- a/public/qrious.min.js
+++ /dev/null
@@ -1,911 +0,0 @@
-/*! QRious v4.0.2 | (C) 2017 Alasdair Mercer | GPL v3 License
-Based on jsqrencode | (C) 2010 tz@execpc.com | GPL v3 License
-*/
-!(function (t, e) {
-  'object' == typeof exports && 'undefined' != typeof module
-    ? (module.exports = e())
-    : 'function' == typeof define && define.amd
-    ? define(e)
-    : (t.QRious = e())
-})(this, function () {
-  'use strict'
-  function t(t, e) {
-    var n
-    return (
-      'function' == typeof Object.create
-        ? (n = Object.create(t))
-        : ((s.prototype = t), (n = new s()), (s.prototype = null)),
-      e && i(!0, n, e),
-      n
-    )
-  }
-  function e(e, n, s, r) {
-    var o = this
-    return (
-      'string' != typeof e && ((r = s), (s = n), (n = e), (e = null)),
-      'function' != typeof n &&
-        ((r = s),
-        (s = n),
-        (n = function () {
-          return o.apply(this, arguments)
-        })),
-      i(!1, n, o, r),
-      (n.prototype = t(o.prototype, s)),
-      (n.prototype.constructor = n),
-      (n.class_ = e || o.class_),
-      (n.super_ = o),
-      n
-    )
-  }
-  function i(t, e, i) {
-    for (var n, s, a = 0, h = (i = o.call(arguments, 2)).length; a < h; a++) {
-      s = i[a]
-      for (n in s) (t && !r.call(s, n)) || (e[n] = s[n])
-    }
-  }
-  function n() {}
-  var s = function () {},
-    r = Object.prototype.hasOwnProperty,
-    o = Array.prototype.slice,
-    a = e
-  ;(n.class_ = 'Nevis'), (n.super_ = Object), (n.extend = a)
-  var h = n,
-    f = h.extend(
-      function (t, e, i) {
-        ;(this.qrious = t),
-          (this.element = e),
-          (this.element.qrious = t),
-          (this.enabled = Boolean(i))
-      },
-      {
-        draw: function (t) {},
-        getElement: function () {
-          return (
-            this.enabled || ((this.enabled = !0), this.render()), this.element
-          )
-        },
-        getModuleSize: function (t) {
-          var e = this.qrious,
-            i = e.padding || 0,
-            n = Math.floor((e.size - 2 * i) / t.width)
-          return Math.max(1, n)
-        },
-        getOffset: function (t) {
-          var e = this.qrious,
-            i = e.padding
-          if (null != i) return i
-          var n = this.getModuleSize(t),
-            s = Math.floor((e.size - n * t.width) / 2)
-          return Math.max(0, s)
-        },
-        render: function (t) {
-          this.enabled && (this.resize(), this.reset(), this.draw(t))
-        },
-        reset: function () {},
-        resize: function () {},
-      }
-    ),
-    c = f.extend({
-      draw: function (t) {
-        var e,
-          i,
-          n = this.qrious,
-          s = this.getModuleSize(t),
-          r = this.getOffset(t),
-          o = this.element.getContext('2d')
-        for (
-          o.fillStyle = n.foreground, o.globalAlpha = n.foregroundAlpha, e = 0;
-          e < t.width;
-          e++
-        )
-          for (i = 0; i < t.width; i++)
-            t.buffer[i * t.width + e] && o.fillRect(s * e + r, s * i + r, s, s)
-      },
-      reset: function () {
-        var t = this.qrious,
-          e = this.element.getContext('2d'),
-          i = t.size
-        ;(e.lineWidth = 1),
-          e.clearRect(0, 0, i, i),
-          (e.fillStyle = t.background),
-          (e.globalAlpha = t.backgroundAlpha),
-          e.fillRect(0, 0, i, i)
-      },
-      resize: function () {
-        var t = this.element
-        t.width = t.height = this.qrious.size
-      },
-    }),
-    u = h.extend(null, {
-      BLOCK: [
-        0, 11, 15, 19, 23, 27, 31, 16, 18, 20, 22, 24, 26, 28, 20, 22, 24, 24,
-        26, 28, 28, 22, 24, 24, 26, 26, 28, 28, 24, 24, 26, 26, 26, 28, 28, 24,
-        26, 26, 26, 28, 28,
-      ],
-    }),
-    l = h.extend(null, {
-      BLOCKS: [
-        1, 0, 19, 7, 1, 0, 16, 10, 1, 0, 13, 13, 1, 0, 9, 17, 1, 0, 34, 10, 1,
-        0, 28, 16, 1, 0, 22, 22, 1, 0, 16, 28, 1, 0, 55, 15, 1, 0, 44, 26, 2, 0,
-        17, 18, 2, 0, 13, 22, 1, 0, 80, 20, 2, 0, 32, 18, 2, 0, 24, 26, 4, 0, 9,
-        16, 1, 0, 108, 26, 2, 0, 43, 24, 2, 2, 15, 18, 2, 2, 11, 22, 2, 0, 68,
-        18, 4, 0, 27, 16, 4, 0, 19, 24, 4, 0, 15, 28, 2, 0, 78, 20, 4, 0, 31,
-        18, 2, 4, 14, 18, 4, 1, 13, 26, 2, 0, 97, 24, 2, 2, 38, 22, 4, 2, 18,
-        22, 4, 2, 14, 26, 2, 0, 116, 30, 3, 2, 36, 22, 4, 4, 16, 20, 4, 4, 12,
-        24, 2, 2, 68, 18, 4, 1, 43, 26, 6, 2, 19, 24, 6, 2, 15, 28, 4, 0, 81,
-        20, 1, 4, 50, 30, 4, 4, 22, 28, 3, 8, 12, 24, 2, 2, 92, 24, 6, 2, 36,
-        22, 4, 6, 20, 26, 7, 4, 14, 28, 4, 0, 107, 26, 8, 1, 37, 22, 8, 4, 20,
-        24, 12, 4, 11, 22, 3, 1, 115, 30, 4, 5, 40, 24, 11, 5, 16, 20, 11, 5,
-        12, 24, 5, 1, 87, 22, 5, 5, 41, 24, 5, 7, 24, 30, 11, 7, 12, 24, 5, 1,
-        98, 24, 7, 3, 45, 28, 15, 2, 19, 24, 3, 13, 15, 30, 1, 5, 107, 28, 10,
-        1, 46, 28, 1, 15, 22, 28, 2, 17, 14, 28, 5, 1, 120, 30, 9, 4, 43, 26,
-        17, 1, 22, 28, 2, 19, 14, 28, 3, 4, 113, 28, 3, 11, 44, 26, 17, 4, 21,
-        26, 9, 16, 13, 26, 3, 5, 107, 28, 3, 13, 41, 26, 15, 5, 24, 30, 15, 10,
-        15, 28, 4, 4, 116, 28, 17, 0, 42, 26, 17, 6, 22, 28, 19, 6, 16, 30, 2,
-        7, 111, 28, 17, 0, 46, 28, 7, 16, 24, 30, 34, 0, 13, 24, 4, 5, 121, 30,
-        4, 14, 47, 28, 11, 14, 24, 30, 16, 14, 15, 30, 6, 4, 117, 30, 6, 14, 45,
-        28, 11, 16, 24, 30, 30, 2, 16, 30, 8, 4, 106, 26, 8, 13, 47, 28, 7, 22,
-        24, 30, 22, 13, 15, 30, 10, 2, 114, 28, 19, 4, 46, 28, 28, 6, 22, 28,
-        33, 4, 16, 30, 8, 4, 122, 30, 22, 3, 45, 28, 8, 26, 23, 30, 12, 28, 15,
-        30, 3, 10, 117, 30, 3, 23, 45, 28, 4, 31, 24, 30, 11, 31, 15, 30, 7, 7,
-        116, 30, 21, 7, 45, 28, 1, 37, 23, 30, 19, 26, 15, 30, 5, 10, 115, 30,
-        19, 10, 47, 28, 15, 25, 24, 30, 23, 25, 15, 30, 13, 3, 115, 30, 2, 29,
-        46, 28, 42, 1, 24, 30, 23, 28, 15, 30, 17, 0, 115, 30, 10, 23, 46, 28,
-        10, 35, 24, 30, 19, 35, 15, 30, 17, 1, 115, 30, 14, 21, 46, 28, 29, 19,
-        24, 30, 11, 46, 15, 30, 13, 6, 115, 30, 14, 23, 46, 28, 44, 7, 24, 30,
-        59, 1, 16, 30, 12, 7, 121, 30, 12, 26, 47, 28, 39, 14, 24, 30, 22, 41,
-        15, 30, 6, 14, 121, 30, 6, 34, 47, 28, 46, 10, 24, 30, 2, 64, 15, 30,
-        17, 4, 122, 30, 29, 14, 46, 28, 49, 10, 24, 30, 24, 46, 15, 30, 4, 18,
-        122, 30, 13, 32, 46, 28, 48, 14, 24, 30, 42, 32, 15, 30, 20, 4, 117, 30,
-        40, 7, 47, 28, 43, 22, 24, 30, 10, 67, 15, 30, 19, 6, 118, 30, 18, 31,
-        47, 28, 34, 34, 24, 30, 20, 61, 15, 30,
-      ],
-      FINAL_FORMAT: [
-        30660, 29427, 32170, 30877, 26159, 25368, 27713, 26998, 21522, 20773,
-        24188, 23371, 17913, 16590, 20375, 19104, 13663, 12392, 16177, 14854,
-        9396, 8579, 11994, 11245, 5769, 5054, 7399, 6608, 1890, 597, 3340, 2107,
-      ],
-      LEVELS: { L: 1, M: 2, Q: 3, H: 4 },
-    }),
-    _ = h.extend(null, {
-      EXPONENT: [
-        1, 2, 4, 8, 16, 32, 64, 128, 29, 58, 116, 232, 205, 135, 19, 38, 76,
-        152, 45, 90, 180, 117, 234, 201, 143, 3, 6, 12, 24, 48, 96, 192, 157,
-        39, 78, 156, 37, 74, 148, 53, 106, 212, 181, 119, 238, 193, 159, 35, 70,
-        140, 5, 10, 20, 40, 80, 160, 93, 186, 105, 210, 185, 111, 222, 161, 95,
-        190, 97, 194, 153, 47, 94, 188, 101, 202, 137, 15, 30, 60, 120, 240,
-        253, 231, 211, 187, 107, 214, 177, 127, 254, 225, 223, 163, 91, 182,
-        113, 226, 217, 175, 67, 134, 17, 34, 68, 136, 13, 26, 52, 104, 208, 189,
-        103, 206, 129, 31, 62, 124, 248, 237, 199, 147, 59, 118, 236, 197, 151,
-        51, 102, 204, 133, 23, 46, 92, 184, 109, 218, 169, 79, 158, 33, 66, 132,
-        21, 42, 84, 168, 77, 154, 41, 82, 164, 85, 170, 73, 146, 57, 114, 228,
-        213, 183, 115, 230, 209, 191, 99, 198, 145, 63, 126, 252, 229, 215, 179,
-        123, 246, 241, 255, 227, 219, 171, 75, 150, 49, 98, 196, 149, 55, 110,
-        220, 165, 87, 174, 65, 130, 25, 50, 100, 200, 141, 7, 14, 28, 56, 112,
-        224, 221, 167, 83, 166, 81, 162, 89, 178, 121, 242, 249, 239, 195, 155,
-        43, 86, 172, 69, 138, 9, 18, 36, 72, 144, 61, 122, 244, 245, 247, 243,
-        251, 235, 203, 139, 11, 22, 44, 88, 176, 125, 250, 233, 207, 131, 27,
-        54, 108, 216, 173, 71, 142, 0,
-      ],
-      LOG: [
-        255, 0, 1, 25, 2, 50, 26, 198, 3, 223, 51, 238, 27, 104, 199, 75, 4,
-        100, 224, 14, 52, 141, 239, 129, 28, 193, 105, 248, 200, 8, 76, 113, 5,
-        138, 101, 47, 225, 36, 15, 33, 53, 147, 142, 218, 240, 18, 130, 69, 29,
-        181, 194, 125, 106, 39, 249, 185, 201, 154, 9, 120, 77, 228, 114, 166,
-        6, 191, 139, 98, 102, 221, 48, 253, 226, 152, 37, 179, 16, 145, 34, 136,
-        54, 208, 148, 206, 143, 150, 219, 189, 241, 210, 19, 92, 131, 56, 70,
-        64, 30, 66, 182, 163, 195, 72, 126, 110, 107, 58, 40, 84, 250, 133, 186,
-        61, 202, 94, 155, 159, 10, 21, 121, 43, 78, 212, 229, 172, 115, 243,
-        167, 87, 7, 112, 192, 247, 140, 128, 99, 13, 103, 74, 222, 237, 49, 197,
-        254, 24, 227, 165, 153, 119, 38, 184, 180, 124, 17, 68, 146, 217, 35,
-        32, 137, 46, 55, 63, 209, 91, 149, 188, 207, 205, 144, 135, 151, 178,
-        220, 252, 190, 97, 242, 86, 211, 171, 20, 42, 93, 158, 132, 60, 57, 83,
-        71, 109, 65, 162, 31, 45, 67, 216, 183, 123, 164, 118, 196, 23, 73, 236,
-        127, 12, 111, 246, 108, 161, 59, 82, 41, 157, 85, 170, 251, 96, 134,
-        177, 187, 204, 62, 90, 203, 89, 95, 176, 156, 169, 160, 81, 11, 245, 22,
-        235, 122, 117, 44, 215, 79, 174, 213, 233, 230, 231, 173, 232, 116, 214,
-        244, 234, 168, 80, 88, 175,
-      ],
-    }),
-    d = h.extend(null, {
-      BLOCK: [
-        3220, 1468, 2713, 1235, 3062, 1890, 2119, 1549, 2344, 2936, 1117, 2583,
-        1330, 2470, 1667, 2249, 2028, 3780, 481, 4011, 142, 3098, 831, 3445,
-        592, 2517, 1776, 2234, 1951, 2827, 1070, 2660, 1345, 3177,
-      ],
-    }),
-    v = h.extend(
-      function (t) {
-        var e,
-          i,
-          n,
-          s,
-          r,
-          o = t.value.length
-        for (
-          this._badness = [],
-            this._level = l.LEVELS[t.level],
-            this._polynomial = [],
-            this._value = t.value,
-            this._version = 0,
-            this._stringBuffer = [];
-          this._version < 40 &&
-          (this._version++,
-          (n = 4 * (this._level - 1) + 16 * (this._version - 1)),
-          (s = l.BLOCKS[n++]),
-          (r = l.BLOCKS[n++]),
-          (e = l.BLOCKS[n++]),
-          (i = l.BLOCKS[n]),
-          (n = e * (s + r) + r - 3 + (this._version <= 9)),
-          !(o <= n));
-
-        );
-        ;(this._dataBlock = e),
-          (this._eccBlock = i),
-          (this._neccBlock1 = s),
-          (this._neccBlock2 = r)
-        var a = (this.width = 17 + 4 * this._version)
-        ;(this.buffer = v._createArray(a * a)),
-          (this._ecc = v._createArray(e + (e + i) * (s + r) + r)),
-          (this._mask = v._createArray((a * (a + 1) + 1) / 2)),
-          this._insertFinders(),
-          this._insertAlignments(),
-          (this.buffer[8 + a * (a - 8)] = 1),
-          this._insertTimingGap(),
-          this._reverseMask(),
-          this._insertTimingRowAndColumn(),
-          this._insertVersion(),
-          this._syncMask(),
-          this._convertBitStream(o),
-          this._calculatePolynomial(),
-          this._appendEccToData(),
-          this._interleaveBlocks(),
-          this._pack(),
-          this._finish()
-      },
-      {
-        _addAlignment: function (t, e) {
-          var i,
-            n = this.buffer,
-            s = this.width
-          for (n[t + s * e] = 1, i = -2; i < 2; i++)
-            (n[t + i + s * (e - 2)] = 1),
-              (n[t - 2 + s * (e + i + 1)] = 1),
-              (n[t + 2 + s * (e + i)] = 1),
-              (n[t + i + 1 + s * (e + 2)] = 1)
-          for (i = 0; i < 2; i++)
-            this._setMask(t - 1, e + i),
-              this._setMask(t + 1, e - i),
-              this._setMask(t - i, e - 1),
-              this._setMask(t + i, e + 1)
-        },
-        _appendData: function (t, e, i, n) {
-          var s,
-            r,
-            o,
-            a = this._polynomial,
-            h = this._stringBuffer
-          for (r = 0; r < n; r++) h[i + r] = 0
-          for (r = 0; r < e; r++) {
-            if (255 !== (s = _.LOG[h[t + r] ^ h[i]]))
-              for (o = 1; o < n; o++)
-                h[i + o - 1] = h[i + o] ^ _.EXPONENT[v._modN(s + a[n - o])]
-            else for (o = i; o < i + n; o++) h[o] = h[o + 1]
-            h[i + n - 1] = 255 === s ? 0 : _.EXPONENT[v._modN(s + a[0])]
-          }
-        },
-        _appendEccToData: function () {
-          var t,
-            e = 0,
-            i = this._dataBlock,
-            n = this._calculateMaxLength(),
-            s = this._eccBlock
-          for (t = 0; t < this._neccBlock1; t++)
-            this._appendData(e, i, n, s), (e += i), (n += s)
-          for (t = 0; t < this._neccBlock2; t++)
-            this._appendData(e, i + 1, n, s), (e += i + 1), (n += s)
-        },
-        _applyMask: function (t) {
-          var e,
-            i,
-            n,
-            s,
-            r = this.buffer,
-            o = this.width
-          switch (t) {
-            case 0:
-              for (s = 0; s < o; s++)
-                for (n = 0; n < o; n++)
-                  (n + s) & 1 || this._isMasked(n, s) || (r[n + s * o] ^= 1)
-              break
-            case 1:
-              for (s = 0; s < o; s++)
-                for (n = 0; n < o; n++)
-                  1 & s || this._isMasked(n, s) || (r[n + s * o] ^= 1)
-              break
-            case 2:
-              for (s = 0; s < o; s++)
-                for (e = 0, n = 0; n < o; n++, e++)
-                  3 === e && (e = 0),
-                    e || this._isMasked(n, s) || (r[n + s * o] ^= 1)
-              break
-            case 3:
-              for (i = 0, s = 0; s < o; s++, i++)
-                for (3 === i && (i = 0), e = i, n = 0; n < o; n++, e++)
-                  3 === e && (e = 0),
-                    e || this._isMasked(n, s) || (r[n + s * o] ^= 1)
-              break
-            case 4:
-              for (s = 0; s < o; s++)
-                for (e = 0, i = (s >> 1) & 1, n = 0; n < o; n++, e++)
-                  3 === e && ((e = 0), (i = !i)),
-                    i || this._isMasked(n, s) || (r[n + s * o] ^= 1)
-              break
-            case 5:
-              for (i = 0, s = 0; s < o; s++, i++)
-                for (3 === i && (i = 0), e = 0, n = 0; n < o; n++, e++)
-                  3 === e && (e = 0),
-                    (n & s & 1) + !(!e | !i) ||
-                      this._isMasked(n, s) ||
-                      (r[n + s * o] ^= 1)
-              break
-            case 6:
-              for (i = 0, s = 0; s < o; s++, i++)
-                for (3 === i && (i = 0), e = 0, n = 0; n < o; n++, e++)
-                  3 === e && (e = 0),
-                    ((n & s & 1) + (e && e === i)) & 1 ||
-                      this._isMasked(n, s) ||
-                      (r[n + s * o] ^= 1)
-              break
-            case 7:
-              for (i = 0, s = 0; s < o; s++, i++)
-                for (3 === i && (i = 0), e = 0, n = 0; n < o; n++, e++)
-                  3 === e && (e = 0),
-                    ((e && e === i) + ((n + s) & 1)) & 1 ||
-                      this._isMasked(n, s) ||
-                      (r[n + s * o] ^= 1)
-          }
-        },
-        _calculateMaxLength: function () {
-          return (
-            this._dataBlock * (this._neccBlock1 + this._neccBlock2) +
-            this._neccBlock2
-          )
-        },
-        _calculatePolynomial: function () {
-          var t,
-            e,
-            i = this._eccBlock,
-            n = this._polynomial
-          for (n[0] = 1, t = 0; t < i; t++) {
-            for (n[t + 1] = 1, e = t; e > 0; e--)
-              n[e] = n[e]
-                ? n[e - 1] ^ _.EXPONENT[v._modN(_.LOG[n[e]] + t)]
-                : n[e - 1]
-            n[0] = _.EXPONENT[v._modN(_.LOG[n[0]] + t)]
-          }
-          for (t = 0; t <= i; t++) n[t] = _.LOG[n[t]]
-        },
-        _checkBadness: function () {
-          var t,
-            e,
-            i,
-            n,
-            s,
-            r = 0,
-            o = this._badness,
-            a = this.buffer,
-            h = this.width
-          for (s = 0; s < h - 1; s++)
-            for (n = 0; n < h - 1; n++)
-              ((a[n + h * s] &&
-                a[n + 1 + h * s] &&
-                a[n + h * (s + 1)] &&
-                a[n + 1 + h * (s + 1)]) ||
-                !(
-                  a[n + h * s] ||
-                  a[n + 1 + h * s] ||
-                  a[n + h * (s + 1)] ||
-                  a[n + 1 + h * (s + 1)]
-                )) &&
-                (r += v.N2)
-          var f = 0
-          for (s = 0; s < h; s++) {
-            for (i = 0, o[0] = 0, t = 0, n = 0; n < h; n++)
-              t === (e = a[n + h * s]) ? o[i]++ : (o[++i] = 1),
-                (f += (t = e) ? 1 : -1)
-            r += this._getBadness(i)
-          }
-          f < 0 && (f = -f)
-          var c = 0,
-            u = f
-          for (u += u << 2, u <<= 1; u > h * h; ) (u -= h * h), c++
-          for (r += c * v.N4, n = 0; n < h; n++) {
-            for (i = 0, o[0] = 0, t = 0, s = 0; s < h; s++)
-              t === (e = a[n + h * s]) ? o[i]++ : (o[++i] = 1), (t = e)
-            r += this._getBadness(i)
-          }
-          return r
-        },
-        _convertBitStream: function (t) {
-          var e,
-            i,
-            n = this._ecc,
-            s = this._version
-          for (i = 0; i < t; i++) n[i] = this._value.charCodeAt(i)
-          var r = (this._stringBuffer = n.slice()),
-            o = this._calculateMaxLength()
-          t >= o - 2 && ((t = o - 2), s > 9 && t--)
-          var a = t
-          if (s > 9) {
-            for (r[a + 2] = 0, r[a + 3] = 0; a--; )
-              (e = r[a]), (r[a + 3] |= 255 & (e << 4)), (r[a + 2] = e >> 4)
-            ;(r[2] |= 255 & (t << 4)), (r[1] = t >> 4), (r[0] = 64 | (t >> 12))
-          } else {
-            for (r[a + 1] = 0, r[a + 2] = 0; a--; )
-              (e = r[a]), (r[a + 2] |= 255 & (e << 4)), (r[a + 1] = e >> 4)
-            ;(r[1] |= 255 & (t << 4)), (r[0] = 64 | (t >> 4))
-          }
-          for (a = t + 3 - (s < 10); a < o; ) (r[a++] = 236), (r[a++] = 17)
-        },
-        _getBadness: function (t) {
-          var e,
-            i = 0,
-            n = this._badness
-          for (e = 0; e <= t; e++) n[e] >= 5 && (i += v.N1 + n[e] - 5)
-          for (e = 3; e < t - 1; e += 2)
-            n[e - 2] === n[e + 2] &&
-              n[e + 2] === n[e - 1] &&
-              n[e - 1] === n[e + 1] &&
-              3 * n[e - 1] === n[e] &&
-              (0 === n[e - 3] ||
-                e + 3 > t ||
-                3 * n[e - 3] >= 4 * n[e] ||
-                3 * n[e + 3] >= 4 * n[e]) &&
-              (i += v.N3)
-          return i
-        },
-        _finish: function () {
-          this._stringBuffer = this.buffer.slice()
-          var t,
-            e,
-            i = 0,
-            n = 3e4
-          for (
-            e = 0;
-            e < 8 &&
-            (this._applyMask(e),
-            (t = this._checkBadness()) < n && ((n = t), (i = e)),
-            7 !== i);
-            e++
-          )
-            this.buffer = this._stringBuffer.slice()
-          i !== e && this._applyMask(i),
-            (n = l.FINAL_FORMAT[i + ((this._level - 1) << 3)])
-          var s = this.buffer,
-            r = this.width
-          for (e = 0; e < 8; e++, n >>= 1)
-            1 & n &&
-              ((s[r - 1 - e + 8 * r] = 1),
-              e < 6 ? (s[8 + r * e] = 1) : (s[8 + r * (e + 1)] = 1))
-          for (e = 0; e < 7; e++, n >>= 1)
-            1 & n &&
-              ((s[8 + r * (r - 7 + e)] = 1),
-              e ? (s[6 - e + 8 * r] = 1) : (s[7 + 8 * r] = 1))
-        },
-        _interleaveBlocks: function () {
-          var t,
-            e,
-            i = this._dataBlock,
-            n = this._ecc,
-            s = this._eccBlock,
-            r = 0,
-            o = this._calculateMaxLength(),
-            a = this._neccBlock1,
-            h = this._neccBlock2,
-            f = this._stringBuffer
-          for (t = 0; t < i; t++) {
-            for (e = 0; e < a; e++) n[r++] = f[t + e * i]
-            for (e = 0; e < h; e++) n[r++] = f[a * i + t + e * (i + 1)]
-          }
-          for (e = 0; e < h; e++) n[r++] = f[a * i + t + e * (i + 1)]
-          for (t = 0; t < s; t++)
-            for (e = 0; e < a + h; e++) n[r++] = f[o + t + e * s]
-          this._stringBuffer = n
-        },
-        _insertAlignments: function () {
-          var t,
-            e,
-            i,
-            n = this._version,
-            s = this.width
-          if (n > 1)
-            for (t = u.BLOCK[n], i = s - 7; ; ) {
-              for (
-                e = s - 7;
-                e > t - 3 && (this._addAlignment(e, i), !(e < t));
-
-              )
-                e -= t
-              if (i <= t + 9) break
-              ;(i -= t), this._addAlignment(6, i), this._addAlignment(i, 6)
-            }
-        },
-        _insertFinders: function () {
-          var t,
-            e,
-            i,
-            n,
-            s = this.buffer,
-            r = this.width
-          for (t = 0; t < 3; t++) {
-            for (
-              e = 0,
-                n = 0,
-                1 === t && (e = r - 7),
-                2 === t && (n = r - 7),
-                s[n + 3 + r * (e + 3)] = 1,
-                i = 0;
-              i < 6;
-              i++
-            )
-              (s[n + i + r * e] = 1),
-                (s[n + r * (e + i + 1)] = 1),
-                (s[n + 6 + r * (e + i)] = 1),
-                (s[n + i + 1 + r * (e + 6)] = 1)
-            for (i = 1; i < 5; i++)
-              this._setMask(n + i, e + 1),
-                this._setMask(n + 1, e + i + 1),
-                this._setMask(n + 5, e + i),
-                this._setMask(n + i + 1, e + 5)
-            for (i = 2; i < 4; i++)
-              (s[n + i + r * (e + 2)] = 1),
-                (s[n + 2 + r * (e + i + 1)] = 1),
-                (s[n + 4 + r * (e + i)] = 1),
-                (s[n + i + 1 + r * (e + 4)] = 1)
-          }
-        },
-        _insertTimingGap: function () {
-          var t,
-            e,
-            i = this.width
-          for (e = 0; e < 7; e++)
-            this._setMask(7, e),
-              this._setMask(i - 8, e),
-              this._setMask(7, e + i - 7)
-          for (t = 0; t < 8; t++)
-            this._setMask(t, 7),
-              this._setMask(t + i - 8, 7),
-              this._setMask(t, i - 8)
-        },
-        _insertTimingRowAndColumn: function () {
-          var t,
-            e = this.buffer,
-            i = this.width
-          for (t = 0; t < i - 14; t++)
-            1 & t
-              ? (this._setMask(8 + t, 6), this._setMask(6, 8 + t))
-              : ((e[8 + t + 6 * i] = 1), (e[6 + i * (8 + t)] = 1))
-        },
-        _insertVersion: function () {
-          var t,
-            e,
-            i,
-            n,
-            s = this.buffer,
-            r = this._version,
-            o = this.width
-          if (r > 6)
-            for (t = d.BLOCK[r - 7], e = 17, i = 0; i < 6; i++)
-              for (n = 0; n < 3; n++, e--)
-                1 & (e > 11 ? r >> (e - 12) : t >> e)
-                  ? ((s[5 - i + o * (2 - n + o - 11)] = 1),
-                    (s[2 - n + o - 11 + o * (5 - i)] = 1))
-                  : (this._setMask(5 - i, 2 - n + o - 11),
-                    this._setMask(2 - n + o - 11, 5 - i))
-        },
-        _isMasked: function (t, e) {
-          var i = v._getMaskBit(t, e)
-          return 1 === this._mask[i]
-        },
-        _pack: function () {
-          var t,
-            e,
-            i,
-            n = 1,
-            s = 1,
-            r = this.width,
-            o = r - 1,
-            a = r - 1,
-            h =
-              (this._dataBlock + this._eccBlock) *
-                (this._neccBlock1 + this._neccBlock2) +
-              this._neccBlock2
-          for (e = 0; e < h; e++)
-            for (t = this._stringBuffer[e], i = 0; i < 8; i++, t <<= 1) {
-              128 & t && (this.buffer[o + r * a] = 1)
-              do {
-                s
-                  ? o--
-                  : (o++,
-                    n
-                      ? 0 !== a
-                        ? a--
-                        : ((n = !n), 6 === (o -= 2) && (o--, (a = 9)))
-                      : a !== r - 1
-                      ? a++
-                      : ((n = !n), 6 === (o -= 2) && (o--, (a -= 8)))),
-                  (s = !s)
-              } while (this._isMasked(o, a))
-            }
-        },
-        _reverseMask: function () {
-          var t,
-            e,
-            i = this.width
-          for (t = 0; t < 9; t++) this._setMask(t, 8)
-          for (t = 0; t < 8; t++)
-            this._setMask(t + i - 8, 8), this._setMask(8, t)
-          for (e = 0; e < 7; e++) this._setMask(8, e + i - 7)
-        },
-        _setMask: function (t, e) {
-          var i = v._getMaskBit(t, e)
-          this._mask[i] = 1
-        },
-        _syncMask: function () {
-          var t,
-            e,
-            i = this.width
-          for (e = 0; e < i; e++)
-            for (t = 0; t <= e; t++)
-              this.buffer[t + i * e] && this._setMask(t, e)
-        },
-      },
-      {
-        _createArray: function (t) {
-          var e,
-            i = []
-          for (e = 0; e < t; e++) i[e] = 0
-          return i
-        },
-        _getMaskBit: function (t, e) {
-          var i
-          return (
-            t > e && ((i = t), (t = e), (e = i)),
-            (i = e),
-            (i += e * e),
-            (i >>= 1),
-            (i += t)
-          )
-        },
-        _modN: function (t) {
-          for (; t >= 255; ) t = ((t -= 255) >> 8) + (255 & t)
-          return t
-        },
-        N1: 3,
-        N2: 3,
-        N3: 40,
-        N4: 10,
-      }
-    ),
-    p = v,
-    m = f.extend({
-      draw: function () {
-        this.element.src = this.qrious.toDataURL()
-      },
-      reset: function () {
-        this.element.src = ''
-      },
-      resize: function () {
-        var t = this.element
-        t.width = t.height = this.qrious.size
-      },
-    }),
-    g = h.extend(
-      function (t, e, i, n) {
-        ;(this.name = t),
-          (this.modifiable = Boolean(e)),
-          (this.defaultValue = i),
-          (this._valueTransformer = n)
-      },
-      {
-        transform: function (t) {
-          var e = this._valueTransformer
-          return 'function' == typeof e ? e(t, this) : t
-        },
-      }
-    ),
-    k = h.extend(null, {
-      abs: function (t) {
-        return null != t ? Math.abs(t) : null
-      },
-      hasOwn: function (t, e) {
-        return Object.prototype.hasOwnProperty.call(t, e)
-      },
-      noop: function () {},
-      toUpperCase: function (t) {
-        return null != t ? t.toUpperCase() : null
-      },
-    }),
-    w = h.extend(
-      function (t) {
-        ;(this.options = {}),
-          t.forEach(function (t) {
-            this.options[t.name] = t
-          }, this)
-      },
-      {
-        exists: function (t) {
-          return null != this.options[t]
-        },
-        get: function (t, e) {
-          return w._get(this.options[t], e)
-        },
-        getAll: function (t) {
-          var e,
-            i = this.options,
-            n = {}
-          for (e in i) k.hasOwn(i, e) && (n[e] = w._get(i[e], t))
-          return n
-        },
-        init: function (t, e, i) {
-          'function' != typeof i && (i = k.noop)
-          var n, s
-          for (n in this.options)
-            k.hasOwn(this.options, n) &&
-              ((s = this.options[n]),
-              w._set(s, s.defaultValue, e),
-              w._createAccessor(s, e, i))
-          this._setAll(t, e, !0)
-        },
-        set: function (t, e, i) {
-          return this._set(t, e, i)
-        },
-        setAll: function (t, e) {
-          return this._setAll(t, e)
-        },
-        _set: function (t, e, i, n) {
-          var s = this.options[t]
-          if (!s) throw new Error('Invalid option: ' + t)
-          if (!s.modifiable && !n)
-            throw new Error('Option cannot be modified: ' + t)
-          return w._set(s, e, i)
-        },
-        _setAll: function (t, e, i) {
-          if (!t) return !1
-          var n,
-            s = !1
-          for (n in t) k.hasOwn(t, n) && this._set(n, t[n], e, i) && (s = !0)
-          return s
-        },
-      },
-      {
-        _createAccessor: function (t, e, i) {
-          var n = {
-            get: function () {
-              return w._get(t, e)
-            },
-          }
-          t.modifiable &&
-            (n.set = function (n) {
-              w._set(t, n, e) && i(n, t)
-            }),
-            Object.defineProperty(e, t.name, n)
-        },
-        _get: function (t, e) {
-          return e['_' + t.name]
-        },
-        _set: function (t, e, i) {
-          var n = '_' + t.name,
-            s = i[n],
-            r = t.transform(null != e ? e : t.defaultValue)
-          return (i[n] = r), r !== s
-        },
-      }
-    ),
-    M = w,
-    b = h.extend(
-      function () {
-        this._services = {}
-      },
-      {
-        getService: function (t) {
-          var e = this._services[t]
-          if (!e)
-            throw new Error('Service is not being managed with name: ' + t)
-          return e
-        },
-        setService: function (t, e) {
-          if (this._services[t])
-            throw new Error('Service is already managed with name: ' + t)
-          e && (this._services[t] = e)
-        },
-      }
-    ),
-    B = new M([
-      new g('background', !0, 'white'),
-      new g('backgroundAlpha', !0, 1, k.abs),
-      new g('element'),
-      new g('foreground', !0, 'black'),
-      new g('foregroundAlpha', !0, 1, k.abs),
-      new g('level', !0, 'L', k.toUpperCase),
-      new g('mime', !0, 'image/png'),
-      new g('padding', !0, null, k.abs),
-      new g('size', !0, 100, k.abs),
-      new g('value', !0, ''),
-    ]),
-    y = new b(),
-    O = h.extend(
-      function (t) {
-        B.init(t, this, this.update.bind(this))
-        var e = B.get('element', this),
-          i = y.getService('element'),
-          n = e && i.isCanvas(e) ? e : i.createCanvas(),
-          s = e && i.isImage(e) ? e : i.createImage()
-        ;(this._canvasRenderer = new c(this, n, !0)),
-          (this._imageRenderer = new m(this, s, s === e)),
-          this.update()
-      },
-      {
-        get: function () {
-          return B.getAll(this)
-        },
-        set: function (t) {
-          B.setAll(t, this) && this.update()
-        },
-        toDataURL: function (t) {
-          return this.canvas.toDataURL(t || this.mime)
-        },
-        update: function () {
-          var t = new p({ level: this.level, value: this.value })
-          this._canvasRenderer.render(t), this._imageRenderer.render(t)
-        },
-      },
-      {
-        use: function (t) {
-          y.setService(t.getName(), t)
-        },
-      }
-    )
-  Object.defineProperties(O.prototype, {
-    canvas: {
-      get: function () {
-        return this._canvasRenderer.getElement()
-      },
-    },
-    image: {
-      get: function () {
-        return this._imageRenderer.getElement()
-      },
-    },
-  })
-  var A = O,
-    L = h
-      .extend({ getName: function () {} })
-      .extend({
-        createCanvas: function () {},
-        createImage: function () {},
-        getName: function () {
-          return 'element'
-        },
-        isCanvas: function (t) {},
-        isImage: function (t) {},
-      })
-      .extend({
-        createCanvas: function () {
-          return document.createElement('canvas')
-        },
-        createImage: function () {
-          return document.createElement('img')
-        },
-        isCanvas: function (t) {
-          return t instanceof HTMLCanvasElement
-        },
-        isImage: function (t) {
-          return t instanceof HTMLImageElement
-        },
-      })
-  return A.use(new L()), A
-})
-
-//# sourceMappingURL=qrious.min.js.map

From 8e87e255fe61acc7d8bb5a5a6f838c1f015da131 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 16 May 2023 18:16:44 +0530
Subject: [PATCH 043/153] Update recieve tokens component

---
 src/assets/images/dark/copy.svg  |  3 ++
 src/assets/images/light/copy.svg |  3 ++
 src/components/ReceiveTokens.vue | 80 +++++++++++---------------------
 3 files changed, 33 insertions(+), 53 deletions(-)
 create mode 100644 src/assets/images/dark/copy.svg
 create mode 100644 src/assets/images/light/copy.svg

diff --git a/src/assets/images/dark/copy.svg b/src/assets/images/dark/copy.svg
new file mode 100644
index 00000000..4bfd6759
--- /dev/null
+++ b/src/assets/images/dark/copy.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 10H11.8667C12.6134 10 12.9866 9.99998 13.2719 9.85466C13.5227 9.72682 13.727 9.5229 13.8548 9.27202C14.0001 8.9868 14.0001 8.61344 14.0001 7.8667V4.13335C14.0001 3.38662 14.0001 3.01324 13.8548 2.72803C13.727 2.47714 13.5227 2.27316 13.2719 2.14532C12.9866 2 12.6135 2 11.8668 2H8.13346C7.38673 2 7.01308 2 6.72786 2.14532C6.47698 2.27316 6.27316 2.47714 6.14532 2.72803C6 3.01324 6 3.38665 6 4.13338V6.00005M2 11.8667V8.13338C2 7.38665 2 7.01324 2.14532 6.72803C2.27316 6.47714 2.47698 6.27316 2.72786 6.14532C3.01308 6 3.38673 6 4.13346 6H7.8668C8.61353 6 8.98664 6 9.27186 6.14532C9.52274 6.27316 9.72699 6.47714 9.85482 6.72803C10.0001 7.01324 10.0001 7.38661 10.0001 8.13335V11.8667C10.0001 12.6134 10.0001 12.9868 9.85482 13.272C9.72699 13.5229 9.52274 13.7268 9.27186 13.8547C8.98664 14 8.61353 14 7.8668 14H4.13346C3.38673 14 3.01308 14 2.72786 13.8547C2.47698 13.7268 2.27316 13.5229 2.14532 13.272C2 12.9868 2 12.6135 2 11.8667Z" stroke="#F7F7F7" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/copy.svg b/src/assets/images/light/copy.svg
new file mode 100644
index 00000000..4bfd6759
--- /dev/null
+++ b/src/assets/images/light/copy.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 10H11.8667C12.6134 10 12.9866 9.99998 13.2719 9.85466C13.5227 9.72682 13.727 9.5229 13.8548 9.27202C14.0001 8.9868 14.0001 8.61344 14.0001 7.8667V4.13335C14.0001 3.38662 14.0001 3.01324 13.8548 2.72803C13.727 2.47714 13.5227 2.27316 13.2719 2.14532C12.9866 2 12.6135 2 11.8668 2H8.13346C7.38673 2 7.01308 2 6.72786 2.14532C6.47698 2.27316 6.27316 2.47714 6.14532 2.72803C6 3.01324 6 3.38665 6 4.13338V6.00005M2 11.8667V8.13338C2 7.38665 2 7.01324 2.14532 6.72803C2.27316 6.47714 2.47698 6.27316 2.72786 6.14532C3.01308 6 3.38673 6 4.13346 6H7.8668C8.61353 6 8.98664 6 9.27186 6.14532C9.52274 6.27316 9.72699 6.47714 9.85482 6.72803C10.0001 7.01324 10.0001 7.38661 10.0001 8.13335V11.8667C10.0001 12.6134 10.0001 12.9868 9.85482 13.272C9.72699 13.5229 9.52274 13.7268 9.27186 13.8547C8.98664 14 8.61353 14 7.8668 14H4.13346C3.38673 14 3.01308 14 2.72786 13.8547C2.47698 13.7268 2.27316 13.5229 2.14532 13.272C2 12.9868 2 12.6135 2 11.8667Z" stroke="#F7F7F7" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/ReceiveTokens.vue b/src/components/ReceiveTokens.vue
index de4b83c1..028d3e21 100644
--- a/src/components/ReceiveTokens.vue
+++ b/src/components/ReceiveTokens.vue
@@ -1,32 +1,13 @@
 <script setup lang="ts">
+import VueQrious from 'vue-qrious'
 import { useToast } from 'vue-toastification'
 
-import { useAppStore } from '@/store/app'
-import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
-import { useImage } from '@/utils/useImage'
+import { getImage } from '@/utils/getImage'
 
-const QRious = window.QRious
-
-const getImage = useImage()
-const emits = defineEmits(['close'])
-
-const rpcStore = useRpcStore()
 const userStore = useUserStore()
-const appStore = useAppStore()
 const toast = useToast()
 
-function renderQrCode(element) {
-  new QRious({
-    element,
-    value: userStore.walletAddress,
-    level: 'H',
-    size: 300,
-    background: appStore.theme === 'dark' ? 'white' : 'black',
-    foreground: appStore.theme === 'dark' ? 'black' : 'white',
-  })
-}
-
 async function copyToClipboard(value: string) {
   try {
     await navigator.clipboard.writeText(value)
@@ -38,38 +19,31 @@ async function copyToClipboard(value: string) {
 </script>
 
 <template>
-  <div class="space-y-2 max-h-full flex flex-col justify-between">
-    <div class="space-y-1">
-      <div class="flex items-center justify-between">
-        <p class="text-xl sm:text-sm font-semibold">Receive Tokens</p>
-        <button class="h-auto" @click="emits('close')">
-          <img :src="getImage('close-icon')" alt="close icon" class="sm:h-2" />
-        </button>
-      </div>
-      <p class="text-xs text-zinc-400">
-        Scan QR code to copy your address in order to send tokens to this
-        address.
-      </p>
-    </div>
-    <div class="space-y-1 space-x-2 flex justify-center items-baseline">
-      <p class="text-xs text-zinc-400 font-semibold">Network:</p>
-      <p class="text-base sm:text-[12px]">
-        {{ rpcStore.selectedRpcConfig?.chainName }}
-      </p>
-    </div>
-    <div class="flex justify-center items-center">
-      <canvas
-        :ref="renderQrCode"
-        class="rounded-md sm:w-36 sm:h-36 p-3 dark:bg-white bg-black"
-      ></canvas>
-    </div>
-    <div class="flex flex-col items-center">
-      <div class="flex space-x-1">
-        <p class="text-xs">{{ userStore.walletAddressShrinked }}</p>
-        <button class="h-3" @click="copyToClipboard(userStore.walletAddress)">
-          <img :src="getImage('copy-icon')" alt="copy icon" class="h-full" />
-        </button>
-      </div>
+  <div class="flex flex-col">
+    <div class="flex items-center justify-center">
+      <p class="text-xl font-bold">Receive Tokens</p>
     </div>
+    <p class="text-xs text-gray-100 mt-5">
+      Scan QR code to copy your address in order to send tokens to this address.
+    </p>
+  </div>
+  <div
+    class="flex justify-center items-center mt-4 p-2 bg-white-100 rounded-sm"
+  >
+    <VueQrious
+      :value="userStore.walletAddress"
+      :size="400"
+      class="w-full h-full"
+    />
+  </div>
+  <div class="flex items-center justify-center gap-1 mt-6 mb-2">
+    <p class="text-sm font-medium">{{ userStore.walletAddressShrinked }}</p>
+    <button
+      class="h-sm w-sm"
+      title="Click to copy wallet address"
+      @click="copyToClipboard(userStore.walletAddress)"
+    >
+      <img :src="getImage('copy.svg')" alt="Copy wallet address" />
+    </button>
   </div>
 </template>

From cec6286169ae6aa91b1445fa63e7fc2b5755578b Mon Sep 17 00:00:00 2001
From: Karthik Durai <iamkarthiksiddarth@gmail.com>
Date: Wed, 17 May 2023 12:05:16 +0530
Subject: [PATCH 044/153] comment out favicon display for now (#313)

---
 src/components/SignMessage.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/SignMessage.vue b/src/components/SignMessage.vue
index 64c9e530..428f8c8e 100644
--- a/src/components/SignMessage.vue
+++ b/src/components/SignMessage.vue
@@ -9,11 +9,11 @@ import { useAppStore } from '@/store/app'
 import { useRpcStore } from '@/store/rpc'
 import { advancedInfo } from '@/utils/advancedInfo'
 import { methodAndAction } from '@/utils/method'
-import { useImage } from '@/utils/useImage'
+// import { useImage } from '@/utils/useImage'
 
 const appStore = useAppStore()
 const rpcStore = useRpcStore()
-const getImage = useImage()
+// const getImage = useImage()
 
 const { selectedRpcConfig } = storeToRefs(rpcStore)
 
@@ -61,10 +61,10 @@ function getTitle(requestMethod: string) {
     <div>
       <p class="text-sm sm:text-xs text-zinc-400 font-semibold">Network</p>
       <p class="text-base sm:text-sm flex gap-2">
-        <img
+        <!-- <img
           :src="getImage(rpcStore.selectedRpcConfig.favicon)"
           class="w-6 h-6"
-        />
+        /> -->
         {{ selectedRpcConfig.chainName }}
       </p>
     </div>

From 251644c037fa46f3a76141ae9a21c0f5f29161d7 Mon Sep 17 00:00:00 2001
From: Karthik Durai <iamkarthiksiddarth@gmail.com>
Date: Wed, 17 May 2023 12:51:43 +0530
Subject: [PATCH 045/153] comment out favicon display for now (#314)

---
 src/components/ChangeChain.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ChangeChain.vue b/src/components/ChangeChain.vue
index 41d5bf15..bbcc9dfa 100644
--- a/src/components/ChangeChain.vue
+++ b/src/components/ChangeChain.vue
@@ -41,11 +41,11 @@ watch(selectedChain, async () => {
       }"
     >
       <div v-if="selectedChain" class="flex space-x-1 items-center">
-        <img
+        <!-- <img
           :src="getImage(selectedChain.favicon)"
           :alt="selectedChain.chainName"
           class="w-6 h-6"
-        />
+        /> -->
         <p class="overflow-hidden whitespace-nowrap text-ellipsis max-w-[16ch]">
           {{ selectedChain.chainName }}
         </p>
@@ -74,11 +74,11 @@ watch(selectedChain, async () => {
         >
           <div class="flex justify-between">
             <div class="flex space-x-1 items-center">
-              <img
+              <!-- <img
                 :src="getImage(chain.favicon)"
                 :alt="chain.chainName"
                 class="w-6 h-6"
-              />
+              /> -->
               <p
                 class="overflow-hidden whitespace-nowrap text-ellipsis max-w-[20ch]"
               >

From bb4da2fad20d4c2984ed15b54662f5f520438108 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 17 May 2023 13:43:50 +0530
Subject: [PATCH 046/153] Update styling for mobile apps

---
 src/App.vue                               | 16 +++++----
 src/components/AssetsView.vue             |  2 +-
 src/components/SendTransactionCompact.vue |  2 +-
 src/store/app.ts                          | 41 ++++++++++++++---------
 4 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 55cd61a9..e75fbb25 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,6 +12,7 @@ import { useModalStore } from '@/store/modal'
 import { useParentConnectionStore } from '@/store/parentConnection'
 import { useRequestStore } from '@/store/request'
 import { getImage } from '@/utils/getImage'
+import { isMobileViewport } from '@/utils/isMobileViewport'
 import { initializeOnRampMoney } from '@/utils/onrampmoney.ramp'
 import { fetchTransakNetworks } from '@/utils/transak'
 
@@ -45,7 +46,7 @@ onBeforeMount(async () => {
 async function setIframeStyle() {
   const parentConnectionInstance = await parentConnectionStore.parentConnection
     ?.promise
-  await parentConnectionInstance?.setIframeStyle(app.iframeStyle)
+  await parentConnectionInstance?.setIframeStyle(app.iframeStyle())
 }
 
 watch(showWallet, async (newValue) => {
@@ -84,17 +85,18 @@ function onClickOfHeader() {
   <div v-if="sdkVersion === 'v3'" class="flex flex-col h-full">
     <div
       v-show="expandWallet"
-      class="flex flex-col h-full dark:bg-black-300 rounded-md overflow-hidden"
+      class="flex flex-col h-full dark:bg-black-300 rounded-t-md overflow-hidden"
+      :class="{ 'rounded-md': !isMobileViewport() }"
     >
       <div class="flex justify-center mt-2 mb-2">
-        <button @click="onClickOfHeader">
+        <button class="flex flex-grow justify-center" @click="onClickOfHeader">
           <img src="@/assets/images/collapse-arrow.svg" />
         </button>
       </div>
       <WalletHeader />
       <div
-        class="flex-grow wallet__container p-4"
-        :class="{ 'rounded-b-xl p-0': compactMode }"
+        class="flex-grow wallet__container m-1 p-3"
+        :class="{ 'p-0': compactMode }"
       >
         <RouterView class="min-h-fullxs flex-grow" />
         <BaseModal v-if="modal.show" />
@@ -125,13 +127,13 @@ function onClickOfHeader() {
 }
 
 *::-webkit-scrollbar-thumb {
-  background-color: #8d8d8d00;
+  background-color: #36363600;
   border-radius: 10px;
   transition: all 0.3s ease-in-out;
 }
 
 :hover::-webkit-scrollbar-thumb {
-  background-color: #8d8d8dff;
+  background-color: #363636ff;
 }
 
 body {
diff --git a/src/components/AssetsView.vue b/src/components/AssetsView.vue
index 1ae13906..d3e54023 100644
--- a/src/components/AssetsView.vue
+++ b/src/components/AssetsView.vue
@@ -117,7 +117,7 @@ rpcStore.$subscribe(getAssetsBalance)
     <div class="card flex flex-col overflow-hidden">
       <div
         v-if="assets.length"
-        class="flex flex-col gap-4 p-4 max-h-[120px] overflow-y-auto"
+        class="flex flex-col gap-4 p-3 m-1 max-h-[120px] overflow-y-auto"
       >
         <div
           v-for="asset in assets"
diff --git a/src/components/SendTransactionCompact.vue b/src/components/SendTransactionCompact.vue
index 1b03d59f..476d1e2b 100644
--- a/src/components/SendTransactionCompact.vue
+++ b/src/components/SendTransactionCompact.vue
@@ -36,7 +36,7 @@ async function setHeight() {
   const parentConnectionInstance = await parentConnectionStore.parentConnection
     ?.promise
   await parentConnectionInstance?.setIframeStyle({
-    ...appStore.iframeStyle,
+    ...appStore.iframeStyle(),
     height: '275px',
   })
 }
diff --git a/src/store/app.ts b/src/store/app.ts
index aee8266a..2ef5d26f 100644
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -3,6 +3,7 @@ import { defineStore } from 'pinia'
 
 import type { SDKVersion } from '@/models/Connection'
 import type { Theme } from '@/models/Theme'
+import { isMobileViewport } from '@/utils/isMobileViewport'
 
 type WalletPosition = 'right' | 'left'
 
@@ -44,21 +45,31 @@ export const useAppStore = defineStore('app', {
       walletPosition,
       compactMode,
     }) => {
-      const style: Partial<CSSStyleDeclaration> = {}
-      style.height = showWallet
-        ? expandWallet
-          ? compactMode
-            ? '200px'
-            : '80vh'
-          : '20px'
-        : '0'
-      style.width = showWallet ? (expandWallet ? '360px' : '100px') : '0'
-      style.right = walletPosition === 'right' ? '30px' : ''
-      style.left = walletPosition === 'left' ? '30px' : ''
-      style.bottom = expandWallet ? '30px' : '0'
-      style.transition = 'all 300ms ease-in-out'
-      style.position = 'fixed'
-      return style
+      return function getCompatibleStyles() {
+        const mobileViewport = isMobileViewport()
+        const style: Partial<CSSStyleDeclaration> = {}
+        style.height = showWallet
+          ? expandWallet
+            ? compactMode
+              ? '200px'
+              : '80vh'
+            : '20px'
+          : '0'
+        style.width = showWallet
+          ? expandWallet
+            ? mobileViewport
+              ? '100%'
+              : '360px'
+            : '100px'
+          : '0'
+        style.right =
+          walletPosition === 'right' && !mobileViewport ? '30px' : ''
+        style.left = walletPosition === 'left' && !mobileViewport ? '30px' : ''
+        style.bottom = expandWallet && !mobileViewport ? '30px' : '0'
+        style.transition = 'all 300ms ease-in-out'
+        style.position = 'fixed'
+        return style
+      }
     },
   },
   actions: {

From b7c935ccc13e1e03ce8a108ff4d9f2bdf07fda95 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 17 May 2023 13:44:08 +0530
Subject: [PATCH 047/153] Add mobile viewport utility

---
 src/utils/isMobileViewport.ts | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/utils/isMobileViewport.ts

diff --git a/src/utils/isMobileViewport.ts b/src/utils/isMobileViewport.ts
new file mode 100644
index 00000000..f6ddc3ec
--- /dev/null
+++ b/src/utils/isMobileViewport.ts
@@ -0,0 +1,3 @@
+export function isMobileViewport() {
+  return window.matchMedia('(max-device-width: 768px)').matches
+}

From acbcff0743bee7c4656c5ef60da01c7a4644c018 Mon Sep 17 00:00:00 2001
From: Karthik Durai <iamkarthiksiddarth@gmail.com>
Date: Wed, 17 May 2023 16:58:56 +0530
Subject: [PATCH 048/153] [AR-6163] show method name in summarised view (#315)

* show method in the description text

* fix badge placement based on position
---
 src/components/SignMessageCompact.vue | 15 ++++++++++++++-
 src/components/WalletButton.vue       |  6 +++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/components/SignMessageCompact.vue b/src/components/SignMessageCompact.vue
index 935fa507..2844d962 100644
--- a/src/components/SignMessageCompact.vue
+++ b/src/components/SignMessageCompact.vue
@@ -27,6 +27,18 @@ function getTitle(requestMethod: string) {
   }
   return 'Sign Message'
 }
+
+function getPermissionText(method, request) {
+  const { params } = request
+  const { chainName } = params[0]
+  if (method === 'wallet_addEthereumChain') {
+    return `Adding Chain - ${chainName}`
+  } else if (method === 'wallet_switchEthereumChain') {
+    return `Switch Chain - ${chainName}`
+  } else {
+    return methodAndAction[method]
+  }
+}
 </script>
 
 <template>
@@ -38,7 +50,8 @@ function getTitle(requestMethod: string) {
       <DateTime :datetime="request.receivedTime" />
     </div>
     <p class="font-normal text-sm sm:text-xs">
-      {{ appStore.name }} requests your permission.
+      {{ appStore.name }} requests your permission for
+      {{ getPermissionText(request.request.method, request.request) }}
     </p>
     <div class="flex justify-end space-x-2 text-sm">
       <button class="uppercase" @click="emits('reject')">Reject</button>
diff --git a/src/components/WalletButton.vue b/src/components/WalletButton.vue
index 1ee982d9..8f201822 100644
--- a/src/components/WalletButton.vue
+++ b/src/components/WalletButton.vue
@@ -27,7 +27,11 @@ const showRequestCountBadge = computed(() => {
 
 <template>
   <div class="h-full relative">
-    <div v-if="showRequestCountBadge" class="z-[999] absolute top-4 left-2">
+    <div
+      v-if="showRequestCountBadge"
+      class="z-[999] absolute top-4"
+      :class="[walletPosition === 'right' ? 'left-2' : 'right-2']"
+    >
       <RequestCountBadge :request-count="requestCount" />
     </div>
     <button

From aef0f8b33990fa83dceaaf59de802604b61ad9c4 Mon Sep 17 00:00:00 2001
From: makylfang <makyl@newfang.io>
Date: Wed, 17 May 2023 22:31:05 +0400
Subject: [PATCH 049/153] Updated auth-core version (#316)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5a2a5a1c..62e78f8f 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@arcana/auth": "^0.1.3",
-    "@arcana/auth-core": "^1.0.0-beta.6",
+    "@arcana/auth-core": "^1.0.0-beta.7",
     "@arcana/key-helper": "^1.0.0-beta.7",
     "@ethereumjs/tx": "^3.4.0",
     "@fontsource/montserrat": "^4.5.14",

From 97ea97e709796e75ebb3861d99ddd69e891799ac Mon Sep 17 00:00:00 2001
From: Karthik Durai <iamkarthiksiddarth@gmail.com>
Date: Thu, 18 May 2023 09:53:40 +0530
Subject: [PATCH 050/153] if there is no default chain, take first in list
 (#317)

---
 src/pages/loggedInView.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index bb729403..90e1ee53 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -239,7 +239,9 @@ async function setRpcConfigs() {
 
 async function getRpcConfig() {
   try {
-    let rpcConfig = enabledChainList.value.find((chain) => chain.defaultChain)
+    let rpcConfig =
+      enabledChainList.value.find((chain) => chain.defaultChain) ||
+      enabledChainList.value[0] // some time, chain list don't have default chain
     rpcStore.setSelectedRPCConfig(rpcConfig)
     rpcStore.setRpcConfig(rpcConfig)
     await getRequestHandler().setRpcConfig(rpcConfig)

From a9d12164d2ce0fb43bd48d61389f4c5f247d0403 Mon Sep 17 00:00:00 2001
From: Karthik Durai <iamkarthiksiddarth@gmail.com>
Date: Thu, 18 May 2023 11:55:17 +0530
Subject: [PATCH 051/153] comment out favicon display for now (#318)

---
 src/components/SendTokens.vue      | 4 ++--
 src/components/SendTransaction.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/SendTokens.vue b/src/components/SendTokens.vue
index be6982e0..447099df 100644
--- a/src/components/SendTokens.vue
+++ b/src/components/SendTokens.vue
@@ -301,10 +301,10 @@ function handleTokenChange(e) {
       <div class="space-y-1">
         <p class="text-xs text-zinc-400 font-semibold">Network</p>
         <p class="text-base sm:text-sm flex gap-2">
-          <img
+          <!-- <img
             :src="getImage(rpcStore.selectedRpcConfig.favicon)"
             class="w-6 h-6"
-          />
+          /> -->
           {{ rpcStore.selectedRpcConfig?.chainName }}
         </p>
       </div>
diff --git a/src/components/SendTransaction.vue b/src/components/SendTransaction.vue
index 8219467b..905646a2 100644
--- a/src/components/SendTransaction.vue
+++ b/src/components/SendTransaction.vue
@@ -107,10 +107,10 @@ function handleSetGasPrice(value) {
     <div class="space-y-1">
       <p class="text-xs text-zinc-400">Network</p>
       <p class="text-base sm:text-sm flex gap-2">
-        <img
+        <!-- <img
           :src="getImage(rpcStore.selectedRpcConfig.favicon)"
           class="w-6 h-6"
-        />
+        /> -->
         {{ rpcStore.selectedRpcConfig?.chainName }}
       </p>
     </div>

From 845642e0eb65597525d659d5547fed96016cb6b5 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 18 May 2023 13:33:23 +0530
Subject: [PATCH 052/153] Update send tokens

---
 src/App.vue                                |  11 +-
 src/assets/images/dark/collapse-arrow.svg  |   3 +
 src/assets/images/dark/forward-arrow.svg   |   3 +
 src/assets/images/light/collapse-arrow.svg |   3 +
 src/assets/images/light/forward-arrow.svg  |   3 +
 src/components/BaseModal.vue               |   3 +-
 src/components/BuyTokens.vue               | 110 +++++++------
 src/components/GasPrice.vue                |  86 +++++-----
 src/components/SendTokensPreview.vue       |  95 +++++------
 src/components/UserWallet.vue              |   2 +-
 src/index.css                              |   9 +-
 src/pages/SendTokens.vue                   | 178 +++++++++++----------
 tailwind.config.js                         |   4 +
 13 files changed, 258 insertions(+), 252 deletions(-)
 create mode 100644 src/assets/images/dark/collapse-arrow.svg
 create mode 100644 src/assets/images/dark/forward-arrow.svg
 create mode 100644 src/assets/images/light/collapse-arrow.svg
 create mode 100644 src/assets/images/light/forward-arrow.svg

diff --git a/src/App.vue b/src/App.vue
index e75fbb25..f2144de4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -67,7 +67,7 @@ watch(showRequestPage, (newValue) => {
 
 const showFooter = computed(() => {
   return (
-    (!['requests', 'MFARequired', 'MFARestore'].includes(
+    (!['requests', 'MFARequired', 'MFARestore', 'SendTokens'].includes(
       route.name as string
     ) ||
       (route.name === 'requests' && !requestStore.pendingRequest)) &&
@@ -90,7 +90,8 @@ function onClickOfHeader() {
     >
       <div class="flex justify-center mt-2 mb-2">
         <button class="flex flex-grow justify-center" @click="onClickOfHeader">
-          <img src="@/assets/images/collapse-arrow.svg" />
+          <img v-if="compactMode" :src="getImage('expand-arrow.svg')" />
+          <img v-else :src="getImage('collapse-arrow.svg')" />
         </button>
       </div>
       <WalletHeader />
@@ -100,7 +101,11 @@ function onClickOfHeader() {
       >
         <RouterView class="min-h-fullxs flex-grow" />
         <BaseModal v-if="modal.show" />
-        <img :src="getImage('secured-by-arcana.svg')" class="h-xs mb-2" />
+        <img
+          v-if="showFooter"
+          :src="getImage('secured-by-arcana.svg')"
+          class="h-xs mb-2"
+        />
       </div>
       <WalletFooter v-if="showFooter" />
     </div>
diff --git a/src/assets/images/dark/collapse-arrow.svg b/src/assets/images/dark/collapse-arrow.svg
new file mode 100644
index 00000000..275b1197
--- /dev/null
+++ b/src/assets/images/dark/collapse-arrow.svg
@@ -0,0 +1,3 @@
+<svg width="50" height="10" viewBox="0 0 50 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 2.99029C0 4.15885 0.824815 5.16496 1.97068 5.39414L24.0194 9.80388C24.6667 9.93335 25.3333 9.93335 25.9806 9.80388L48.0293 5.39414C49.1752 5.16496 50 4.15885 50 2.99029C50 1.44331 48.5847 0.283056 47.0678 0.586444L25.9806 4.80388C25.3333 4.93335 24.6667 4.93335 24.0194 4.80388L2.93222 0.586444C1.41528 0.283056 0 1.44331 0 2.99029Z" fill="#363636"/>
+</svg>
diff --git a/src/assets/images/dark/forward-arrow.svg b/src/assets/images/dark/forward-arrow.svg
new file mode 100644
index 00000000..e809e41a
--- /dev/null
+++ b/src/assets/images/dark/forward-arrow.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 12H20M20 12L14 18M20 12L14 6" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/collapse-arrow.svg b/src/assets/images/light/collapse-arrow.svg
new file mode 100644
index 00000000..275b1197
--- /dev/null
+++ b/src/assets/images/light/collapse-arrow.svg
@@ -0,0 +1,3 @@
+<svg width="50" height="10" viewBox="0 0 50 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 2.99029C0 4.15885 0.824815 5.16496 1.97068 5.39414L24.0194 9.80388C24.6667 9.93335 25.3333 9.93335 25.9806 9.80388L48.0293 5.39414C49.1752 5.16496 50 4.15885 50 2.99029C50 1.44331 48.5847 0.283056 47.0678 0.586444L25.9806 4.80388C25.3333 4.93335 24.6667 4.93335 24.0194 4.80388L2.93222 0.586444C1.41528 0.283056 0 1.44331 0 2.99029Z" fill="#363636"/>
+</svg>
diff --git a/src/assets/images/light/forward-arrow.svg b/src/assets/images/light/forward-arrow.svg
new file mode 100644
index 00000000..e809e41a
--- /dev/null
+++ b/src/assets/images/light/forward-arrow.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 12H20M20 12L14 18M20 12L14 6" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/BaseModal.vue b/src/components/BaseModal.vue
index eea8386f..ef991c40 100644
--- a/src/components/BaseModal.vue
+++ b/src/components/BaseModal.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 
 import { useModalStore } from '@/store/modal'
+import { getImage } from '@/utils/getImage'
 
 const canModalCollapse = ref(false)
 const modalStore = useModalStore()
@@ -20,7 +21,7 @@ function handleCollapse() {
     >
       <div class="flex justify-center">
         <button @click="handleCollapse">
-          <img src="@/assets/images/collapse-arrow.svg" />
+          <img :src="getImage('collapse-arrow.svg')" />
         </button>
       </div>
       <div id="modal-container" class="p-4"></div>
diff --git a/src/components/BuyTokens.vue b/src/components/BuyTokens.vue
index e6ad5f4e..fe43823d 100644
--- a/src/components/BuyTokens.vue
+++ b/src/components/BuyTokens.vue
@@ -103,21 +103,30 @@ function handleDone() {
         Close
       </button>
     </div>
-    <div v-else class="overflow-auto flex flex-col justify-between p-1">
-      <div class="flex flex-col space-y-3 sm:space-y-2">
-        <div class="flex justify-between">
-          <p class="text-xl sm:text-sm font-semibold">Select Provider</p>
-          <button class="h-auto" @click="emit('close')">
-            <img :src="getImage('close-icon')" alt="close icon" />
-          </button>
-        </div>
+    <div v-else class="flex flex-col p-1">
+      <div class="flex flex-col gap-3">
+        <p class="font-bold text-center text-xl">Select Provider</p>
         <p class="text-xs text-zinc-400">
           You will be taken to the provider website in a different tab once you
           choose the provider and click PROCEED.
         </p>
       </div>
-      <form class="flex flex-col gap-6 mt-8" @submit.prevent="handleBuy">
-        <div class="flex gap-3 items-center">
+      <form class="flex flex-col gap-2 mt-5" @submit.prevent="handleBuy">
+        <div
+          class="flex gap-3 p-4 items-center justify-between border border-1 border-gray-200 rounded-sm transition-all duration-300 ease-in-out"
+          :class="{
+            'opacity-60 cursor-not-allowed': !props.transakNetwork,
+            'hover:border-gray-100 cursor-pointer': props.transakNetwork,
+            'border-gray-100 bg-black-300': selectedProvider === 'transak',
+          }"
+          @click.stop="
+            props.transakNetwork ? (selectedProvider = 'transak') : void 0
+          "
+        >
+          <label for="Transak" class="flex gap-2 items-center cursor-pointer">
+            <img src="@/assets/images/transak.png" class="h-xl w-xl" />
+            <span class="text-base font-normal">Transak</span>
+          </label>
           <input
             id="Transak"
             v-model="selectedProvider"
@@ -125,18 +134,22 @@ function handleDone() {
             value="transak"
             name="provider"
             :disabled="!props.transakNetwork"
-            :class="{ 'opacity-80': !props.transakNetwork }"
+            class="grid p-0 place-content-center w-xs h-xs bg-gray-600 rounded-full appearance-none before:bg-white-100"
           />
-          <label
-            for="Transak"
-            class="flex gap-2 items-center cursor-pointer"
-            :class="{ 'opacity-50': !props.transakNetwork }"
-          >
-            <img src="@/assets/images/transak.png" class="h-7 w-7" />
-            <span class="text-base">Transak</span>
-          </label>
         </div>
-        <div class="flex gap-3 items-center">
+        <div
+          class="flex gap-3 p-4 items-center justify-between border border-1 border-gray-200 rounded-sm transition-all duration-300 ease-in-out"
+          :class="{
+            'opacity-60 cursor-not-allowed': !props.rampNetwork,
+            'hover:border-gray-100 cursor-pointer': props.rampNetwork,
+            'border-gray-100 bg-black-300': selectedProvider === 'ramp',
+          }"
+          @click.stop="props.rampNetwork ? (selectedProvider = 'ramp') : void 0"
+        >
+          <label for="Ramp" class="flex gap-2 items-center cursor-pointer">
+            <img src="@/assets/images/ramp.png" class="h-7 w-7" />
+            <span class="text-base">Ramp</span>
+          </label>
           <input
             id="Ramp"
             v-model="selectedProvider"
@@ -144,18 +157,28 @@ function handleDone() {
             value="ramp"
             name="provider"
             :disabled="!props.rampNetwork"
-            :class="{ 'opacity-80': !props.rampNetwork }"
+            class="grid p-0 place-content-center w-xs h-xs bg-gray-600 rounded-full appearance-none before:bg-white-100"
           />
+        </div>
+        <div
+          class="flex gap-3 p-4 items-center justify-between border border-1 border-gray-200 rounded-sm transition-all duration-300 ease-in-out"
+          :class="{
+            'opacity-60 cursor-not-allowed': !props.onRampMoney,
+            'hover:border-gray-100 cursor-pointer': props.onRampMoney,
+            'border-gray-100 bg-black-300': selectedProvider === 'onramp.money',
+          }"
+          @click.stop="
+            props.onRampMoney ? (selectedProvider = 'onramp.money') : void 0
+          "
+        >
           <label
-            for="Ramp"
+            for="OnRampMoney"
             class="flex gap-2 items-center cursor-pointer"
-            :class="{ 'opacity-50': !props.rampNetwork }"
+            :class="{ 'opacity-50': props.onRampMoney === false }"
           >
             <img src="@/assets/images/ramp.png" class="h-7 w-7" />
-            <span class="text-base">Ramp</span>
+            <span class="text-base">onramp.money</span>
           </label>
-        </div>
-        <div class="flex gap-3 items-center">
           <input
             id="OnRampMoney"
             v-model="selectedProvider"
@@ -163,20 +186,12 @@ function handleDone() {
             value="onramp.money"
             name="provider"
             :disabled="props.onRampMoney === false"
-            :class="{ 'opacity-80': !props.onRampMoney }"
+            class="grid p-0 place-content-center w-xs h-xs bg-gray-600 rounded-full appearance-none before:bg-white-100"
           />
-          <label
-            for="OnRampMoney"
-            class="flex gap-2 items-center cursor-pointer"
-            :class="{ 'opacity-50': props.onRampMoney === false }"
-          >
-            <img src="@/assets/images/ramp.png" class="h-7 w-7" />
-            <span class="text-base">onramp.money</span>
-          </label>
         </div>
-        <div class="flex">
+        <div class="flex mt-8">
           <button
-            class="flex-1 text-sm sm:text-xs rounded-xl text-white dark:bg-white bg-black dark:text-black h-9 sm:h-8 uppercase disabled:opacity-50 transition-opacity duration-300"
+            class="flex-1 btn-primary py-[10px] uppercase text-base font-bold"
             :disabled="!selectedProvider?.trim().length"
           >
             Proceed
@@ -188,23 +203,10 @@ function handleDone() {
 </template>
 
 <style scoped>
-input[type='radio'] {
-  display: grid;
-  place-content: center;
-  width: 1rem;
-  height: 1rem;
-  cursor: pointer;
-  background: #3b3b3b;
-  border-radius: 50%;
-  transform: translateX(0), matrix(-1, 0, 0, 1, 0, 0);
-  appearance: none;
-}
-
 input[type='radio']::before {
-  width: 0.75rem;
-  height: 0.75rem;
+  width: 10px;
+  height: 10px;
   content: '';
-  background: linear-gradient(180deg, #0085ff -4.5%, #29c8fa 100.1%);
   border-radius: 50%;
   transition: 120ms transform ease-in-out;
   transform: scale(0);
@@ -214,10 +216,6 @@ input[type='radio']:checked::before {
   transform: scale(1);
 }
 
-.modal-title {
-  font-size: var(--fs-500);
-}
-
 .modal-description {
   font-size: var(--fs-250);
   color: var(--fg-color-secondary);
diff --git a/src/components/GasPrice.vue b/src/components/GasPrice.vue
index be0c15bd..ebcc8316 100644
--- a/src/components/GasPrice.vue
+++ b/src/components/GasPrice.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
-import { onMounted, ref, watch } from 'vue'
+import { type Ref, onMounted, ref, watch } from 'vue'
 
-import GasPriceSlider from '@/components/GasPriceSlider.vue'
 import type { CurrencySymbol } from '@/services/exchangeRate.service'
 import { getExchangeRate } from '@/services/exchangeRate.service'
 import { GAS_AVAILABLE_CHAIN_IDS } from '@/services/gasPrice.service'
@@ -34,16 +33,13 @@ const props = defineProps({
   },
 })
 
-onMounted(init)
-
 const rpcStore = useRpcStore()
 
 const gasFee = ref(0)
 const transactionTime = ref(null)
 const conversionRate = ref('')
 const isGasPriceFocused = ref(false)
-
-const disableSlider = ref(true)
+const selectedGasMethod: Ref<'normal' | 'fast' | 'custom'> = ref('normal')
 
 const getConversionRateDebounced = debounce(getConversionRate)
 
@@ -54,14 +50,10 @@ watch(gasFee, () => {
 const getImage = useImage()
 const showCustomGasFeeInput = ref(false)
 
-const showSlider = GAS_AVAILABLE_CHAIN_IDS.includes(
+const hasGasStation = GAS_AVAILABLE_CHAIN_IDS.includes(
   Number(rpcStore.selectedChainId)
 )
 
-async function init() {
-  showCustomGasFeeInput.value = !showSlider
-}
-
 async function getConversionRate(gasFee) {
   if (rpcStore.currency === 'XAR') return (conversionRate.value = '0')
   if (!gasFee) return (conversionRate.value = '0')
@@ -80,7 +72,6 @@ async function getConversionRate(gasFee) {
 }
 
 function handleGasPriceSelect(value = '') {
-  disableSlider.value = false
   const type = value.toLowerCase()
   const { wait, price } = GAS_PRICE_SPEED_MAP[type]
   gasFee.value = Number((props.gasPrices[price] / 10).toFixed(9))
@@ -89,7 +80,6 @@ function handleGasPriceSelect(value = '') {
 }
 
 function handleCustomGasPriceInput(value) {
-  disableSlider.value = true
   const amountInputEl = document.querySelector(
     '#custom-gas-fee-amount'
   ) as HTMLInputElement
@@ -106,44 +96,48 @@ function handleCustomGasPriceInput(value) {
 </script>
 
 <template>
-  <div v-if="showSlider" class="space-y-[10px]">
-    <div class="flex flex-col justify-between">
-      <div class="space-x-1 flex items-baseline">
-        <span class="text-xs text-zinc-400">Gas Fees</span>
-        <div class="space-x-1">
-          <span class="sm:text-xs">{{ disableSlider ? '-' : gasFee }}</span>
-          <span class="text-xs">{{ GAS_FEE_UNIT }}</span>
-        </div>
-      </div>
-      <div class="space-x-1">
-        <span class="text-xs text-zinc-400">Transaction Time:</span>
-        <span class="text-xs">
-          ~{{ disableSlider ? '-' : transactionTime }} mins
+  <div class="flex flex-col gap-1">
+    <div class="flex justify-between items-baseline">
+      <span class="text-sm font-medium">Gas Fees</span>
+      <div class="text-xs font-normal">
+        <span class="text-gray-100">Transaction Time:</span>
+        <span class="text-white-100">
+          ~{{ hasGasStation ? '-' : transactionTime }} mins
         </span>
       </div>
     </div>
-    <div class="px-6">
-      <GasPriceSlider
-        :disable="disableSlider"
-        @select-gas-price="handleGasPriceSelect"
-      />
+    <div class="card flex p-1">
+      <div
+        class="p-1 w-full text-center text-gray-100 text-base font-normal cursor-pointer rounded-sm hover:bg-black-300"
+        :class="{
+          'bg-black-300 text-white-100': selectedGasMethod === 'normal',
+        }"
+        @click.stop="selectedGasMethod = 'normal'"
+      >
+        Normal
+      </div>
+      <div
+        class="p-1 w-full text-center text-gray-100 text-base font-normal cursor-pointer rounded-sm hover:bg-black-300"
+        :class="{
+          'cursor-not-allowed opacity-60 pointer-events-none': !hasGasStation,
+          'bg-black-300 text-white-100': selectedGasMethod === 'fast',
+        }"
+        @click.stop="hasGasStation ? (selectedGasMethod = 'fast') : void 0"
+      >
+        Fast
+      </div>
+      <div
+        class="p-1 w-full text-center text-gray-100 text-base font-normal cursor-pointer rounded-sm hover:bg-black-300"
+        :class="{
+          'bg-black-300 text-white-100': selectedGasMethod === 'custom',
+        }"
+        @click.stop="selectedGasMethod = 'custom'"
+      >
+        Custom
+      </div>
     </div>
   </div>
-  <button
-    v-if="showSlider"
-    class="flex justify-center items-center mx-auto"
-    style="margin-top: 2.5rem"
-    @click.prevent="showCustomGasFeeInput = !showCustomGasFeeInput"
-  >
-    <p class="text-xs">Advanced Option</p>
-    <img
-      :src="getImage('arrow-icon')"
-      alt="arrow icon"
-      class="w-4 transition-transform duration-500"
-      :class="{ 'rotate-180': showCustomGasFeeInput }"
-    />
-  </button>
-  <div v-if="showCustomGasFeeInput" class="space-y-1">
+  <div v-if="selectedGasMethod === 'custom'" class="space-y-1">
     <div class="space-x-1 mb-2 text-xs text-zinc-400">
       <span class="font-semibold">Base Fee:</span>
       <span class="text-black dark:text-white">{{ props.baseFee }} Gwei</span>
diff --git a/src/components/SendTokensPreview.vue b/src/components/SendTokensPreview.vue
index 11636927..dfcefd0b 100644
--- a/src/components/SendTokensPreview.vue
+++ b/src/components/SendTokensPreview.vue
@@ -3,9 +3,8 @@ import BigNumber from 'bignumber.js'
 
 import { PreviewData } from '@/models/SendTokenPreview'
 import { useRpcStore } from '@/store/rpc'
-import { useImage } from '@/utils/useImage'
+import { getImage } from '@/utils/getImage'
 
-const getImage = useImage()
 const rpcStore = useRpcStore()
 
 const emits = defineEmits(['close', 'submit'])
@@ -27,69 +26,55 @@ const sendAmount =
     : 0
 
 const totalAmount = sendAmount + txFees
+
+function truncateAddress(address: string) {
+  return `${address.slice(0, 5)}....${address.slice(-5)}`
+}
 </script>
 
 <template>
-  <div class="space-y-3 overflow-auto flex flex-col">
-    <div class="flex flex-col space-y-3 sm:space-y-2">
-      <p class="text-xl sm:text-sm font-semibold">Preview</p>
-    </div>
-    <div class="space-y-1">
-      <p class="text-xs text-zinc-400">Network</p>
-      <p class="text-base sm:text-sm">
-        {{ rpcStore.selectedRpcConfig?.chainName }}
-      </p>
-    </div>
-    <div class="space-y-1">
-      <p class="text-xs text-zinc-400">Sender’s Wallet Address</p>
-      <p class="text-base truncate">
-        {{ props.previewData.senderWalletAddress }}
-      </p>
-    </div>
-    <div class="flex justify-center">
-      <img :src="getImage('arrow-down-icon')" alt="arrow down icon" />
-    </div>
-    <div class="space-y-1">
-      <p class="text-xs text-zinc-400">Recipient’s Wallet Address</p>
-      <p class="text-sm truncate">
-        {{ props.previewData.recipientWalletAddress }}
-      </p>
-    </div>
-    <div class="space-y-3">
-      <div class="flex justify-between text-xs text-zinc-400">
-        <p>Items</p>
-        <p>Amount</p>
+  <div class="flex flex-col justify-between">
+    <div class="flex flex-col gap-7">
+      <div class="relative flex justify-center items-center">
+        <button class="absolute left-0" @click.stop="emits('close')">
+          <img :src="getImage('back-arrow.svg')" class="w-6 h-6" />
+        </button>
+        <span class="text-lg font-bold">Confirm Transfer</span>
       </div>
-      <div class="space-y-[10px]">
-        <div class="flex justify-between text-sm sm:text-xs font-normal">
-          <p>Send Amount</p>
-          <p>
-            {{ props.previewData.amount }}
-            {{ props.previewData.selectedToken }}
-          </p>
+      <div class="flex justify-between items-center">
+        <div class="flex flex-col gap-1">
+          <span class="text-sm font-medium text-gray-100"
+            >Sender’s Address</span
+          >
+          <span class="text-base">
+            {{ truncateAddress(props.previewData.senderWalletAddress) }}
+          </span>
         </div>
-        <div class="flex justify-between text-sm sm:text-xs font-normal">
-          <p>Gas Fees</p>
-          <p>{{ txFees }} {{ nativeCurrency }}</p>
+        <img :src="getImage('forward-arrow.svg')" class="w-6 h-6" />
+        <div class="flex flex-col gap-1">
+          <span class="text-sm font-medium text-gray-100"
+            >Recipient’s Address</span
+          >
+          <span class="text-base">
+            {{ truncateAddress(props.previewData.recipientWalletAddress) }}
+          </span>
         </div>
       </div>
-      <div
-        class="flex justify-between text-sm sm:text-xs font-normal border-y-[1px] border-x-0 border-zinc-400 py-4"
-      >
-        <p>Total:</p>
-        <p>
-          {{ new BigNumber(totalAmount).toFixed() }}
-          {{ nativeCurrency }}
-        </p>
+      <div class="flex flex-col gap-5">
+        <div class="flex justify-between">
+          <span class="text-base font-normal text-gray-100">Send Amount</span>
+          <span class="text-base"
+            >{{ props.previewData.amount }}
+            {{ props.previewData.selectedToken }}</span
+          >
+        </div>
+        <div class="flex justify-between">
+          <span class="text-base font-normal text-gray-100">Gas Fees</span>
+          <span class="text-base">{{ txFees }} {{ nativeCurrency }}</span>
+        </div>
       </div>
     </div>
     <div class="flex justify-between">
-      <button
-        class="text-sm sm:text-xs rounded-xl border-2 border-black dark:border-white bg-transparent text-black dark:text-white w-36 h-9 sm:w-20 sm:h-8 uppercase"
-        @click="emits('close')"
-      >
-        Back
-      </button>
       <button
         class="text-sm sm:text-xs rounded-xl text-white dark:bg-white bg-black dark:text-black w-36 h-9 sm:w-20 sm:h-8 uppercase"
         @click="emits('submit')"
diff --git a/src/components/UserWallet.vue b/src/components/UserWallet.vue
index ddd96314..75aa5952 100644
--- a/src/components/UserWallet.vue
+++ b/src/components/UserWallet.vue
@@ -223,7 +223,7 @@ watch(
         </button>
       </div>
     </div>
-    <Teleport v-if="showModal" to="#modal-container">
+    <Teleport v-if="modalStore.show" to="#modal-container">
       <AddNetwork
         v-if="showModal === 'add-network'"
         @close="openAddNetwork(false)"
diff --git a/src/index.css b/src/index.css
index 6e9d60a7..27ece784 100644
--- a/src/index.css
+++ b/src/index.css
@@ -44,6 +44,11 @@
           transition-all duration-200 ease-in-out
           disabled:opacity-60;
   }
+
+  input,
+  select {
+    @apply bg-transparent outline-none shadow-none dark:placeholder:text-gray-100 font-normal text-base p-[10px];
+  }
 }
 
 @layer components {
@@ -71,11 +76,11 @@
   }
 
   .input-field {
-    @apply dark:bg-gray-300 rounded-sm p-[10px];
+    @apply dark:bg-gray-300 rounded-sm flex items-center;
   }
 
   .input-active {
-    @apply outline-1 dark:outline-white-200;
+    @apply outline-1 dark:outline-white-200 outline;
   }
 }
 
diff --git a/src/pages/SendTokens.vue b/src/pages/SendTokens.vue
index b2daeb29..0e8a694b 100644
--- a/src/pages/SendTokens.vue
+++ b/src/pages/SendTokens.vue
@@ -6,7 +6,7 @@ import { useToast } from 'vue-toastification'
 
 import AppLoader from '@/components/AppLoader.vue'
 import GasPrice from '@/components/GasPrice.vue'
-// import SendTokensPreview from '@/components/SendTokensPreview.vue'
+import SendTokensPreview from '@/components/SendTokensPreview.vue'
 import {
   getGasPrice,
   GAS_AVAILABLE_CHAIN_IDS,
@@ -20,14 +20,12 @@ import { convertGweiToEth } from '@/utils/gweiToEth'
 import { getRequestHandler } from '@/utils/requestHandlerSingleton'
 import { getStorage } from '@/utils/storageWrapper'
 import { truncateToTwoDecimals } from '@/utils/truncateToTwoDecimal'
-import { useImage } from '@/utils/useImage'
 
 const showPreview = ref(false)
 const rpcStore = useRpcStore()
 const userStore = useUserStore()
 const activitiesStore = useActivitiesStore()
 const router = useRouter()
-const getImageOld = useImage()
 const toast = useToast()
 const isWalletAddressFocused = ref(false)
 const isAmountFocused = ref(false)
@@ -271,111 +269,115 @@ function handleTokenChange(e) {
   <div v-if="loader.show" class="h-full flex justify-center items-center">
     <AppLoader :message="loader.message" />
   </div>
-  <div v-else class="flex flex-col gap-8">
+  <SendTokensPreview
+    v-else-if="showPreview"
+    :preview-data="{
+      senderWalletAddress: userStore.walletAddress,
+      recipientWalletAddress: setHexPrefix(recipientWalletAddress),
+      amount,
+      gasFee: gasFeeInEth,
+      selectedToken: selectedToken.symbol,
+      estimatedGas,
+    }"
+    @close="showPreview = false"
+    @submit="handleSendToken"
+  />
+  <div v-else class="flex flex-col justify-between">
     <div class="relative flex justify-center items-center">
       <button class="absolute left-0" @click.stop="router.go(-1)">
         <img :src="getImage('back-arrow.svg')" class="w-6 h-6" />
       </button>
       <span class="text-lg font-bold">Send Token</span>
     </div>
-    <form class="flex flex-col gap-8" @submit.prevent="void 0">
-      <label class="text-sm font-medium" for="recipientWalletAddress">
-        Recipient’s Wallet Address
-      </label>
-      <input
-        id="recipientWalletAddress"
-        v-model="recipientWalletAddress"
-        required
-        type="text"
-        class="input-field font-normal text-base"
-        :class="{ 'input-field-active': isWalletAddressFocused }"
-        placeholder="Enter Recipient’s Wallet Address"
-        @focus="isWalletAddressFocused = true"
-        @blur="isWalletAddressFocused = false"
-      />
-      <div class="space-y-1">
-        <div class="flex justify-between sm:flex-col sm:space-y-1">
-          <label class="text-xs text-zinc-400 font-semibold" for="amount">
-            Amount
+    <form
+      class="flex flex-col flex-grow justify-between"
+      @submit.prevent="showPreview = true"
+    >
+      <div class="flex flex-col gap-7">
+        <div class="flex flex-col gap-1">
+          <label class="text-sm font-medium" for="recipientWalletAddress">
+            Recipient’s Wallet Address
           </label>
-          <p class="space-x-1 text-xs text-zinc-400">
-            <span class="font-semibold">Total Balance:</span>
-            <span :title="selectedTokenBalance">{{
-              truncateToTwoDecimals(selectedTokenBalance)
-            }}</span>
-          </p>
-        </div>
-        <div
-          class="flex space-x-1 p-2 sm:p-1 input rounded-lg"
-          :class="{
-            'outline-black dark:outline-white outline-1 outline':
-              isAmountFocused,
-          }"
-        >
           <input
-            id="amount"
-            v-model="amount"
-            autocomplete="off"
+            id="recipientWalletAddress"
+            v-model="recipientWalletAddress"
             required
             type="text"
-            class="text-base sm:text-sm bg-transparent w-full rounded-lg border-none outline-none"
-            placeholder="0.5"
-            @focus="isAmountFocused = true"
-            @blur="isAmountFocused = false"
+            class="input-field"
+            :class="{ 'input-active': isWalletAddressFocused }"
+            placeholder="Enter Recipient’s Wallet Address"
+            @focus="isWalletAddressFocused = true"
+            @blur="isWalletAddressFocused = false"
           />
-          <div
-            v-if="tokenList.length"
-            class="p-2"
-            :class="{
-              'border-l-[1px] border-l-slate-400 px-1': tokenList.length,
-            }"
-          >
-            <select
-              :model-value="selectedToken.symbol"
-              name="tokens"
-              class="bg-transparent outline-none w-[6ch] text-ellipsis whitespace-nowrap overflow-hidden"
-              @focus="isAmountFocused = true"
-              @blur="isAmountFocused = false"
-              @change="handleTokenChange"
+        </div>
+        <div class="flex gap-2">
+          <div class="flex flex-col gap-1">
+            <label for="amount" class="text-sm font-medium">Amount</label>
+            <div
+              class="input-field flex"
+              :class="{ 'input-active': isAmountFocused }"
             >
-              <option
-                v-for="token in tokenList"
-                :key="token.address"
-                class="text-black hover:text-white"
-                :value="JSON.stringify(token)"
+              <input
+                id="amount"
+                v-model="amount"
+                autocomplete="off"
+                required
+                type="text"
+                placeholder="0"
+                @focus="isAmountFocused = true"
+                @blur="isAmountFocused = false"
+              />
+              <button
+                class="btn-primary uppercase m-1 px-3 py-2 font-medium text-xs"
+                type="button"
+                @click.stop="void 0"
+              >
+                Max
+              </button>
+            </div>
+            <div class="text-gray-100 text-xs font-normal">
+              Total Balance:
+              <span class="text-white-100"
+                >{{ Number(selectedTokenBalance) }}
+                {{ selectedToken.symbol }}</span
+              >
+            </div>
+          </div>
+          <div class="flex flex-col gap-1 flex-grow">
+            <label for="tokens" class="text-sm font-medium">Token</label>
+            <div v-if="tokenList.length" class="input-field pt-[1px]">
+              <select
+                :model-value="selectedToken.symbol"
+                name="tokens"
+                class="pr-0 mr-[10px] w-full"
+                @change="handleTokenChange"
               >
-                {{ token.symbol }}
-              </option>
-            </select>
+                <option
+                  v-for="token in tokenList"
+                  :key="token.address"
+                  class="text-black hover:text-white"
+                  :value="JSON.stringify(token)"
+                >
+                  {{ token.symbol }}
+                </option>
+              </select>
+            </div>
           </div>
         </div>
+        <GasPrice
+          :gas-price="gasFeeInGwei"
+          :gas-prices="gasPrices"
+          :base-fee="baseFee"
+          @gas-price-input="handleSetGasPrice"
+        />
       </div>
-      <GasPrice
-        :gas-price="gasFeeInGwei"
-        :gas-prices="gasPrices"
-        :base-fee="baseFee"
-        @gas-price-input="handleSetGasPrice"
-      />
-      <div class="flex justify-center">
+      <div class="flex">
         <button
-          class="text-sm sm:text-xs rounded-xl text-white dark:bg-white bg-black dark:text-black w-36 h-9 sm:w-20 sm:h-8 uppercase"
+          class="btn-primary uppercase p-[10px] font-bold text-base flex-grow text-center"
         >
-          Proceed
+          Preview
         </button>
       </div>
     </form>
-    <!-- <SendTokensPreview
-      v-if="showPreview"
-      :preview-data="{
-        senderWalletAddress: userStore.walletAddress,
-        recipientWalletAddress: setHexPrefix(recipientWalletAddress),
-        amount,
-        gasFee: gasFeeInEth,
-        selectedToken: selectedToken.symbol,
-        estimatedGas,
-      }"
-      @close="showPreview = false"
-      @submit="handleSendToken"
-    /> -->
   </div>
 </template>
diff --git a/tailwind.config.js b/tailwind.config.js
index b6d5c7fb..0cf954c9 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -39,6 +39,7 @@ module.exports = {
           300: '#313131',
           400: '#dcdcdc',
           500: '#2c2c2c',
+          600: '#3b3b3b',
         },
       },
       width: {
@@ -76,6 +77,9 @@ module.exports = {
           100: 'rgba(126, 126, 126, 0.25)',
         },
       },
+      content: {
+        blank: '""',
+      },
     },
   },
 }

From 533d59b38a75b1711212f23ec692515389f1ca51 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 18 May 2023 16:58:10 +0530
Subject: [PATCH 053/153] Add slider

---
 src/assets/images/dark/slider-right.svg  |   3 +
 src/assets/images/light/slider-right.svg |   3 +
 src/components/SendTokensPreview.vue     |  10 +-
 src/components/SwipeToAction.vue         | 172 +++++++++++++++++++++++
 src/pages/SendTokens.vue                 |   2 +-
 5 files changed, 181 insertions(+), 9 deletions(-)
 create mode 100644 src/assets/images/dark/slider-right.svg
 create mode 100644 src/assets/images/light/slider-right.svg
 create mode 100644 src/components/SwipeToAction.vue

diff --git a/src/assets/images/dark/slider-right.svg b/src/assets/images/dark/slider-right.svg
new file mode 100644
index 00000000..dee928e6
--- /dev/null
+++ b/src/assets/images/dark/slider-right.svg
@@ -0,0 +1,3 @@
+<svg width="8" height="12" viewBox="0 0 8 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.5 11L6.5 6L1.5 1" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/slider-right.svg b/src/assets/images/light/slider-right.svg
new file mode 100644
index 00000000..dee928e6
--- /dev/null
+++ b/src/assets/images/light/slider-right.svg
@@ -0,0 +1,3 @@
+<svg width="8" height="12" viewBox="0 0 8 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.5 11L6.5 6L1.5 1" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/SendTokensPreview.vue b/src/components/SendTokensPreview.vue
index dfcefd0b..b495c1af 100644
--- a/src/components/SendTokensPreview.vue
+++ b/src/components/SendTokensPreview.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import BigNumber from 'bignumber.js'
 
+import SwipeToAction from '@/components/SwipeToAction.vue'
 import { PreviewData } from '@/models/SendTokenPreview'
 import { useRpcStore } from '@/store/rpc'
 import { getImage } from '@/utils/getImage'
@@ -74,13 +75,6 @@ function truncateAddress(address: string) {
         </div>
       </div>
     </div>
-    <div class="flex justify-between">
-      <button
-        class="text-sm sm:text-xs rounded-xl text-white dark:bg-white bg-black dark:text-black w-36 h-9 sm:w-20 sm:h-8 uppercase"
-        @click="emits('submit')"
-      >
-        Send
-      </button>
-    </div>
+    <SwipeToAction @success="emits('submit')" />
   </div>
 </template>
diff --git a/src/components/SwipeToAction.vue b/src/components/SwipeToAction.vue
new file mode 100644
index 00000000..389e1285
--- /dev/null
+++ b/src/components/SwipeToAction.vue
@@ -0,0 +1,172 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+
+import { getImage } from '@/utils/getImage'
+
+type SwipeToActionProps = {
+  message?: string
+}
+const props = defineProps<SwipeToActionProps>()
+const emit = defineEmits(['success'])
+const translateUntil = ref('calc(-80%)')
+const isDragging = ref(false)
+const swiperEl = ref(null)
+
+function handleDrag(e) {
+  if (isDragging.value) {
+    const swiperX = swiperEl.value.getBoundingClientRect().x
+    const swiperContainer = swiperEl.value.parentElement.getBoundingClientRect()
+    if (e.clientX >= swiperContainer.right || swiperX >= swiperContainer.x) {
+      translateUntil.value = 'calc(0%)'
+      emit('success')
+      return
+    }
+    let clientX
+    if (e.type === 'touchmove') {
+      clientX = e.touches[0].clientX
+    } else {
+      clientX = e.clientX
+    }
+    translateUntil.value = `calc(-100% + ${clientX}px)`
+  }
+}
+
+function handleDragEnd() {
+  const swiperX = swiperEl.value.getBoundingClientRect().x
+  const swiperContainerX =
+    swiperEl.value.parentElement.getBoundingClientRect().x
+  if (swiperX < swiperContainerX - 60) {
+    translateUntil.value = 'calc(-80%)'
+  } else {
+    translateUntil.value = 'calc(0%)'
+    emit('success')
+  }
+  isDragging.value = false
+}
+
+function handleDragStart(e) {
+  if (e.clientX <= swiperEl.value.getBoundingClientRect().right) {
+    isDragging.value = true
+  }
+}
+</script>
+
+<template>
+  <div class="bg-gray-300 rounded-sm p-[2px]">
+    <div
+      class="relative rounded-sm overflow-hidden"
+      @touchstart="handleDragStart"
+      @touchend="handleDragEnd"
+      @mousedown="handleDragStart"
+      @mouseup="handleDragEnd"
+      @mousemove="handleDrag"
+      @touchmove="handleDrag"
+    >
+      <div
+        class="flex items-center justify-center text-xs font-normal text-gray-100 p-[10px]"
+      >
+        {{ props.message || 'Swipe to Continue' }}
+      </div>
+      <div
+        ref="swiperEl"
+        class="absolute btn-primary inset-0 z-10 cursor-pointer transition-all duration-300 ease-in-out flex justify-end"
+        :style="{ transform: `translateX(${translateUntil})` }"
+      >
+        <div class="flex items-center justify-center w-[20%]">
+          <img
+            :src="getImage('slider-right.svg')"
+            class="opacity-0 animate-1"
+          />
+          <img
+            :src="getImage('slider-right.svg')"
+            class="opacity-0 animate-2"
+          />
+          <img
+            :src="getImage('slider-right.svg')"
+            class="opacity-0 animate-3"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.animate-1 {
+  animation: animate-1 2.4s infinite linear 1.7s;
+}
+
+.animate-2 {
+  animation: animate-2 2.4s infinite linear 0.9s;
+}
+
+.animate-3 {
+  animation: animate-3 2.4s infinite linear 0.1s;
+}
+
+@keyframes animate-1 {
+  0% {
+    opacity: 1;
+    transform: translate(0);
+  }
+
+  90% {
+    opacity: 0;
+    transform: translate(200%);
+  }
+
+  95% {
+    opacity: 0;
+    transform: translate(0);
+  }
+
+  100% {
+    opacity: 1;
+    transform: translate(0);
+  }
+}
+
+@keyframes animate-2 {
+  0% {
+    opacity: 1;
+    transform: translate(-100%);
+  }
+
+  90% {
+    opacity: 0;
+    transform: translate(100%);
+  }
+
+  95% {
+    opacity: 0;
+    transform: translate(-100%);
+  }
+
+  100% {
+    opacity: 1;
+    transform: translate(-100%);
+  }
+}
+
+@keyframes animate-3 {
+  0% {
+    opacity: 1;
+    transform: translate(-200%);
+  }
+
+  90% {
+    opacity: 0;
+    transform: translate(0);
+  }
+
+  95% {
+    opacity: 0;
+    transform: translate(-200%);
+  }
+
+  100% {
+    opacity: 1;
+    transform: translate(-200%);
+  }
+}
+</style>
diff --git a/src/pages/SendTokens.vue b/src/pages/SendTokens.vue
index 0e8a694b..5f110593 100644
--- a/src/pages/SendTokens.vue
+++ b/src/pages/SendTokens.vue
@@ -205,6 +205,7 @@ async function handleSendToken() {
         recipientAddress: setHexPrefix(recipientWalletAddress.value),
       })
     }
+    clearForm()
     toast.success('Tokens sent Successfully')
   } catch (err: any) {
     if (err && err.reason) {
@@ -213,7 +214,6 @@ async function handleSendToken() {
   } finally {
     showPreview.value = false
     hideLoader()
-    clearForm()
   }
 }
 

From ad5d39279941c0cb812f7c61cfe6e3b02f6a0fe2 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 18 May 2023 17:01:44 +0530
Subject: [PATCH 054/153] Add swipe message

---
 src/components/SendTokensPreview.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/SendTokensPreview.vue b/src/components/SendTokensPreview.vue
index b495c1af..2b0ffb3b 100644
--- a/src/components/SendTokensPreview.vue
+++ b/src/components/SendTokensPreview.vue
@@ -75,6 +75,6 @@ function truncateAddress(address: string) {
         </div>
       </div>
     </div>
-    <SwipeToAction @success="emits('submit')" />
+    <SwipeToAction message="Swipe to Transfer" @success="emits('submit')" />
   </div>
 </template>

From c1b11af564729c6064c87eef80183e45810d84f8 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 18 May 2023 17:20:19 +0530
Subject: [PATCH 055/153] Add code to reset modal on close

---
 src/components/BaseModal.vue    | 5 ++++-
 src/components/UserWallet.vue   | 7 +++++++
 src/components/WalletHeader.vue | 9 ++++++++-
 src/pages/SendTokens.vue        | 2 +-
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/components/BaseModal.vue b/src/components/BaseModal.vue
index ef991c40..01bc5167 100644
--- a/src/components/BaseModal.vue
+++ b/src/components/BaseModal.vue
@@ -4,11 +4,14 @@ import { ref } from 'vue'
 import { useModalStore } from '@/store/modal'
 import { getImage } from '@/utils/getImage'
 
+const modalContainer = ref(null)
+
 const canModalCollapse = ref(false)
 const modalStore = useModalStore()
 
 function handleCollapse() {
   canModalCollapse.value = true
+  modalContainer.value.innerHTMl = ''
   setTimeout(() => modalStore.setShowModal(false), 300)
 }
 </script>
@@ -24,7 +27,7 @@ function handleCollapse() {
           <img :src="getImage('collapse-arrow.svg')" />
         </button>
       </div>
-      <div id="modal-container" class="p-4"></div>
+      <div id="modal-container" ref="modalContainer" class="p-4"></div>
     </div>
   </div>
 </template>
diff --git a/src/components/UserWallet.vue b/src/components/UserWallet.vue
index 75aa5952..38ea26e4 100644
--- a/src/components/UserWallet.vue
+++ b/src/components/UserWallet.vue
@@ -165,6 +165,13 @@ watch(
     getCurrencyExchangeRate()
   }
 )
+
+watch(
+  () => modalStore.show,
+  (show) => {
+    if (!show) showModal.value = false
+  }
+)
 </script>
 
 <template>
diff --git a/src/components/WalletHeader.vue b/src/components/WalletHeader.vue
index 9b9c07eb..9b045087 100644
--- a/src/components/WalletHeader.vue
+++ b/src/components/WalletHeader.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, type Ref } from 'vue'
+import { ref, type Ref, watch } from 'vue'
 
 import ReceiveTokens from '@/components/ReceiveTokens.vue'
 import { useAppStore } from '@/store/app'
@@ -16,6 +16,13 @@ function openReceiveTokens(open) {
   modalStore.setShowModal(open)
   showModal.value = open ? 'receive' : false
 }
+
+watch(
+  () => modalStore.show,
+  (show) => {
+    if (!show) showModal.value = false
+  }
+)
 </script>
 
 <template>
diff --git a/src/pages/SendTokens.vue b/src/pages/SendTokens.vue
index 5f110593..3e584b70 100644
--- a/src/pages/SendTokens.vue
+++ b/src/pages/SendTokens.vue
@@ -290,7 +290,7 @@ function handleTokenChange(e) {
       <span class="text-lg font-bold">Send Token</span>
     </div>
     <form
-      class="flex flex-col flex-grow justify-between"
+      class="flex flex-col flex-grow justify-between mt-8"
       @submit.prevent="showPreview = true"
     >
       <div class="flex flex-col gap-7">

From 8943735b9a23a6bfc9d013ab15515010f119a0b3 Mon Sep 17 00:00:00 2001
From: Karthik Durai <iamkarthiksiddarth@gmail.com>
Date: Thu, 18 May 2023 17:21:28 +0530
Subject: [PATCH 056/153] fix race condition that shrinks wallet (#320)

---
 src/utils/requestManagement.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/utils/requestManagement.ts b/src/utils/requestManagement.ts
index 24b05857..d0ae3fd8 100644
--- a/src/utils/requestManagement.ts
+++ b/src/utils/requestManagement.ts
@@ -61,7 +61,10 @@ async function watchRequestQueue(keeper) {
         if (request) await processRequest(request, keeper)
         if (appMode === AppMode.Widget && pendingRequestCount === 0) {
           if (appStore.sdkVersion !== 'v3') connectionInstance.closePopup()
-        } else if (pendingRequestCount === 0) {
+        } else if (
+          pendingRequestCount === 0 &&
+          requirePermission(request?.request, 1)
+        ) {
           appStore.expandWallet = false
           appStore.compactMode = false
         }

From 503ae320d11a54e8599fb3b94b65f690632a6267 Mon Sep 17 00:00:00 2001
From: Karthik Durai <iamkarthiksiddarth@gmail.com>
Date: Fri, 19 May 2023 10:19:12 +0530
Subject: [PATCH 057/153] [hot-fix] build error (#321)

* get method from req, check if it needs permission

* add require permission import back
---
 src/utils/requestManagement.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/utils/requestManagement.ts b/src/utils/requestManagement.ts
index d0ae3fd8..d51f8b60 100644
--- a/src/utils/requestManagement.ts
+++ b/src/utils/requestManagement.ts
@@ -6,7 +6,7 @@ import { watch } from 'vue'
 import { useToast } from 'vue-toastification'
 
 import type { AssetContract } from '@/models/Asset'
-import { requirePermission } from '@/models/Connection'
+import { PERMISSIONS, requirePermission } from '@/models/Connection'
 import { router } from '@/routes'
 import { NFTDB } from '@/services/nft.service'
 import { store } from '@/store'
@@ -59,12 +59,10 @@ async function watchRequestQueue(keeper) {
       if (processQueue.length > 0) {
         const request = processQueue.shift()
         if (request) await processRequest(request, keeper)
+        const method = request?.request.method
         if (appMode === AppMode.Widget && pendingRequestCount === 0) {
           if (appStore.sdkVersion !== 'v3') connectionInstance.closePopup()
-        } else if (
-          pendingRequestCount === 0 &&
-          requirePermission(request?.request, 1)
-        ) {
+        } else if (pendingRequestCount === 0 && method && PERMISSIONS[method]) {
           appStore.expandWallet = false
           appStore.compactMode = false
         }

From b162dbffeed373f56b2dca0e9ea5a54679d51afe Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 19 May 2023 16:05:07 +0530
Subject: [PATCH 058/153] Update profile screen

---
 src/pages/profileScreen.vue | 148 +++++++++++++++++-------------------
 1 file changed, 70 insertions(+), 78 deletions(-)

diff --git a/src/pages/profileScreen.vue b/src/pages/profileScreen.vue
index 1715173e..0224270c 100644
--- a/src/pages/profileScreen.vue
+++ b/src/pages/profileScreen.vue
@@ -18,6 +18,7 @@ import { useUserStore } from '@/store/user'
 import { AUTH_URL } from '@/utils/constants'
 import { downloadFile } from '@/utils/downloadFile'
 import { getAuthProvider } from '@/utils/getAuthProvider'
+import { getImage } from '@/utils/getImage'
 import { getWindowFeatures } from '@/utils/popupProps'
 import { getStorage } from '@/utils/storageWrapper'
 
@@ -163,90 +164,81 @@ onBeforeRouteLeave((to) => {
   <div v-if="loader.show" class="flex justify-center items-center flex-1">
     <AppLoader :message="loader.message" />
   </div>
-  <div v-else class="flex-grow">
-    <div class="wallet__card rounded-[10px] flex flex-1 flex-col min-h-full">
-      <div
-        class="flex flex-col items-center min-h-full p-4 sm:p-2 space-y-5 sm:space-y-2 flex-grow"
-      >
-        <h1 class="home__title w-full text-left font-semibold">Welcome</h1>
-        <div
-          class="home__body-container flex flex-col w-full h-full text-left space-y-4 sm:space-y-2 debossed-card flex-grow"
-        >
-          <div v-if="name" class="flex flex-col gap-1">
-            <p class="home__body-content-label">Name</p>
-            <p class="home__body-content-value text-ellipsis overflow-hidden">
-              {{ name }}
-            </p>
-          </div>
-          <div class="flex flex-col gap-1">
-            <p class="home__body-content-label">Email ID</p>
-            <p class="home__body-content-value text-ellipsis overflow-hidden">
-              {{ email }}
-            </p>
-          </div>
-          <div class="flex flex-col gap-1">
-            <p class="home__body-content-label">Network</p>
-            <p class="home__body-content-value">
-              {{ selectedRpcConfig?.chainName }}
-            </p>
-          </div>
-          <div class="flex flex-col gap-1">
-            <p class="home__body-content-label">Wallet Address</p>
-            <p class="home__body-content-value">
-              <span>{{ walletAddressShrinked }}</span>
-              <img
-                src="@/assets/images/copy.svg"
-                alt="Click to copy"
-                class="w-6 aspect-square ml-3 cursor-pointer invert dark:invert-0"
-                @click.stop="
-                  copyToClipboard(walletAddress, 'Wallet address copied')
-                "
-              />
-            </p>
-          </div>
-          <div class="flex flex-col gap-1">
-            <p class="home__body-content-label">Private Key</p>
-            <button
-              class="home__body-content-value h-max w-max"
-              @click.stop="handleShowPrivateKeyCautionModal"
-            >
-              <span>Export Key</span>
-              <img
-                src="@/assets/images/export.svg"
-                alt="Click to export"
-                class="w-6 aspect-square ml-3 invert dark:invert-0"
-              />
-            </button>
-          </div>
-          <div class="flex flex-col gap-1">
-            <p class="home__body-content-label">Enhance Wallet Security</p>
-            <button
-              v-if="!user.hasMfa"
-              class="home__body-content-value h-max w-max"
-              @click.stop="handleShowMFAProceedModal(true)"
-            >
-              <span v-if="true">Setup Now</span>
-              <span v-else>Update Security Questions</span>
-              <img
-                src="@/assets/images/export.svg"
-                alt="Click to export"
-                class="w-6 aspect-square ml-3 invert dark:invert-0"
-              />
-            </button>
-            <span v-else class="home__body-content-value h-max w-max"
-              >In use</span
-            >
-          </div>
+  <div v-else class="flex-grow flex flex-col gap-5">
+    <div class="flex justify-center align-center">
+      <span class="text-lg font-bold">Profile</span>
+    </div>
+    <div class="card p-4 flex flex-col gap-5">
+      <div v-if="name" class="flex flex-col gap-1">
+        <span class="text-sm text-gray-100">Name</span>
+        <span class="text-lg font-bold">
+          {{ name }}
+        </span>
+      </div>
+      <div class="flex flex-col gap-1">
+        <span class="text-sm text-gray-100">Email ID</span>
+        <span class="text-lg font-bold">
+          {{ email }}
+        </span>
+      </div>
+      <div class="flex flex-col gap-1">
+        <span class="text-sm text-gray-100">Wallet Address</span>
+        <div class="flex gap-1">
+          <span class="text-lg font-bold">
+            {{ walletAddressShrinked }}
+          </span>
+          <button
+            title="Click to copy"
+            @click.stop="
+              copyToClipboard(walletAddress, 'Wallet address copied')
+            "
+          >
+            <img
+              :src="getImage('copy.svg')"
+              alt="Click to copy"
+              class="w-lg h-lg"
+            />
+          </button>
         </div>
-        <div class="flex w-full text-sm sm:text-xs justify-center">
+      </div>
+      <div class="flex flex-col gap-1">
+        <span class="text-sm text-gray-100">Private Key</span>
+        <button class="flex gap-1">
+          <span class="text-lg font-bold"> Export Key </span>
+          <img
+            :src="getImage('copy.svg')"
+            alt="Click to copy"
+            class="w-lg h-lg"
+          />
+        </button>
+      </div>
+      <div class="flex flex-col gap-1">
+        <span class="text-sm text-gray-100">Enhance Wallet Security</span>
+        <div class="flex gap-1">
           <button
-            class="home__footer-button-outline rounded-xl border-2 border-solid w-1/2 uppercase"
-            @click="handleLogout"
+            v-if="!user.hasMfa"
+            class="text-lg font-bold"
+            @click.stop="handleShowMFAProceedModal(true)"
           >
-            Logout
+            <span v-if="true">Setup Now</span>
+            <span v-else>Update Security Questions</span>
+            <img
+              :src="getImage('copy.svg')"
+              alt="Click to copy"
+              class="w-lg h-lg"
+            />
           </button>
+          <span v-else class="text-lg font-bold">In use</span>
         </div>
       </div>
+      <div class="flex">
+        <button
+          class="flex flex-grow justify-center items-center btn-secondary p-3"
+          @click="handleLogout"
+        >
+          Logout
+        </button>
+      </div>
     </div>
     <Teleport v-if="modalStore.show" to="#modal-container">
       <PrivateKeyCautionModal

From f7d462003e2a7f84cd1f63642e5a9e471761c90b Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 19 May 2023 16:50:27 +0530
Subject: [PATCH 059/153] Update private key modal

---
 src/components/BaseModal.vue                  |  2 +-
 src/components/BuyTokens.vue                  |  5 --
 src/components/ExportKeyModal.vue             | 50 +++++++------------
 src/components/MFAProceedModal.vue            | 11 ----
 src/components/PinBasedRecoveryModal.vue      | 18 -------
 src/components/PrivateKeyCautionModal.vue     | 24 ++-------
 .../SecurityQuestionRecoveryModal.vue         | 18 -------
 src/pages/MFARestoreScreen.vue                |  9 ----
 src/pages/profileScreen.vue                   | 22 ++++++--
 9 files changed, 42 insertions(+), 117 deletions(-)

diff --git a/src/components/BaseModal.vue b/src/components/BaseModal.vue
index 01bc5167..03888516 100644
--- a/src/components/BaseModal.vue
+++ b/src/components/BaseModal.vue
@@ -19,7 +19,7 @@ function handleCollapse() {
 <template>
   <div class="fixed flex justify-center items-center inset-0 z-50 p-3 overlay">
     <div
-      class="card absolute flex flex-col pt-2"
+      class="card absolute flex flex-col pt-2 w-full"
       :class="{ collapse: canModalCollapse }"
     >
       <div class="flex justify-center">
diff --git a/src/components/BuyTokens.vue b/src/components/BuyTokens.vue
index fe43823d..c700f811 100644
--- a/src/components/BuyTokens.vue
+++ b/src/components/BuyTokens.vue
@@ -215,9 +215,4 @@ input[type='radio']::before {
 input[type='radio']:checked::before {
   transform: scale(1);
 }
-
-.modal-description {
-  font-size: var(--fs-250);
-  color: var(--fg-color-secondary);
-}
 </style>
diff --git a/src/components/ExportKeyModal.vue b/src/components/ExportKeyModal.vue
index 9572a783..db8df493 100644
--- a/src/components/ExportKeyModal.vue
+++ b/src/components/ExportKeyModal.vue
@@ -9,45 +9,33 @@ const emit = defineEmits(['copy', 'download', 'close'])
 </script>
 
 <template>
-  <div class="px-1 py-2">
-    <div>
-      <div class="modal-title font-semibold">Export Private Key</div>
+  <div class="flex flex-col gap-5">
+    <div class="flex justify-center">
+      <div class="font-bold text-lg">Export Private Key</div>
     </div>
-    <div class="my-5 flex flex-col gap-1">
-      <label class="modal-form-label">Private Key</label>
-      <div class="debossed-card rounded-[10px] p-4 break-words">
-        {{ props.privateKey }}
+    <div class="flex flex-col gap-1">
+      <label class="font-normal text-gray-100 text-sm">Private Key</label>
+      <div class="relative z-0">
+        <div class="relative card p-4 break-words font-normal text-base z-0">
+          {{ props.privateKey }}
+        </div>
       </div>
     </div>
-    <div class="flex gap-10 justify-center">
-      <button class="flex gap-1" @click.stop="emit('copy')">
-        <img src="@/assets/images/copy.svg" class="invert dark:invert-0" />
+    <div class="flex gap-5 justify-center">
+      <button
+        class="flex gap-1 items-center justify-center btn-secondary w-full text-sm font-medium p-2"
+        @click.stop="emit('copy')"
+      >
+        <img src="@/assets/images/copy.svg" class="w-lg h-lg" />
         <span>Copy</span>
       </button>
-      <button class="flex gap-1" @click.stop="emit('download')">
-        <img src="@/assets/images/download.svg" class="invert dark:invert-0" />
-        <span>Download</span>
-      </button>
-    </div>
-    <div class="mt-10">
       <button
-        class="text-sm sm:text-xs rounded-xl font-semibold text-white dark:bg-white bg-black dark:text-black w-full h-10 sm:h-8 uppercase"
-        @click.stop="emit('close')"
+        class="flex gap-1 items-center justify-center btn-secondary w-full text-sm font-medium p-2"
+        @click.stop="emit('download')"
       >
-        Done
+        <img src="@/assets/images/download.svg" class="w-lg h-lg" />
+        <span>Download</span>
       </button>
     </div>
   </div>
 </template>
-
-<style scoped>
-.modal-title {
-  font-size: var(--fs-500);
-}
-
-.modal-form-label {
-  font-size: var(--fs-300);
-  font-weight: 600;
-  color: var(--fg-color-secondary);
-}
-</style>
diff --git a/src/components/MFAProceedModal.vue b/src/components/MFAProceedModal.vue
index acad2186..bb429f63 100644
--- a/src/components/MFAProceedModal.vue
+++ b/src/components/MFAProceedModal.vue
@@ -37,14 +37,3 @@ const emit = defineEmits(['proceed', 'close'])
     </div>
   </div>
 </template>
-
-<style scoped>
-.modal-title {
-  font-size: var(--fs-500);
-}
-
-.modal-description {
-  font-size: var(--fs-250);
-  color: var(--fg-color-secondary);
-}
-</style>
diff --git a/src/components/PinBasedRecoveryModal.vue b/src/components/PinBasedRecoveryModal.vue
index ceceeb55..e0a3d8d4 100644
--- a/src/components/PinBasedRecoveryModal.vue
+++ b/src/components/PinBasedRecoveryModal.vue
@@ -68,21 +68,3 @@ function handleProceed() {
     </form>
   </div>
 </template>
-
-<style scoped>
-.modal-title {
-  font-size: var(--fs-500);
-}
-
-.modal-description {
-  font-size: var(--fs-250);
-  color: var(--fg-color-secondary);
-}
-
-label {
-  padding-left: 5px;
-  font-size: var(--fs-300);
-  font-weight: 600;
-  color: var(--fg-color-secondary);
-}
-</style>
diff --git a/src/components/PrivateKeyCautionModal.vue b/src/components/PrivateKeyCautionModal.vue
index 57b138db..e377fff7 100644
--- a/src/components/PrivateKeyCautionModal.vue
+++ b/src/components/PrivateKeyCautionModal.vue
@@ -5,16 +5,11 @@ const emit = defineEmits(['proceed', 'close'])
 </script>
 
 <template>
-  <div class="px-1 py-2">
+  <div class="p-4 flex flex-col gap-5">
     <div class="flex justify-between">
-      <div class="modal-title font-semibold">Export Private Key</div>
-      <img
-        src="@/assets/images/close-icon.svg"
-        class="cursor-pointer invert dark:invert-0"
-        @click.stop="emit('close')"
-      />
+      <div class="text-lg font-bold">Export Private Key</div>
     </div>
-    <div class="modal-description mt-2 mb-10 flex flex-col gap-4">
+    <div class="text-xs flex flex-col gap-2">
       <p>
         Use this utility to export your private keys to create a backup or to
         use your address with other wallet providers.
@@ -32,7 +27,7 @@ const emit = defineEmits(['proceed', 'close'])
     </div>
     <div>
       <button
-        class="text-sm sm:text-xs rounded-xl font-semibold text-white dark:bg-white bg-black dark:text-black w-full h-10 sm:h-8 uppercase"
+        class="uppercase text-sm font-bold p-3 btn-primary flex justify-center items-center w-full"
         @click.stop="emit('proceed')"
       >
         Proceed
@@ -40,14 +35,3 @@ const emit = defineEmits(['proceed', 'close'])
     </div>
   </div>
 </template>
-
-<style scoped>
-.modal-title {
-  font-size: var(--fs-500);
-}
-
-.modal-description {
-  font-size: var(--fs-250);
-  color: var(--fg-color-secondary);
-}
-</style>
diff --git a/src/components/SecurityQuestionRecoveryModal.vue b/src/components/SecurityQuestionRecoveryModal.vue
index af9de37c..8d5c455b 100644
--- a/src/components/SecurityQuestionRecoveryModal.vue
+++ b/src/components/SecurityQuestionRecoveryModal.vue
@@ -130,21 +130,3 @@ function handleProceed() {
     </form>
   </div>
 </template>
-
-<style scoped>
-.modal-title {
-  font-size: var(--fs-500);
-}
-
-.modal-description {
-  font-size: var(--fs-250);
-  color: var(--fg-color-secondary);
-}
-
-label {
-  padding-left: 5px;
-  font-size: var(--fs-300);
-  font-weight: 600;
-  color: var(--fg-color-secondary);
-}
-</style>
diff --git a/src/pages/MFARestoreScreen.vue b/src/pages/MFARestoreScreen.vue
index f8467bcf..12db6fbc 100644
--- a/src/pages/MFARestoreScreen.vue
+++ b/src/pages/MFARestoreScreen.vue
@@ -234,13 +234,4 @@ label {
 hr {
   border-top: 1px solid #8d8d8d20;
 }
-
-.title {
-  font-size: var(--fs-500);
-}
-
-.description {
-  font-size: var(--fs-250);
-  color: var(--fg-color-secondary);
-}
 </style>
diff --git a/src/pages/profileScreen.vue b/src/pages/profileScreen.vue
index 0224270c..3e4be28f 100644
--- a/src/pages/profileScreen.vue
+++ b/src/pages/profileScreen.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { Connection } from 'penpal'
 import { storeToRefs } from 'pinia'
-import { ref, toRefs } from 'vue'
+import { ref, toRefs, watch } from 'vue'
 import { onBeforeRouteLeave } from 'vue-router'
 import { useToast } from 'vue-toastification'
 
@@ -158,13 +158,24 @@ function hideLoader() {
 onBeforeRouteLeave((to) => {
   if (to.path.includes('login')) parentConnection?.destroy()
 })
+
+watch(
+  () => modalStore.show,
+  () => {
+    if (!modalStore.show) {
+      showPrivateKeyCautionModal.value = false
+      showExportKeyModal.value = false
+      showMFAProceedModal.value = false
+    }
+  }
+)
 </script>
 
 <template>
   <div v-if="loader.show" class="flex justify-center items-center flex-1">
     <AppLoader :message="loader.message" />
   </div>
-  <div v-else class="flex-grow flex flex-col gap-5">
+  <div v-else class="flex-grow flex flex-col gap-5 mb-5">
     <div class="flex justify-center align-center">
       <span class="text-lg font-bold">Profile</span>
     </div>
@@ -203,7 +214,10 @@ onBeforeRouteLeave((to) => {
       </div>
       <div class="flex flex-col gap-1">
         <span class="text-sm text-gray-100">Private Key</span>
-        <button class="flex gap-1">
+        <button
+          class="flex gap-1"
+          @click.stop="handleShowPrivateKeyCautionModal"
+        >
           <span class="text-lg font-bold"> Export Key </span>
           <img
             :src="getImage('copy.svg')"
@@ -233,7 +247,7 @@ onBeforeRouteLeave((to) => {
       </div>
       <div class="flex">
         <button
-          class="flex flex-grow justify-center items-center btn-secondary p-3"
+          class="flex flex-grow justify-center items-center btn-secondary p-3 font-bold text-sm uppercase"
           @click="handleLogout"
         >
           Logout

From 4f82b25d1a6e1627acdbe08456bbc8ffac14dc4a Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 19 May 2023 18:03:57 +0530
Subject: [PATCH 060/153] MFA settings

---
 src/components/SearchQuestion.vue |   6 +-
 src/pages/MFASetup.vue            | 147 +++++++++++++-----------------
 2 files changed, 67 insertions(+), 86 deletions(-)

diff --git a/src/components/SearchQuestion.vue b/src/components/SearchQuestion.vue
index c4d50252..b64cd9a1 100644
--- a/src/components/SearchQuestion.vue
+++ b/src/components/SearchQuestion.vue
@@ -69,13 +69,13 @@ function displayValue() {
   <Combobox v-slot="{ open }" v-model="selectedQuestion" nullable>
     <div class="relative">
       <div
-        class="relative w-full cursor-default overflow-hidden flex flex-nowrap rounded-[10px] input p-4 outline-none"
+        class="relative w-full cursor-default overflow-hidden flex flex-nowrap input-field p-1 pr-2 outline-none"
         :class="{
           'outline-black dark:outline-white outline-1 outline': isFocused,
         }"
       >
         <ComboboxInput
-          class="flex-1 border-none text-base leading-5 bg-transparent text-left justify-between text-black dark:text-white truncate outline-none"
+          class="flex-1 border-none text-sm bg-transparent text-left justify-between text-black dark:text-white truncate outline-none"
           placeholder="Enter or select the question"
           :display-value="displayValue()"
           @change="handleChange"
@@ -108,7 +108,7 @@ function displayValue() {
               :value="question"
             >
               <li
-                class="relative cursor-pointer select-none p-4 rounded-[10px] flex justify-between hover:bg-zinc-200 dark:hover:bg-zinc-800 text-black dark:text-white"
+                class="relative cursor-pointer select-none p-3 rounded-[10px] flex justify-between hover:bg-zinc-200 dark:hover:bg-zinc-800"
                 :class="{
                   'bg-zinc-200 dark:bg-zinc-800': active,
                 }"
diff --git a/src/pages/MFASetup.vue b/src/pages/MFASetup.vue
index d4d30778..dcf4a41f 100644
--- a/src/pages/MFASetup.vue
+++ b/src/pages/MFASetup.vue
@@ -263,17 +263,17 @@ function handlePinBack() {
 <template>
   <div
     v-if="showSuccessScreen"
-    class="wallet__card rounded-[10px] w-full max-w-[40rem] mx-auto h-max min-h-max px-2 py-12 overflow-y-auto"
+    class="card w-full max-w-[40rem] mx-auto h-max min-h-max px-2 py-8 overflow-y-auto"
   >
     <div class="flex flex-col max-w-[30rem] mx-auto">
       <div class="flex justify-center">
-        <img src="@/assets/images/success.svg" />
+        <img src="@/assets/images/success.svg" class="w-20 h-20" />
       </div>
-      <div class="flex flex-col text-center items-center mt-10">
-        <h2 class="font-semibold mb-5 title">
+      <div class="flex flex-col gap-5 text-center items-center mt-10">
+        <h2 class="font-bold text-lg uppercase">
           ENHANCED WALLET SECURITY ENABLED
         </h2>
-        <span class="description max-w-[26rem]"
+        <span class="text-sm max-w-[26rem]"
           >You're all set with Multi-factor Authentication. If you change
           browsers or devices in the future, you may be asked to either answer
           the security questions or enter the pin created in the last step.
@@ -281,7 +281,7 @@ function handlePinBack() {
       </div>
       <div class="flex flex-col items-center mt-8 gap-4">
         <button
-          class="text-sm sm:text-xs rounded-xl text-white dark:bg-white bg-black dark:text-black w-full max-w-[18rem] font-semibold uppercase"
+          class="btn-primary p-2 text-sm font-bold uppercase w-40"
           @click.stop="handleDone"
         >
           Done
@@ -291,7 +291,7 @@ function handlePinBack() {
   </div>
   <div
     v-else-if="showPinScreen"
-    class="wallet__card rounded-[10px] w-full max-w-[40rem] mx-auto h-max min-h-max overflow-y-auto"
+    class="card w-full max-w-[40rem] mx-auto h-max min-h-max overflow-y-auto"
   >
     <div
       v-show="loader.show"
@@ -299,11 +299,9 @@ function handlePinBack() {
     >
       <AppLoader :message="loader.message" />
     </div>
-    <h2 class="font-semibold mb-5 title uppercase m-8">
-      RECOVERY METHOD 2: PIN
-    </h2>
+    <h2 class="font-bold text-lg uppercase m-8">RECOVERY METHOD 2: PIN</h2>
     <hr />
-    <div class="mt-6 px-8 description">
+    <div class="m-8 text-base">
       Enter a 6 digit, alphanumeric pin that you can use to retrieve your wallet
       if you move to a new device or browser.
     </div>
@@ -312,18 +310,18 @@ function handlePinBack() {
       @submit.prevent="handlePinProceed"
     >
       <div class="flex flex-col gap-1">
-        <label>Pin to use for encryption</label>
+        <label class="font-medium text-sm">Pin to use for encryption</label>
         <div class="relative">
           <input
             v-model.trim="pinToEncryptMFAShare"
             :type="passwordType"
-            class="text-base p-4 input text-ellipsis overflow-hidden whitespace-nowrap w-full"
+            class="text-base p-3 input-field focus:input-active focus-visible:input-active text-ellipsis overflow-hidden whitespace-nowrap w-full"
             placeholder="Enter a alphanumberic pin, minimum 6 characters"
           />
           <img
             v-if="passwordType === 'password'"
             src="@/assets/images/show-eye.png"
-            class="absolute top-0 right-0 p-[0.5rem] cursor-pointer invert dark:invert-0"
+            class="absolute top-0 right-0 p-1 pr-2 cursor-pointer invert dark:invert-0"
             title="Show password"
             @click.stop="passwordType = 'text'"
           />
@@ -344,95 +342,78 @@ function handlePinBack() {
       <div class="flex justify-end gap-4">
         <button
           type="reset"
-          class="text-sm sm:text-xs rounded-xl text-black border-black border-2 dark:text-white dark:border-white w-full max-w-[144px] font-semibold uppercase"
+          class="btn-secondary uppercase text-sm font-bold p-2 w-[8rem]"
           @click.stop="handlePinBack"
         >
           Back
         </button>
         <button
           type="submit"
-          class="text-sm sm:text-xs rounded-xl text-white dark:bg-white bg-black dark:text-black w-full max-w-[144px] font-semibold uppercase"
+          class="btn-primary uppercase text-sm font-bold p-2 w-[8rem]"
         >
           Proceed
         </button>
       </div>
     </form>
   </div>
-  <div
-    v-else
-    class="wallet__card rounded-[10px] w-full max-w-[40rem] mx-auto h-max min-h-max overflow-y-auto"
-  >
-    <h2 class="font-semibold mb-5 title uppercase m-8">
-      RECOVERY METHOD 1: Security Questions
-    </h2>
-    <hr />
-    <form class="flex flex-col p-8 gap-12" @submit.prevent="handleSubmit">
-      <div
-        v-for="i in totalQuestions"
-        :key="`Security-Question-${i}`"
-        class="flex flex-col gap-2"
-      >
-        <div class="flex flex-col gap-1">
-          <label>Question {{ i }}</label>
-          <SearchQuestion
-            :questions="globalQuestions"
-            :value="getSelectedQuestion(i)"
-            @change="addSelectedQuestion(i, $event)"
-          />
-          <div
-            v-if="error[i - 1]"
-            class="mt-1 ml-2 text-red-500 text-xs font-medium"
-          >
-            Questions cannot be repeated
+  <div v-else class="card w-full max-w-[40rem] mx-auto h-max min-h-max">
+    <div class="overflow-y-auto">
+      <h2 class="font-bold text-lg uppercase m-8">
+        RECOVERY METHOD 1: Security Questions
+      </h2>
+      <hr />
+      <form class="flex flex-col p-8 gap-8" @submit.prevent="handleSubmit">
+        <div
+          v-for="i in totalQuestions"
+          :key="`Security-Question-${i}`"
+          class="flex flex-col gap-2"
+        >
+          <div class="flex flex-col gap-1">
+            <label class="font-medium text-sm">Question {{ i }}</label>
+            <SearchQuestion
+              :questions="globalQuestions"
+              :value="getSelectedQuestion(i)"
+              @change="addSelectedQuestion(i, $event)"
+            />
+            <div
+              v-if="error[i - 1]"
+              class="mt-1 ml-2 text-red-500 text-xs font-medium"
+            >
+              Questions cannot be repeated
+            </div>
+          </div>
+          <div class="flex flex-col gap-1">
+            <label class="font-medium text-sm">Answer {{ i }}</label>
+            <input
+              class="text-base p-3 input-field text-ellipsis overflow-hidden whitespace-nowrap"
+              :placeholder="customPlaceholders[i - 1]"
+              :value="getAnswer(i)"
+              @input="addAnswer(i, $event.target?.value)"
+            />
           </div>
         </div>
-        <div class="flex flex-col gap-1">
-          <label>Answer {{ i }}</label>
-          <input
-            class="text-base p-4 input text-ellipsis overflow-hidden whitespace-nowrap"
-            :placeholder="customPlaceholders[i - 1]"
-            :value="getAnswer(i)"
-            @input="addAnswer(i, $event.target?.value)"
-          />
+        <div class="flex justify-end gap-4">
+          <button
+            type="reset"
+            class="btn-secondary text-sm font-bold uppercase p-2 w-[8rem]"
+            @click.stop="handleCancel"
+          >
+            Cancel
+          </button>
+          <button
+            type="submit"
+            class="btn-primary text-sm font-bold uppercase p-2 w-[8rem]"
+          >
+            Proceed
+          </button>
         </div>
-      </div>
-      <div class="flex justify-end gap-4">
-        <button
-          type="reset"
-          class="text-sm sm:text-xs rounded-xl text-black border-black border-2 dark:text-white dark:border-white w-full max-w-[144px] font-semibold uppercase"
-          @click.stop="handleCancel"
-        >
-          Cancel
-        </button>
-        <button
-          type="submit"
-          class="text-sm sm:text-xs rounded-xl text-white dark:bg-white bg-black dark:text-black w-full max-w-[144px] font-semibold uppercase"
-        >
-          Proceed
-        </button>
-      </div>
-    </form>
+      </form>
+    </div>
   </div>
 </template>
 
 <style scoped>
-label {
-  padding-left: 5px;
-  font-size: var(--fs-300);
-  font-weight: 600;
-  color: var(--fg-color-secondary);
-}
-
 hr {
   border-top: 1px solid #8d8d8d20;
 }
-
-.title {
-  font-size: var(--fs-500);
-}
-
-.description {
-  font-size: var(--fs-250);
-  color: var(--fg-color-secondary);
-}
 </style>

From 95f9be6191aa229553322aeb8490719d6877a2da Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 19 May 2023 18:15:18 +0530
Subject: [PATCH 061/153] Update icons

---
 src/assets/images/dark/external-link.svg  |  3 +++
 src/assets/images/light/external-link.svg |  3 +++
 src/pages/MFARequiredScreen.vue           | 30 ++++++-----------------
 src/pages/profileScreen.vue               | 14 +++--------
 4 files changed, 17 insertions(+), 33 deletions(-)
 create mode 100644 src/assets/images/dark/external-link.svg
 create mode 100644 src/assets/images/light/external-link.svg

diff --git a/src/assets/images/dark/external-link.svg b/src/assets/images/dark/external-link.svg
new file mode 100644
index 00000000..af0dbb52
--- /dev/null
+++ b/src/assets/images/dark/external-link.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.5 7.50001L17.5 2.50001M17.5 2.50001H12.5M17.5 2.50001L10 10M8.33333 2.5H6.5C5.09987 2.5 4.3998 2.5 3.86502 2.77248C3.39462 3.01217 3.01217 3.39462 2.77248 3.86502C2.5 4.3998 2.5 5.09987 2.5 6.5V13.5C2.5 14.9001 2.5 15.6002 2.77248 16.135C3.01217 16.6054 3.39462 16.9878 3.86502 17.2275C4.3998 17.5 5.09987 17.5 6.5 17.5H13.5C14.9001 17.5 15.6002 17.5 16.135 17.2275C16.6054 16.9878 16.9878 16.6054 17.2275 16.135C17.5 15.6002 17.5 14.9001 17.5 13.5V11.6667" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/external-link.svg b/src/assets/images/light/external-link.svg
new file mode 100644
index 00000000..af0dbb52
--- /dev/null
+++ b/src/assets/images/light/external-link.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.5 7.50001L17.5 2.50001M17.5 2.50001H12.5M17.5 2.50001L10 10M8.33333 2.5H6.5C5.09987 2.5 4.3998 2.5 3.86502 2.77248C3.39462 3.01217 3.01217 3.39462 2.77248 3.86502C2.5 4.3998 2.5 5.09987 2.5 6.5V13.5C2.5 14.9001 2.5 15.6002 2.77248 16.135C3.01217 16.6054 3.39462 16.9878 3.86502 17.2275C4.3998 17.5 5.09987 17.5 6.5 17.5H13.5C14.9001 17.5 15.6002 17.5 16.135 17.2275C16.6054 16.9878 16.9878 16.6054 17.2275 16.135C17.5 15.6002 17.5 14.9001 17.5 13.5V11.6667" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/pages/MFARequiredScreen.vue b/src/pages/MFARequiredScreen.vue
index f2b42129..82241127 100644
--- a/src/pages/MFARequiredScreen.vue
+++ b/src/pages/MFARequiredScreen.vue
@@ -98,17 +98,17 @@ function goToHome() {
 
 <template>
   <div class="w-full overflow-y-auto flex">
-    <div class="wallet__card rounded-[10px] p-4 m-auto h-max min-h-max">
+    <div class="card p-4 m-auto h-max min-h-max">
       <div
         v-show="loader.show"
         class="fixed inset-0 flex justify-center items-center z-50 opacity-90 backdrop-blur bg-white dark:bg-black"
       >
         <AppLoader :message="loader.message" />
       </div>
-      <div class="flex justify-between">
-        <div class="title font-semibold">Enhance Wallet Security</div>
+      <div class="flex justify-center">
+        <div class="text-lg font-bold">Enhance Wallet Security</div>
       </div>
-      <div class="description mt-2 mb-6 flex flex-col gap-4">
+      <div class="mt-2 mb-6 flex flex-col gap-4 text-sm">
         <span>
           “{{ appStore.name }}” suggests enabling Multi-factor Authentication
           (MFA) in your wallet for added security when logging in to new
@@ -123,7 +123,7 @@ function goToHome() {
       </div>
       <div class="flex flex-col mt-4 gap-2">
         <button
-          class="text-sm sm:text-xs rounded-xl font-semibold text-white dark:bg-white bg-black dark:text-black w-full h-10 sm:h-8 uppercase"
+          class="text-sm btn-primary font-bold text-sm p-2 uppercase cursor-pointer"
           type="submit"
           @click.stop="handleProceed"
         >
@@ -131,14 +131,14 @@ function goToHome() {
         </button>
         <div class="flex justify-center gap-6">
           <button
-            class="text-xs sm:text-xs font-semibold text-black bg-transparent dark:text-white uppercase"
+            class="text-xs btn-tertiary font-bold text-sm p-2 uppercase cursor-pointer"
             type="submit"
             @click.stop="handleSkip"
           >
             Skip for now
           </button>
           <button
-            class="text-xs sm:text-xs font-semibold text-black bg-transparent dark:text-white uppercase"
+            class="text-xs btn-tertiary font-bold text-sm p-2 uppercase cursor-pointer"
             type="submit"
             @click.stop="handleAskNever"
           >
@@ -151,23 +151,7 @@ function goToHome() {
 </template>
 
 <style scoped>
-label {
-  padding-left: 5px;
-  font-size: var(--fs-300);
-  font-weight: 600;
-  color: var(--fg-color-secondary);
-}
-
 hr {
   border-top: 1px solid #8d8d8d20;
 }
-
-.title {
-  font-size: var(--fs-500);
-}
-
-.description {
-  font-size: var(--fs-250);
-  color: var(--fg-color-secondary);
-}
 </style>
diff --git a/src/pages/profileScreen.vue b/src/pages/profileScreen.vue
index 3e4be28f..a535b382 100644
--- a/src/pages/profileScreen.vue
+++ b/src/pages/profileScreen.vue
@@ -216,14 +216,11 @@ watch(
         <span class="text-sm text-gray-100">Private Key</span>
         <button
           class="flex gap-1"
+          title="Click to export private key"
           @click.stop="handleShowPrivateKeyCautionModal"
         >
           <span class="text-lg font-bold"> Export Key </span>
-          <img
-            :src="getImage('copy.svg')"
-            alt="Click to copy"
-            class="w-lg h-lg"
-          />
+          <img :src="getImage('external-link.svg')" class="w-lg h-lg" />
         </button>
       </div>
       <div class="flex flex-col gap-1">
@@ -232,15 +229,12 @@ watch(
           <button
             v-if="!user.hasMfa"
             class="text-lg font-bold"
+            title="Click to setup MFA"
             @click.stop="handleShowMFAProceedModal(true)"
           >
             <span v-if="true">Setup Now</span>
             <span v-else>Update Security Questions</span>
-            <img
-              :src="getImage('copy.svg')"
-              alt="Click to copy"
-              class="w-lg h-lg"
-            />
+            <img :src="getImage('external-link.svg')" class="w-lg h-lg" />
           </button>
           <span v-else class="text-lg font-bold">In use</span>
         </div>

From b3ad7910481b801ae2399681d71d7e79e294dc8c Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 19 May 2023 19:09:18 +0530
Subject: [PATCH 062/153] Add icons and replace mfa setup

---
 src/assets/images/dark/download.svg       |  3 ++
 src/assets/images/dark/eye-off.svg        | 10 ++++++
 src/assets/images/dark/eye.svg            |  4 +++
 src/assets/images/light/download.svg      |  3 ++
 src/assets/images/light/eye-off.svg       | 10 ++++++
 src/assets/images/light/eye.svg           |  4 +++
 src/components/ExportKeyModal.vue         | 42 +++++++++++++++++++----
 src/components/PrivateKeyCautionModal.vue |  4 +--
 src/pages/MFARequiredScreen.vue           |  4 +--
 src/pages/MFASetup.vue                    | 11 +++---
 10 files changed, 79 insertions(+), 16 deletions(-)
 create mode 100644 src/assets/images/dark/download.svg
 create mode 100644 src/assets/images/dark/eye-off.svg
 create mode 100644 src/assets/images/dark/eye.svg
 create mode 100644 src/assets/images/light/download.svg
 create mode 100644 src/assets/images/light/eye-off.svg
 create mode 100644 src/assets/images/light/eye.svg

diff --git a/src/assets/images/dark/download.svg b/src/assets/images/dark/download.svg
new file mode 100644
index 00000000..e6bdb36d
--- /dev/null
+++ b/src/assets/images/dark/download.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 15H5M13.3333 9.44444L10 12.7778M10 12.7778L6.66667 9.44444M10 12.7778V5" stroke="white" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/dark/eye-off.svg b/src/assets/images/dark/eye-off.svg
new file mode 100644
index 00000000..1b7c08be
--- /dev/null
+++ b/src/assets/images/dark/eye-off.svg
@@ -0,0 +1,10 @@
+<svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_847_4731)">
+<path d="M4.47623 2.1218C4.64556 2.09676 4.82025 2.08333 5.00017 2.08333C7.12726 2.08333 8.52304 3.96035 8.99196 4.70284C9.04871 4.79271 9.07709 4.83764 9.09297 4.90695C9.1049 4.959 9.10489 5.04111 9.09295 5.09316C9.07706 5.16246 9.04848 5.20769 8.99133 5.29815C8.86639 5.4959 8.67591 5.77379 8.42354 6.07519M2.8018 2.79793C1.90094 3.40904 1.28935 4.25807 1.00879 4.7022C0.951785 4.79245 0.923281 4.83757 0.907391 4.90687C0.895457 4.95891 0.895452 5.04102 0.90738 5.09307C0.923262 5.16237 0.951638 5.2073 1.00839 5.29716C1.47731 6.03965 2.87309 7.91667 5.00017 7.91667C5.85784 7.91667 6.59662 7.6115 7.20367 7.19858M1.25017 1.25L8.75017 8.75M4.11629 4.11612C3.89008 4.34232 3.75017 4.65482 3.75017 5C3.75017 5.69036 4.30982 6.25 5.00017 6.25C5.34535 6.25 5.65785 6.11009 5.88406 5.88388" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_847_4731">
+<rect width="10" height="10" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/images/dark/eye.svg b/src/assets/images/dark/eye.svg
new file mode 100644
index 00000000..366da07c
--- /dev/null
+++ b/src/assets/images/dark/eye.svg
@@ -0,0 +1,4 @@
+<svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.00838 5.29708C0.95164 5.20723 0.923268 5.1623 0.907385 5.09301C0.895455 5.04096 0.895455 4.95888 0.907385 4.90683C0.923268 4.83754 0.95164 4.79261 1.00838 4.70276C1.4773 3.96027 2.87308 2.08325 5.00017 2.08325C7.12725 2.08325 8.52303 3.96027 8.99195 4.70276C9.0487 4.79261 9.07707 4.83754 9.09295 4.90683C9.10488 4.95888 9.10488 5.04096 9.09295 5.09301C9.07707 5.1623 9.0487 5.20723 8.99195 5.29708C8.52303 6.03957 7.12725 7.91659 5.00017 7.91659C2.87308 7.91659 1.4773 6.03957 1.00838 5.29708Z" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.00017 6.24992C5.69052 6.24992 6.25017 5.69027 6.25017 4.99992C6.25017 4.30956 5.69052 3.74992 5.00017 3.74992C4.30981 3.74992 3.75017 4.30956 3.75017 4.99992C3.75017 5.69027 4.30981 6.24992 5.00017 6.24992Z" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/download.svg b/src/assets/images/light/download.svg
new file mode 100644
index 00000000..e6bdb36d
--- /dev/null
+++ b/src/assets/images/light/download.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 15H5M13.3333 9.44444L10 12.7778M10 12.7778L6.66667 9.44444M10 12.7778V5" stroke="white" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/eye-off.svg b/src/assets/images/light/eye-off.svg
new file mode 100644
index 00000000..1b7c08be
--- /dev/null
+++ b/src/assets/images/light/eye-off.svg
@@ -0,0 +1,10 @@
+<svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_847_4731)">
+<path d="M4.47623 2.1218C4.64556 2.09676 4.82025 2.08333 5.00017 2.08333C7.12726 2.08333 8.52304 3.96035 8.99196 4.70284C9.04871 4.79271 9.07709 4.83764 9.09297 4.90695C9.1049 4.959 9.10489 5.04111 9.09295 5.09316C9.07706 5.16246 9.04848 5.20769 8.99133 5.29815C8.86639 5.4959 8.67591 5.77379 8.42354 6.07519M2.8018 2.79793C1.90094 3.40904 1.28935 4.25807 1.00879 4.7022C0.951785 4.79245 0.923281 4.83757 0.907391 4.90687C0.895457 4.95891 0.895452 5.04102 0.90738 5.09307C0.923262 5.16237 0.951638 5.2073 1.00839 5.29716C1.47731 6.03965 2.87309 7.91667 5.00017 7.91667C5.85784 7.91667 6.59662 7.6115 7.20367 7.19858M1.25017 1.25L8.75017 8.75M4.11629 4.11612C3.89008 4.34232 3.75017 4.65482 3.75017 5C3.75017 5.69036 4.30982 6.25 5.00017 6.25C5.34535 6.25 5.65785 6.11009 5.88406 5.88388" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_847_4731">
+<rect width="10" height="10" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/images/light/eye.svg b/src/assets/images/light/eye.svg
new file mode 100644
index 00000000..366da07c
--- /dev/null
+++ b/src/assets/images/light/eye.svg
@@ -0,0 +1,4 @@
+<svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.00838 5.29708C0.95164 5.20723 0.923268 5.1623 0.907385 5.09301C0.895455 5.04096 0.895455 4.95888 0.907385 4.90683C0.923268 4.83754 0.95164 4.79261 1.00838 4.70276C1.4773 3.96027 2.87308 2.08325 5.00017 2.08325C7.12725 2.08325 8.52303 3.96027 8.99195 4.70276C9.0487 4.79261 9.07707 4.83754 9.09295 4.90683C9.10488 4.95888 9.10488 5.04096 9.09295 5.09301C9.07707 5.1623 9.0487 5.20723 8.99195 5.29708C8.52303 6.03957 7.12725 7.91659 5.00017 7.91659C2.87308 7.91659 1.4773 6.03957 1.00838 5.29708Z" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.00017 6.24992C5.69052 6.24992 6.25017 5.69027 6.25017 4.99992C6.25017 4.30956 5.69052 3.74992 5.00017 3.74992C4.30981 3.74992 3.75017 4.30956 3.75017 4.99992C3.75017 5.69027 4.30981 6.24992 5.00017 6.24992Z" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/ExportKeyModal.vue b/src/components/ExportKeyModal.vue
index db8df493..cea0d178 100644
--- a/src/components/ExportKeyModal.vue
+++ b/src/components/ExportKeyModal.vue
@@ -1,10 +1,16 @@
 <script setup lang="ts">
+import { ref } from 'vue'
+
+import { getImage } from '@/utils/getImage'
+
 type ExportKeyModalProps = {
   privateKey: string
 }
 
 const props = defineProps<ExportKeyModalProps>()
 
+const showPK = ref(false)
+
 const emit = defineEmits(['copy', 'download', 'close'])
 </script>
 
@@ -14,23 +20,45 @@ const emit = defineEmits(['copy', 'download', 'close'])
       <div class="font-bold text-lg">Export Private Key</div>
     </div>
     <div class="flex flex-col gap-1">
-      <label class="font-normal text-gray-100 text-sm">Private Key</label>
-      <div class="relative z-0">
-        <div class="relative card p-4 break-words font-normal text-base z-0">
+      <div class="flex items-center justify-between">
+        <label class="font-bold text-sm">Private Key</label>
+        <button
+          class="btn-tertiary flex gap-1 items-center"
+          @click="showPK = !showPK"
+        >
+          <img
+            :src="getImage(showPK ? 'eye-off.svg' : 'eye.svg')"
+            class="w-xs h-xs"
+          />
+          <span class="font-bold text-sm">{{ showPK ? 'Hide' : 'Show' }}</span>
+        </button>
+      </div>
+      <div class="relative">
+        <div
+          class="relative text-gray-100 card p-4 break-words font-normal text-base z-0"
+        >
           {{ props.privateKey }}
         </div>
+        <div
+          class="absolute inset-0 rounded-sm transition-all duration-200 z-10"
+          :style="
+            showPK
+              ? ''
+              : `background: rgb(49 49 49 / 62%); backdrop-filter: blur(3.5px)`
+          "
+        ></div>
       </div>
     </div>
-    <div class="flex gap-5 justify-center">
+    <div class="flex gap-8 justify-center">
       <button
-        class="flex gap-1 items-center justify-center btn-secondary w-full text-sm font-medium p-2"
+        class="flex gap-1 items-center justify-center btn-tertiary text-sm font-medium p-2"
         @click.stop="emit('copy')"
       >
-        <img src="@/assets/images/copy.svg" class="w-lg h-lg" />
+        <img :src="getImage('copy.svg')" class="w-lg h-lg" />
         <span>Copy</span>
       </button>
       <button
-        class="flex gap-1 items-center justify-center btn-secondary w-full text-sm font-medium p-2"
+        class="flex gap-1 items-center justify-center btn-tertiary text-sm font-medium p-2"
         @click.stop="emit('download')"
       >
         <img src="@/assets/images/download.svg" class="w-lg h-lg" />
diff --git a/src/components/PrivateKeyCautionModal.vue b/src/components/PrivateKeyCautionModal.vue
index e377fff7..687f75f4 100644
--- a/src/components/PrivateKeyCautionModal.vue
+++ b/src/components/PrivateKeyCautionModal.vue
@@ -9,7 +9,7 @@ const emit = defineEmits(['proceed', 'close'])
     <div class="flex justify-between">
       <div class="text-lg font-bold">Export Private Key</div>
     </div>
-    <div class="text-xs flex flex-col gap-2">
+    <div class="text-sm text-gray-100 flex flex-col gap-2">
       <p>
         Use this utility to export your private keys to create a backup or to
         use your address with other wallet providers.
@@ -20,7 +20,7 @@ const emit = defineEmits(['proceed', 'close'])
         <a
           :href="`${DOCS_URL}/howto/wallet_exkey.html`"
           target="_blank"
-          class="text-blue-500 cursor-pointer"
+          class="font-bold text-white-100 cursor-pointer"
           >LEARN MORE</a
         >
       </p>
diff --git a/src/pages/MFARequiredScreen.vue b/src/pages/MFARequiredScreen.vue
index 82241127..4cf97bf4 100644
--- a/src/pages/MFARequiredScreen.vue
+++ b/src/pages/MFARequiredScreen.vue
@@ -108,7 +108,7 @@ function goToHome() {
       <div class="flex justify-center">
         <div class="text-lg font-bold">Enhance Wallet Security</div>
       </div>
-      <div class="mt-2 mb-6 flex flex-col gap-4 text-sm">
+      <div class="mt-2 mb-6 flex flex-col gap-4 text-sm text-gray-100">
         <span>
           “{{ appStore.name }}” suggests enabling Multi-factor Authentication
           (MFA) in your wallet for added security when logging in to new
@@ -116,7 +116,7 @@ function goToHome() {
           <a
             :href="`${DOCS_URL}/concepts/mfa.html`"
             target="_blank"
-            class="text-blue-500 font-semibold cursor-pointer"
+            class="text-white-100 font-bold cursor-pointer"
             >LEARN MORE</a
           >
         </span>
diff --git a/src/pages/MFASetup.vue b/src/pages/MFASetup.vue
index dcf4a41f..e669459a 100644
--- a/src/pages/MFASetup.vue
+++ b/src/pages/MFASetup.vue
@@ -13,6 +13,7 @@ import AppLoader from '@/components/AppLoader.vue'
 import SearchQuestion from '@/components/SearchQuestion.vue'
 import { RedirectParentConnectionApi } from '@/models/Connection'
 import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
+import { getImage } from '@/utils/getImage'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
 type CustomObject = {
@@ -301,7 +302,7 @@ function handlePinBack() {
     </div>
     <h2 class="font-bold text-lg uppercase m-8">RECOVERY METHOD 2: PIN</h2>
     <hr />
-    <div class="m-8 text-base">
+    <div class="m-8 text-sm text-gray-100">
       Enter a 6 digit, alphanumeric pin that you can use to retrieve your wallet
       if you move to a new device or browser.
     </div>
@@ -320,15 +321,15 @@ function handlePinBack() {
           />
           <img
             v-if="passwordType === 'password'"
-            src="@/assets/images/show-eye.png"
-            class="absolute top-0 right-0 p-1 pr-2 cursor-pointer invert dark:invert-0"
+            :src="getImage('eye.svg')"
+            class="absolute top-0 right-0 m-3 w-lg h-lg cursor-pointer"
             title="Show password"
             @click.stop="passwordType = 'text'"
           />
           <img
             v-else
-            src="@/assets/images/hide-eye.png"
-            class="absolute top-0 right-0 p-[0.5rem] cursor-pointer invert dark:invert-0"
+            :src="getImage('eye-off.svg')"
+            class="absolute top-0 right-0 m-3 w-lg h-lg cursor-pointer"
             title="Hide password"
             @click.stop="passwordType = 'password'"
           />

From 7fd0ceca76995062a147e050e20102322b996ad0 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 19 May 2023 19:17:08 +0530
Subject: [PATCH 063/153] Add card in mfa restore screen

---
 src/pages/MFARestoreScreen.vue | 124 ++++++++++++++++-----------------
 1 file changed, 61 insertions(+), 63 deletions(-)

diff --git a/src/pages/MFARestoreScreen.vue b/src/pages/MFARestoreScreen.vue
index 12db6fbc..fd8c453c 100644
--- a/src/pages/MFARestoreScreen.vue
+++ b/src/pages/MFARestoreScreen.vue
@@ -49,37 +49,35 @@ initStorage(appId)
 const storage = getStorage()
 
 onBeforeMount(async () => {
-  loader.value = {
-    show: true,
-    message: 'Loading metadata...',
-  }
-  dkgShare = JSON.parse(storage.local.getItem('pk') as string)
-  core = new Core(
-    dkgShare.pk,
-    dkgShare.id,
-    appId,
-    GATEWAY_URL,
-    AUTH_NETWORK === 'dev'
-  )
-  securityQuestionModule.init(core)
-  try {
-    questions.value = await securityQuestionModule.getQuestions()
-  } catch (e) {
-    console.log(e)
-  }
-  loader.value = {
-    show: false,
-    message: '',
-  }
+  // loader.value = {
+  //   show: true,
+  //   message: 'Loading metadata...',
+  // }
+  // dkgShare = JSON.parse(storage.local.getItem('pk') as string)
+  // core = new Core(
+  //   dkgShare.pk,
+  //   dkgShare.id,
+  //   appId,
+  //   GATEWAY_URL,
+  //   AUTH_NETWORK === 'dev'
+  // )
+  // securityQuestionModule.init(core)
+  // try {
+  //   questions.value = await securityQuestionModule.getQuestions()
+  // } catch (e) {
+  //   console.log(e)
+  // }
+  // loader.value = {
+  //   show: false,
+  //   message: '',
+  // }
 })
 
 function handleProceed(val: 'pin-based' | 'question-based') {
-  modalStore.setShowModal(true)
   recoveryMethod.value = val
 }
 
 function handleBack() {
-  modalStore.setShowModal(false)
   recoveryMethod.value = ''
 }
 
@@ -172,7 +170,7 @@ onUnmounted(() => {
 
 <template>
   <div
-    class="wallet__card rounded-[10px] w-full max-w-[40rem] m-auto h-max min-h-max overflow-y-auto p-8"
+    class="card w-full max-w-[40rem] m-auto h-max min-h-max overflow-y-auto p-8"
   >
     <div
       v-show="loader.show"
@@ -180,46 +178,46 @@ onUnmounted(() => {
     >
       <AppLoader :message="loader.message" />
     </div>
-    <div class="flex gap-2 items-center mb-2">
-      <div class="modal-title font-bold">
-        New Device/Browser Detected: Verify Login
+    <SecurityQuestionRecoveryModal
+      v-if="recoveryMethod === 'question-based'"
+      :questions="questions"
+      @back="handleBack"
+      @proceed="handleAnswerBasedRecovery"
+      @switch-alternate="recoveryMethod = 'pin-based'"
+    />
+    <PinBasedRecoveryModal
+      v-else-if="recoveryMethod === 'pin-based'"
+      @back="handleBack"
+      @proceed="handlePinBasedRecovery"
+      @switch-alternate="recoveryMethod = 'question-based'"
+    />
+    <div v-else>
+      <div class="flex gap-2 items-center mb-2">
+        <div class="text-lg font-bold">
+          New Device/Browser Detected: Verify Login
+        </div>
+      </div>
+      <div class="flex text-sm text-gray-100">
+        Enter your previously setup MFA PIN or answer the security questions to
+        verify your login to this new device/browser.
+      </div>
+      <div class="flex mt-4 items-end justify-end gap-8">
+        <button
+          class="text-sm font-bold text-sm btn-tertiary p-2 uppercase"
+          type="submit"
+          @click.stop="handleProceed('pin-based')"
+        >
+          Enter Pin
+        </button>
+        <button
+          class="text-sm font-bold text-sm btn-tertiary p-2 uppercase"
+          type="submit"
+          @click.stop="handleProceed('question-based')"
+        >
+          Answer Questions
+        </button>
       </div>
     </div>
-    <div class="flex" style="font-size: var(--fs-300)">
-      Enter your previously setup MFA PIN or answer the security questions to
-      verify your login to this new device/browser.
-    </div>
-    <div class="flex mt-4 items-end justify-end gap-8">
-      <button
-        class="text-sm sm:text-xs font-semibold text-black bg-transparent dark:text-white h-10 sm:h-8 uppercase"
-        type="submit"
-        @click.stop="handleProceed('pin-based')"
-      >
-        Enter Pin
-      </button>
-      <button
-        class="text-sm sm:text-xs font-semibold text-black bg-transparent dark:text-white h-10 sm:h-8 uppercase"
-        type="submit"
-        @click.stop="handleProceed('question-based')"
-      >
-        Answer Questions
-      </button>
-    </div>
-    <Teleport v-if="modalStore.show" to="#modal-container">
-      <SecurityQuestionRecoveryModal
-        v-if="recoveryMethod === 'question-based'"
-        :questions="questions"
-        @back="handleBack"
-        @proceed="handleAnswerBasedRecovery"
-        @switch-alternate="recoveryMethod = 'pin-based'"
-      />
-      <PinBasedRecoveryModal
-        v-if="recoveryMethod === 'pin-based'"
-        @back="handleBack"
-        @proceed="handlePinBasedRecovery"
-        @switch-alternate="recoveryMethod = 'question-based'"
-      />
-    </Teleport>
   </div>
 </template>
 

From 0b15d43c0bc9e41199d0672bd4ae94da6deba3ae Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 22 May 2023 15:41:39 +0530
Subject: [PATCH 064/153] Add light theme tokens

---
 src/App.vue        | 15 +++++++++++++--
 tailwind.config.js |  8 ++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index f2144de4..41a69b9e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { AppMode } from '@arcana/auth'
 import { toRefs, watch, computed, onBeforeMount } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
@@ -23,7 +24,14 @@ const modal = useModalStore()
 const requestStore = useRequestStore()
 const parentConnectionStore = useParentConnectionStore()
 const router = useRouter()
-const { theme, expandWallet, showWallet, compactMode, sdkVersion } = toRefs(app)
+const {
+  theme,
+  expandWallet,
+  showWallet,
+  compactMode,
+  sdkVersion,
+  validAppMode,
+} = toRefs(app)
 const route = useRoute()
 
 const url = new URL(window.location.href)
@@ -109,7 +117,10 @@ function onClickOfHeader() {
       </div>
       <WalletFooter v-if="showFooter" />
     </div>
-    <div v-show="!expandWallet" class="h-full dark:bg-black-300 rounded-t-sm">
+    <div
+      v-show="!expandWallet && validAppMode === AppMode.Full"
+      class="h-full dark:bg-black-300 rounded-t-sm"
+    >
       <WalletButton />
     </div>
   </div>
diff --git a/tailwind.config.js b/tailwind.config.js
index 0cf954c9..6fc60fe8 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -28,10 +28,14 @@ module.exports = {
           200: '#1f1f1f',
           300: '#141414',
           400: '#050505',
+          500: '#333333',
+          600: '#252525',
         },
         white: {
           100: '#ffffff',
           200: '#f7f7f7',
+          300: '#fcfcfc',
+          400: '#eff1f3',
         },
         gray: {
           100: '#8d8d8d',
@@ -40,6 +44,9 @@ module.exports = {
           400: '#dcdcdc',
           500: '#2c2c2c',
           600: '#3b3b3b',
+          700: '#eeeeee',
+          800: '#dbdbdb',
+          900: '#f5f5f5',
         },
       },
       width: {
@@ -71,6 +78,7 @@ module.exports = {
       },
       boxShadow: {
         sm: '0 0 8px 3px rgba(0, 0, 0, 0.05)',
+        smLight: '0 0 8px 3px rgba(126, 126, 126, 0.25)',
       },
       boxShadowColor: {
         dark: {

From ed16e2c4ea19ea56d43c2e7760e2c707435d95b4 Mon Sep 17 00:00:00 2001
From: Karthik Durai <iamkarthiksiddarth@gmail.com>
Date: Mon, 22 May 2023 16:37:01 +0530
Subject: [PATCH 065/153] [AR-5981] Implement logic to enable alwaysVisible
 (#324)

* remove unused imports

* implement code to enable "alwaysVisible - false"
---
 src/App.vue                     | 7 ++++++-
 src/components/WalletButton.vue | 1 -
 src/utils/requestManagement.ts  | 8 ++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 31b01ba0..099dad81 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { AppMode } from '@arcana/auth'
 import { toRefs, watch, computed, onBeforeMount } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
@@ -33,6 +34,10 @@ const showRequestPage = computed(() => {
   return requestStore.areRequestsPendingForApproval
 })
 
+const showWalletButton = computed(() => {
+  return !app.expandWallet && app.validAppMode !== AppMode.Widget
+})
+
 onBeforeMount(async () => {
   try {
     await Promise.all([fetchTransakNetworks(), initializeOnRampMoney()])
@@ -97,7 +102,7 @@ function onClickOfHeader() {
       <WalletFooter v-if="showFooter" />
     </div>
     <div
-      v-show="!expandWallet"
+      v-show="showWalletButton"
       class="h-full"
       :class="[theme === 'dark' ? 'dark-mode' : 'light-mode']"
     >
diff --git a/src/components/WalletButton.vue b/src/components/WalletButton.vue
index 8f201822..67016add 100644
--- a/src/components/WalletButton.vue
+++ b/src/components/WalletButton.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { Wallet } from 'ethers'
 import { computed, toRefs } from 'vue'
 
 import RequestCountBadge from '@/components/RequestCountBadge.vue'
diff --git a/src/utils/requestManagement.ts b/src/utils/requestManagement.ts
index d51f8b60..63525565 100644
--- a/src/utils/requestManagement.ts
+++ b/src/utils/requestManagement.ts
@@ -60,8 +60,12 @@ async function watchRequestQueue(keeper) {
         const request = processQueue.shift()
         if (request) await processRequest(request, keeper)
         const method = request?.request.method
-        if (appMode === AppMode.Widget && pendingRequestCount === 0) {
-          if (appStore.sdkVersion !== 'v3') connectionInstance.closePopup()
+        if (
+          appMode === AppMode.Widget &&
+          pendingRequestCount === 0 &&
+          appStore.sdkVersion !== 'v3'
+        ) {
+          connectionInstance.closePopup()
         } else if (pendingRequestCount === 0 && method && PERMISSIONS[method]) {
           appStore.expandWallet = false
           appStore.compactMode = false

From a41fc4d13e771beb0cc68aaaed63e9a55ed174c5 Mon Sep 17 00:00:00 2001
From: Karthik Durai <iamkarthiksiddarth@gmail.com>
Date: Mon, 22 May 2023 17:30:08 +0530
Subject: [PATCH 066/153] fix fallback logo issue (#325)

---
 src/assets/images/fallback-logo-dark-mode.png  | Bin 0 -> 6255 bytes
 src/assets/images/fallback-logo-light-mode.png | Bin 0 -> 6255 bytes
 src/components/WalletHeader.vue                |  11 ++++++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 src/assets/images/fallback-logo-dark-mode.png
 create mode 100644 src/assets/images/fallback-logo-light-mode.png

diff --git a/src/assets/images/fallback-logo-dark-mode.png b/src/assets/images/fallback-logo-dark-mode.png
new file mode 100644
index 0000000000000000000000000000000000000000..a677d41f86a9b119f5bc9ef9d89e037fa81ba449
GIT binary patch
literal 6255
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
Z{vYx`jPNMWcg+9*002ovPDHLkV1f%90BisN

literal 0
HcmV?d00001

diff --git a/src/assets/images/fallback-logo-light-mode.png b/src/assets/images/fallback-logo-light-mode.png
new file mode 100644
index 0000000000000000000000000000000000000000..a677d41f86a9b119f5bc9ef9d89e037fa81ba449
GIT binary patch
literal 6255
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
Z{vYx`jPNMWcg+9*002ovPDHLkV1f%90BisN

literal 0
HcmV?d00001

diff --git a/src/components/WalletHeader.vue b/src/components/WalletHeader.vue
index dedfbc3d..e9ead287 100644
--- a/src/components/WalletHeader.vue
+++ b/src/components/WalletHeader.vue
@@ -6,12 +6,21 @@ const appStore = useAppStore()
 const getImage = useImage()
 
 const emits = defineEmits(['click'])
+
+function onLogoLoadingError(e) {
+  e.target.src = getImage('fallback-logo')
+}
 </script>
 
 <template>
   <header class="flex justify-between rounded-t-xl">
     <div class="flex space-x-3 items-center">
-      <img :src="appStore.appLogo?.horizontal" alt="app logo" class="h-8" />
+      <img
+        :src="appStore.appLogo?.horizontal"
+        alt="app logo"
+        class="h-8"
+        @error="onLogoLoadingError"
+      />
       <p>{{ appStore.name }}</p>
     </div>
     <button

From d249660d24bfa9ec300f4c65be581bf2e580c163 Mon Sep 17 00:00:00 2001
From: mmjee <root@git.maharshi.ninja>
Date: Mon, 22 May 2023 17:46:40 +0530
Subject: [PATCH 067/153] Add a chain ID blacklist (#326)

---
 src/utils/onrampmoney.ramp.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/utils/onrampmoney.ramp.ts b/src/utils/onrampmoney.ramp.ts
index 54cd7039..253aaba8 100644
--- a/src/utils/onrampmoney.ramp.ts
+++ b/src/utils/onrampmoney.ramp.ts
@@ -32,6 +32,9 @@ type OnRampMoneyNetworkObject = {
 
 const COIN_CONFIG = new Map<number, OnRampMoneyCoinObject>()
 const CHAIN_ID_CONFIG = new Map<number, OnRampMoneyNetworkObject>()
+// Chains that onramp.money advertises support for, but doesn’t actually accept
+const CHAIN_ID_BLACKLIST = new Set([80001])
+
 const API_URL = new URL(
   '/api/v1/onramp-coin-config/',
   process.env.VUE_APP_WALLET_GATEWAY
@@ -48,6 +51,10 @@ async function initializeOnRampMoney() {
     OnRampMoneyNetworkObject
   >
   for (const netConfig of Object.values(netConfigs)) {
+    if (CHAIN_ID_BLACKLIST.has(netConfig.networkId)) {
+      continue
+    }
+
     CHAIN_ID_CONFIG.set(netConfig.networkId, netConfig)
   }
 
@@ -72,7 +79,11 @@ async function initializeOnRampMoney() {
   }
 }
 
-function isSupportedByOnRampMoney(chainId: number) {
+function isSupportedByOnRampMoney(chainId: number): boolean {
+  if (CHAIN_ID_BLACKLIST.has(chainId)) {
+    return false
+  }
+
   const cfg = CHAIN_ID_CONFIG.get(chainId)
   if (cfg == null || cfg.nativeToken === -1) {
     return false

From f1ce27e09be3674b546202d59a2109e57733726d Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 22 May 2023 18:51:07 +0530
Subject: [PATCH 068/153] Add light theme icons

---
 src/App.vue                                   | 18 ++-----
 src/assets/images/light/back-arrow.svg        |  2 +-
 src/assets/images/light/buy-icon.svg          |  2 +-
 .../images/light/nfts-icon-selected.svg       |  8 +--
 .../light/notifications-icon-selected.svg     |  2 +-
 src/assets/images/light/plus.svg              |  2 +-
 .../images/light/profile-icon-selected.svg    |  2 +-
 src/assets/images/light/qr-code.svg           |  2 +-
 src/assets/images/light/refresh.svg           |  2 +-
 src/assets/images/light/secured-by-arcana.svg | 52 +++++++++----------
 src/assets/images/light/send-icon.svg         |  2 +-
 src/assets/images/light/slider-right.svg      |  2 +-
 .../images/light/tokens-icon-selected.svg     |  6 +--
 src/assets/images/light/tokens-icon.svg       |  4 +-
 src/components/AppFooter.vue                  | 30 +++++++----
 src/components/BaseModal.vue                  |  2 +-
 src/components/GasPrice.vue                   | 20 ++++---
 src/components/SwipeToAction.vue              |  2 +-
 src/index.css                                 | 30 ++++++-----
 src/pages/SendTokens.vue                      |  3 +-
 20 files changed, 104 insertions(+), 89 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 41a69b9e..8f500cc0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { AppMode } from '@arcana/auth'
 import { toRefs, watch, computed, onBeforeMount } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
@@ -24,14 +23,7 @@ const modal = useModalStore()
 const requestStore = useRequestStore()
 const parentConnectionStore = useParentConnectionStore()
 const router = useRouter()
-const {
-  theme,
-  expandWallet,
-  showWallet,
-  compactMode,
-  sdkVersion,
-  validAppMode,
-} = toRefs(app)
+const { theme, expandWallet, showWallet, compactMode, sdkVersion } = toRefs(app)
 const route = useRoute()
 
 const url = new URL(window.location.href)
@@ -93,7 +85,7 @@ function onClickOfHeader() {
   <div v-if="sdkVersion === 'v3'" class="flex flex-col h-full">
     <div
       v-show="expandWallet"
-      class="flex flex-col h-full dark:bg-black-300 rounded-t-md overflow-hidden"
+      class="flex flex-col h-full bg-white-300 dark:bg-black-300 rounded-t-md overflow-hidden"
       :class="{ 'rounded-md': !isMobileViewport() }"
     >
       <div class="flex justify-center mt-2 mb-2">
@@ -118,13 +110,13 @@ function onClickOfHeader() {
       <WalletFooter v-if="showFooter" />
     </div>
     <div
-      v-show="!expandWallet && validAppMode === AppMode.Full"
-      class="h-full dark:bg-black-300 rounded-t-sm"
+      v-show="!expandWallet"
+      class="h-full bg-white-300 dark:bg-black-300 rounded-t-sm"
     >
       <WalletButton />
     </div>
   </div>
-  <div v-else class="flex flex-col h-full dark:bg-black-300">
+  <div v-else class="flex flex-col h-full bg-white-300 dark:bg-black-300">
     <div
       class="flex-grow wallet__container p-4"
       :class="{ 'rounded-b-xl p-0': compactMode }"
diff --git a/src/assets/images/light/back-arrow.svg b/src/assets/images/light/back-arrow.svg
index 208f4cb7..1efd639b 100644
--- a/src/assets/images/light/back-arrow.svg
+++ b/src/assets/images/light/back-arrow.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M20 12H4M4 12L10 18M4 12L10 6" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20 12H4M4 12L10 18M4 12L10 6" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/light/buy-icon.svg b/src/assets/images/light/buy-icon.svg
index f30e666f..ce597f5d 100644
--- a/src/assets/images/light/buy-icon.svg
+++ b/src/assets/images/light/buy-icon.svg
@@ -1,3 +1,3 @@
 <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.75 7.125C6.75 8.36764 7.75736 9.375 9 9.375C10.2426 9.375 11.25 8.36764 11.25 7.125M15.75 5.39996V12.6C15.75 13.44 15.7502 13.8602 15.5867 14.181C15.4429 14.4633 15.2131 14.6927 14.9308 14.8365C14.61 15 14.1902 15 13.3501 15H4.65015C3.81007 15 3.38972 15 3.06885 14.8365C2.7866 14.6927 2.5573 14.4633 2.41349 14.181C2.25 13.8602 2.25 13.44 2.25 12.6V5.39996C2.25 4.55988 2.25 4.1399 2.41349 3.81903C2.5573 3.53679 2.7866 3.3073 3.06885 3.16349C3.38972 3 3.81007 3 4.65015 3H13.3501C14.1902 3 14.61 3 14.9308 3.16349C15.2131 3.3073 15.4429 3.53679 15.5867 3.81903C15.7502 4.1399 15.75 4.55988 15.75 5.39996Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.75 7.125C6.75 8.36764 7.75736 9.375 9 9.375C10.2426 9.375 11.25 8.36764 11.25 7.125M15.75 5.39996V12.6C15.75 13.44 15.7502 13.8602 15.5867 14.181C15.4429 14.4633 15.2131 14.6927 14.9308 14.8365C14.61 15 14.1902 15 13.3501 15H4.65015C3.81007 15 3.38972 15 3.06885 14.8365C2.7866 14.6927 2.5573 14.4633 2.41349 14.181C2.25 13.8602 2.25 13.44 2.25 12.6V5.39996C2.25 4.55988 2.25 4.1399 2.41349 3.81903C2.5573 3.53679 2.7866 3.3073 3.06885 3.16349C3.38972 3 3.81007 3 4.65015 3H13.3501C14.1902 3 14.61 3 14.9308 3.16349C15.2131 3.3073 15.4429 3.53679 15.5867 3.81903C15.7502 4.1399 15.75 4.55988 15.75 5.39996Z" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/light/nfts-icon-selected.svg b/src/assets/images/light/nfts-icon-selected.svg
index b86e1e52..f6b9e64a 100644
--- a/src/assets/images/light/nfts-icon-selected.svg
+++ b/src/assets/images/light/nfts-icon-selected.svg
@@ -1,6 +1,6 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 12C2 17.5228 6.47715 22 12 22C13.6569 22 15 20.6569 15 19V18.5C15 18.0356 15 17.8034 15.0257 17.6084C15.2029 16.2622 16.2622 15.2029 17.6084 15.0257C17.8034 15 18.0356 15 18.5 15H19C20.6569 15 22 13.6569 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7 13C7.55228 13 8 12.5523 8 12C8 11.4477 7.55228 11 7 11C6.44772 11 6 11.4477 6 12C6 12.5523 6.44772 13 7 13Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M16 9C16.5523 9 17 8.55228 17 8C17 7.44772 16.5523 7 16 7C15.4477 7 15 7.44772 15 8C15 8.55228 15.4477 9 16 9Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 8C10.5523 8 11 7.55228 11 7C11 6.44772 10.5523 6 10 6C9.44772 6 9 6.44772 9 7C9 7.55228 9.44772 8 10 8Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 12C2 17.5228 6.47715 22 12 22C13.6569 22 15 20.6569 15 19V18.5C15 18.0356 15 17.8034 15.0257 17.6084C15.2029 16.2622 16.2622 15.2029 17.6084 15.0257C17.8034 15 18.0356 15 18.5 15H19C20.6569 15 22 13.6569 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7 13C7.55228 13 8 12.5523 8 12C8 11.4477 7.55228 11 7 11C6.44772 11 6 11.4477 6 12C6 12.5523 6.44772 13 7 13Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16 9C16.5523 9 17 8.55228 17 8C17 7.44772 16.5523 7 16 7C15.4477 7 15 7.44772 15 8C15 8.55228 15.4477 9 16 9Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 8C10.5523 8 11 7.55228 11 7C11 6.44772 10.5523 6 10 6C9.44772 6 9 6.44772 9 7C9 7.55228 9.44772 8 10 8Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/light/notifications-icon-selected.svg b/src/assets/images/light/notifications-icon-selected.svg
index 9bc9d5ca..6b2347b2 100644
--- a/src/assets/images/light/notifications-icon-selected.svg
+++ b/src/assets/images/light/notifications-icon-selected.svg
@@ -1,4 +1,4 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.9465 4H9.34204C9.19845 4 9.12666 4 9.06328 4.02186C9.00723 4.04119 8.95618 4.07275 8.91382 4.11423C8.86592 4.16115 8.83382 4.22536 8.7696 4.35378L5.4096 11.0738C5.25626 11.3805 5.17959 11.5338 5.198 11.6585C5.21409 11.7673 5.27429 11.8647 5.36445 11.9278C5.46771 12 5.63915 12 5.98204 12H10.9465L8.5465 20L18.301 9.88425C18.6301 9.54296 18.7946 9.37232 18.8042 9.22631C18.8126 9.09956 18.7603 8.97639 18.6632 8.89443C18.5514 8.8 18.3144 8.8 17.8403 8.8H12.1465L13.9465 4Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.9465 4H9.34204C9.19845 4 9.12666 4 9.06328 4.02186C9.00723 4.04119 8.95618 4.07275 8.91382 4.11423C8.86592 4.16115 8.83382 4.22536 8.7696 4.35378L5.4096 11.0738C5.25626 11.3805 5.17959 11.5338 5.198 11.6585C5.21409 11.7673 5.27429 11.8647 5.36445 11.9278C5.46771 12 5.63915 12 5.98204 12H10.9465L8.5465 20L18.301 9.88425C18.6301 9.54296 18.7946 9.37232 18.8042 9.22631C18.8126 9.09956 18.7603 8.97639 18.6632 8.89443C18.5514 8.8 18.3144 8.8 17.8403 8.8H12.1465L13.9465 4Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 <circle cx="19.5" cy="3.5" r="2.5" fill="#B43030"/>
 </svg>
diff --git a/src/assets/images/light/plus.svg b/src/assets/images/light/plus.svg
index 1f15e439..fcc2851a 100644
--- a/src/assets/images/light/plus.svg
+++ b/src/assets/images/light/plus.svg
@@ -1,3 +1,3 @@
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 10H15M10 15L10 5" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5 10H15M10 15L10 5" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/light/profile-icon-selected.svg b/src/assets/images/light/profile-icon-selected.svg
index 55eacf82..4eab032f 100644
--- a/src/assets/images/light/profile-icon-selected.svg
+++ b/src/assets/images/light/profile-icon-selected.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M20 21C20 18.2386 16.4183 16 12 16C7.58172 16 4 18.2386 4 21M12 13C9.23858 13 7 10.7614 7 8C7 5.23858 9.23858 3 12 3C14.7614 3 17 5.23858 17 8C17 10.7614 14.7614 13 12 13Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20 21C20 18.2386 16.4183 16 12 16C7.58172 16 4 18.2386 4 21M12 13C9.23858 13 7 10.7614 7 8C7 5.23858 9.23858 3 12 3C14.7614 3 17 5.23858 17 8C17 10.7614 14.7614 13 12 13Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/light/qr-code.svg b/src/assets/images/light/qr-code.svg
index d513b103..f81b76fb 100644
--- a/src/assets/images/light/qr-code.svg
+++ b/src/assets/images/light/qr-code.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M19 20H20M16 20H14V17M17 17H20V14H19M14 14H16M4 17C4 16.0681 4 15.6022 4.15224 15.2346C4.35523 14.7446 4.74481 14.3552 5.23486 14.1522C5.60241 14 6.06835 14 7.00023 14C7.93211 14 8.39782 14 8.76537 14.1522C9.25542 14.3552 9.64467 14.7446 9.84766 15.2346C9.9999 15.6022 9.9999 16.0681 9.9999 17C9.9999 17.9319 9.9999 18.3978 9.84766 18.7654C9.64467 19.2554 9.25542 19.6448 8.76537 19.8478C8.39783 20 7.93211 20 7.00023 20C6.06835 20 5.6024 20 5.23486 19.8478C4.74481 19.6448 4.35523 19.2554 4.15224 18.7654C4 18.3978 4 17.9319 4 17ZM14 6.99999C14 6.0681 14 5.60216 14.1522 5.23462C14.3552 4.74456 14.7448 4.35523 15.2349 4.15224C15.6024 4 16.0683 4 17.0002 4C17.9321 4 18.3978 4 18.7654 4.15224C19.2554 4.35523 19.6447 4.74456 19.8477 5.23462C19.9999 5.60216 19.9999 6.06812 19.9999 7C19.9999 7.93188 19.9999 8.39783 19.8477 8.76537C19.6447 9.25542 19.2554 9.64479 18.7654 9.84778C18.3978 10 17.9321 10 17.0002 10C16.0683 10 15.6024 10 15.2349 9.84778C14.7448 9.64479 14.3552 9.25542 14.1522 8.76537C14 8.39782 14 7.93187 14 6.99999ZM4 6.99999C4 6.0681 4 5.60216 4.15224 5.23462C4.35523 4.74456 4.74481 4.35523 5.23486 4.15224C5.60241 4 6.06835 4 7.00023 4C7.93211 4 8.39782 4 8.76537 4.15224C9.25542 4.35523 9.64467 4.74456 9.84766 5.23462C9.9999 5.60216 9.9999 6.06812 9.9999 7C9.9999 7.93188 9.9999 8.39783 9.84766 8.76537C9.64467 9.25542 9.25542 9.64479 8.76537 9.84778C8.39783 10 7.93211 10 7.00023 10C6.06835 10 5.6024 10 5.23486 9.84778C4.74481 9.64479 4.35523 9.25542 4.15224 8.76537C4 8.39782 4 7.93187 4 6.99999Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M19 20H20M16 20H14V17M17 17H20V14H19M14 14H16M4 17C4 16.0681 4 15.6022 4.15224 15.2346C4.35523 14.7446 4.74481 14.3552 5.23486 14.1522C5.60241 14 6.06835 14 7.00023 14C7.93211 14 8.39782 14 8.76537 14.1522C9.25542 14.3552 9.64467 14.7446 9.84766 15.2346C9.9999 15.6022 9.9999 16.0681 9.9999 17C9.9999 17.9319 9.9999 18.3978 9.84766 18.7654C9.64467 19.2554 9.25542 19.6448 8.76537 19.8478C8.39783 20 7.93211 20 7.00023 20C6.06835 20 5.6024 20 5.23486 19.8478C4.74481 19.6448 4.35523 19.2554 4.15224 18.7654C4 18.3978 4 17.9319 4 17ZM14 6.99999C14 6.0681 14 5.60216 14.1522 5.23462C14.3552 4.74456 14.7448 4.35523 15.2349 4.15224C15.6024 4 16.0683 4 17.0002 4C17.9321 4 18.3978 4 18.7654 4.15224C19.2554 4.35523 19.6447 4.74456 19.8477 5.23462C19.9999 5.60216 19.9999 6.06812 19.9999 7C19.9999 7.93188 19.9999 8.39783 19.8477 8.76537C19.6447 9.25542 19.2554 9.64479 18.7654 9.84778C18.3978 10 17.9321 10 17.0002 10C16.0683 10 15.6024 10 15.2349 9.84778C14.7448 9.64479 14.3552 9.25542 14.1522 8.76537C14 8.39782 14 7.93187 14 6.99999ZM4 6.99999C4 6.0681 4 5.60216 4.15224 5.23462C4.35523 4.74456 4.74481 4.35523 5.23486 4.15224C5.60241 4 6.06835 4 7.00023 4C7.93211 4 8.39782 4 8.76537 4.15224C9.25542 4.35523 9.64467 4.74456 9.84766 5.23462C9.9999 5.60216 9.9999 6.06812 9.9999 7C9.9999 7.93188 9.9999 8.39783 9.84766 8.76537C9.64467 9.25542 9.25542 9.64479 8.76537 9.84778C8.39783 10 7.93211 10 7.00023 10C6.06835 10 5.6024 10 5.23486 9.84778C4.74481 9.64479 4.35523 9.25542 4.15224 8.76537C4 8.39782 4 7.93187 4 6.99999Z" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/light/refresh.svg b/src/assets/images/light/refresh.svg
index a5b10820..cf774b31 100644
--- a/src/assets/images/light/refresh.svg
+++ b/src/assets/images/light/refresh.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M20.453 12.8927C20.1752 15.5026 18.6964 17.9483 16.2494 19.3611C12.1839 21.7083 6.98539 20.3153 4.63818 16.2499L4.38818 15.8168M3.54613 11.1066C3.82393 8.49674 5.30272 6.05102 7.74971 4.63825C11.8152 2.29104 17.0137 3.68398 19.3609 7.74947L19.6109 8.18248M3.49316 18.0657L4.22521 15.3336L6.95727 16.0657M17.0424 7.93364L19.7744 8.66569L20.5065 5.93364" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M20.452 12.8932C20.1742 15.5031 18.6954 17.9488 16.2484 19.3616C12.1829 21.7088 6.98442 20.3158 4.63721 16.2503L4.38721 15.8173M3.54515 11.1071C3.82295 8.49723 5.30174 6.05151 7.74873 4.63874C11.8142 2.29153 17.0127 3.68447 19.3599 7.74995L19.6099 8.18297M3.49219 18.0662L4.22424 15.3341L6.95629 16.0662M17.0414 7.93413L19.7735 8.66618L20.5055 5.93413" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/light/secured-by-arcana.svg b/src/assets/images/light/secured-by-arcana.svg
index 90cc21d2..208ad264 100644
--- a/src/assets/images/light/secured-by-arcana.svg
+++ b/src/assets/images/light/secured-by-arcana.svg
@@ -1,42 +1,42 @@
-<svg width="116" height="13" viewBox="0 0 116 13" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.32 3.64C3.13333 3.64 2.94333 3.65667 2.75 3.69C2.56333 3.72333 2.39333 3.78333 2.24 3.87C2.08667 3.95 1.96 4.06333 1.86 4.21C1.76667 4.35 1.72 4.53 1.72 4.75C1.72 5.01667 1.79 5.23333 1.93 5.4C2.07 5.56 2.24 5.68333 2.44 5.77C2.6 5.83667 2.77 5.89333 2.95 5.94C3.13 5.98667 3.31333 6.03 3.5 6.07C3.69333 6.11 3.88 6.15 4.06 6.19C4.24667 6.23 4.42667 6.28 4.6 6.34C5.00667 6.48 5.33 6.68 5.57 6.94C5.81667 7.2 5.94 7.54333 5.94 7.97C5.94 8.37 5.87 8.7 5.73 8.96C5.59667 9.22 5.41333 9.43333 5.18 9.6C4.95333 9.76667 4.68667 9.89 4.38 9.97C4.08 10.0433 3.76 10.08 3.42 10.08C3.08 10.08 2.75333 10.0467 2.44 9.98C2.13333 9.91333 1.85333 9.80333 1.6 9.65C1.34667 9.49667 1.13 9.29667 0.95 9.05C0.77 8.80333 0.643333 8.50333 0.57 8.15H1.48C1.54667 8.37667 1.65 8.56333 1.79 8.71C1.93 8.85667 2.09 8.97333 2.27 9.06C2.45 9.14667 2.64333 9.20667 2.85 9.24C3.06333 9.27333 3.27333 9.29 3.48 9.29C3.68 9.29 3.87333 9.27 4.06 9.23C4.25333 9.18333 4.42333 9.11333 4.57 9.02C4.71667 8.92667 4.83333 8.80667 4.92 8.66C5.00667 8.51333 5.05 8.33667 5.05 8.13C5.05 7.81667 4.96667 7.58333 4.8 7.43C4.63333 7.27667 4.41 7.16 4.13 7.08C3.94333 7.02 3.74667 6.97 3.54 6.93C3.33333 6.89 3.12667 6.84667 2.92 6.8C2.71333 6.75333 2.51 6.7 2.31 6.64C2.11 6.57333 1.92667 6.49667 1.76 6.41C1.49333 6.28333 1.27 6.09 1.09 5.83C0.91 5.56333 0.82 5.23 0.82 4.83C0.82 4.45667 0.893333 4.14333 1.04 3.89C1.18667 3.63667 1.37667 3.43333 1.61 3.28C1.84333 3.12667 2.10333 3.01667 2.39 2.95C2.68333 2.88333 2.99333 2.85 3.32 2.85C3.58667 2.85667 3.82667 2.88 4.04 2.92C4.26 2.95333 4.46667 3.01667 4.66 3.11C4.96 3.24333 5.21 3.44333 5.41 3.71C5.61 3.97667 5.72 4.32 5.74 4.74H4.89C4.86333 4.53333 4.8 4.36 4.7 4.22C4.60667 4.08 4.49 3.96667 4.35 3.88C4.21 3.79333 4.05 3.73333 3.87 3.7C3.69667 3.66 3.51333 3.64 3.32 3.64ZM7.85344 7.68C7.87344 7.91333 7.9201 8.13 7.99344 8.33C8.07344 8.52333 8.1801 8.69333 8.31344 8.84C8.44677 8.98667 8.6101 9.10333 8.80344 9.19C9.00344 9.27 9.23344 9.31 9.49344 9.31C9.6201 9.31 9.7501 9.3 9.88344 9.28C10.0234 9.25333 10.1534 9.21333 10.2734 9.16C10.3934 9.1 10.5001 9.02333 10.5934 8.93C10.6868 8.83667 10.7568 8.72333 10.8034 8.59H11.6734C11.6134 8.84333 11.5101 9.06333 11.3634 9.25C11.2234 9.43667 11.0534 9.59 10.8534 9.71C10.6601 9.83 10.4434 9.92 10.2034 9.98C9.96344 10.0333 9.7201 10.06 9.47344 10.06C9.05344 10.06 8.68677 9.99333 8.37344 9.86C8.06677 9.72667 7.8101 9.54333 7.60344 9.31C7.39677 9.07 7.24344 8.78667 7.14344 8.46C7.04344 8.12667 6.99344 7.76333 6.99344 7.37C6.99344 6.97667 7.04677 6.61667 7.15344 6.29C7.26677 5.95667 7.42677 5.67 7.63344 5.43C7.8401 5.19 8.09344 5.00333 8.39344 4.87C8.69344 4.73667 9.0501 4.67 9.46344 4.67C9.88344 4.67 10.2468 4.75333 10.5534 4.92C10.8601 5.08667 11.1068 5.30667 11.2934 5.58C11.4801 5.84667 11.6101 6.13667 11.6834 6.45C11.7634 6.76333 11.7968 7.05333 11.7834 7.32C11.7834 7.38 11.7801 7.44 11.7734 7.5C11.7734 7.56 11.7701 7.62 11.7634 7.68H7.85344ZM10.9234 6.94C10.9101 6.49333 10.7701 6.13 10.5034 5.85C10.2368 5.57 9.8801 5.43 9.43344 5.43C9.18677 5.43 8.9701 5.47 8.78344 5.55C8.59677 5.63 8.4401 5.74 8.31344 5.88C8.18677 6.02 8.08677 6.18333 8.01344 6.37C7.9401 6.55 7.89344 6.74 7.87344 6.94H10.9234ZM15.2735 10.06C14.8535 10.06 14.4902 9.99333 14.1835 9.86C13.8768 9.72667 13.6235 9.54 13.4235 9.3C13.2235 9.06 13.0735 8.77667 12.9735 8.45C12.8735 8.12333 12.8235 7.76667 12.8235 7.38C12.8235 7.00667 12.8768 6.65667 12.9835 6.33C13.0902 5.99667 13.2468 5.71 13.4535 5.47C13.6602 5.22333 13.9202 5.03 14.2335 4.89C14.5468 4.74333 14.9268 4.67 15.3735 4.67C15.6402 4.67 15.8768 4.7 16.0835 4.76C16.2902 4.81333 16.4835 4.90333 16.6635 5.03C16.8502 5.15 17.0102 5.31 17.1435 5.51C17.2768 5.71 17.3735 5.95333 17.4335 6.24H16.5635C16.4635 5.94667 16.3035 5.73667 16.0835 5.61C15.8702 5.48333 15.6168 5.42333 15.3235 5.43C15.0368 5.43 14.7835 5.48667 14.5635 5.6C14.3502 5.70667 14.1768 5.85 14.0435 6.03C13.9168 6.21 13.8235 6.42 13.7635 6.66C13.7035 6.89333 13.6735 7.13333 13.6735 7.38C13.6735 7.64 13.7035 7.88667 13.7635 8.12C13.8302 8.35333 13.9268 8.56 14.0535 8.74C14.1868 8.91333 14.3568 9.05333 14.5635 9.16C14.7702 9.26 15.0168 9.31 15.3035 9.31C15.4435 9.31 15.5802 9.29667 15.7135 9.27C15.8535 9.24333 15.9802 9.2 16.0935 9.14C16.2135 9.07333 16.3168 8.98667 16.4035 8.88C16.4902 8.77333 16.5535 8.64333 16.5935 8.49H17.4735C17.4202 8.76333 17.3235 9 17.1835 9.2C17.0502 9.39333 16.8835 9.55667 16.6835 9.69C16.4835 9.81667 16.2635 9.91 16.0235 9.97C15.7835 10.03 15.5335 10.06 15.2735 10.06ZM20.7509 9.31C21.2309 9.31 21.5809 9.16667 21.8009 8.88C22.0275 8.58667 22.1409 8.18 22.1409 7.66V4.73H22.9909V7.7C22.9909 8.5 22.7975 9.09333 22.4109 9.48C22.0309 9.86667 21.4775 10.06 20.7509 10.06C20.0242 10.06 19.4709 9.86667 19.0909 9.48C18.7175 9.09333 18.5309 8.5 18.5309 7.7V4.73H19.3809V7.66C19.3809 8.18 19.4942 8.58667 19.7209 8.88C19.9475 9.16667 20.2909 9.31 20.7509 9.31ZM24.3126 10V4.73H25.1326L25.1726 5.55C25.3659 5.24333 25.6126 5.02 25.9126 4.88C26.2126 4.74 26.5526 4.67 26.9326 4.67H27.2026V5.47H26.8926C26.5792 5.47 26.3126 5.52333 26.0926 5.63C25.8726 5.73 25.6926 5.87 25.5526 6.05C25.4192 6.22333 25.3192 6.43 25.2526 6.67C25.1926 6.91 25.1626 7.16333 25.1626 7.43V10H24.3126ZM28.6054 7.68C28.6254 7.91333 28.6721 8.13 28.7454 8.33C28.8254 8.52333 28.9321 8.69333 29.0654 8.84C29.1987 8.98667 29.3621 9.10333 29.5554 9.19C29.7554 9.27 29.9854 9.31 30.2454 9.31C30.3721 9.31 30.5021 9.3 30.6354 9.28C30.7754 9.25333 30.9054 9.21333 31.0254 9.16C31.1454 9.1 31.2521 9.02333 31.3454 8.93C31.4387 8.83667 31.5087 8.72333 31.5554 8.59H32.4254C32.3654 8.84333 32.2621 9.06333 32.1154 9.25C31.9754 9.43667 31.8054 9.59 31.6054 9.71C31.4121 9.83 31.1954 9.92 30.9554 9.98C30.7154 10.0333 30.4721 10.06 30.2254 10.06C29.8054 10.06 29.4387 9.99333 29.1254 9.86C28.8187 9.72667 28.5621 9.54333 28.3554 9.31C28.1487 9.07 27.9954 8.78667 27.8954 8.46C27.7954 8.12667 27.7454 7.76333 27.7454 7.37C27.7454 6.97667 27.7987 6.61667 27.9054 6.29C28.0187 5.95667 28.1787 5.67 28.3854 5.43C28.5921 5.19 28.8454 5.00333 29.1454 4.87C29.4454 4.73667 29.8021 4.67 30.2154 4.67C30.6354 4.67 30.9987 4.75333 31.3054 4.92C31.6121 5.08667 31.8587 5.30667 32.0454 5.58C32.2321 5.84667 32.3621 6.13667 32.4354 6.45C32.5154 6.76333 32.5487 7.05333 32.5354 7.32C32.5354 7.38 32.5321 7.44 32.5254 7.5C32.5254 7.56 32.5221 7.62 32.5154 7.68H28.6054ZM31.6754 6.94C31.6621 6.49333 31.5221 6.13 31.2554 5.85C30.9887 5.57 30.6321 5.43 30.1854 5.43C29.9387 5.43 29.7221 5.47 29.5354 5.55C29.3487 5.63 29.1921 5.74 29.0654 5.88C28.9387 6.02 28.8387 6.18333 28.7654 6.37C28.6921 6.55 28.6454 6.74 28.6254 6.94H31.6754ZM38.3778 10H37.5678L37.5278 9.21C37.3478 9.51 37.0978 9.72667 36.7778 9.86C36.4645 9.99333 36.1345 10.06 35.7878 10.06C35.3878 10.0533 35.0411 9.98333 34.7478 9.85C34.4545 9.71 34.2145 9.52 34.0278 9.28C33.8411 9.04 33.7011 8.76 33.6078 8.44C33.5211 8.11333 33.4778 7.76 33.4778 7.38C33.4778 7 33.5245 6.64667 33.6178 6.32C33.7111 5.98667 33.8545 5.7 34.0478 5.46C34.2411 5.21333 34.4845 5.02 34.7778 4.88C35.0711 4.74 35.4211 4.67 35.8278 4.67C36.1345 4.67 36.4445 4.72667 36.7578 4.84C37.0711 4.95333 37.3278 5.13667 37.5278 5.39V2.93H38.3778V10ZM35.8978 5.43C35.6111 5.43 35.3678 5.48333 35.1678 5.59C34.9678 5.69 34.8045 5.82667 34.6778 6C34.5578 6.17333 34.4678 6.38 34.4078 6.62C34.3545 6.85333 34.3278 7.11 34.3278 7.39C34.3278 7.67 34.3545 7.92333 34.4078 8.15C34.4611 8.37 34.5511 8.56667 34.6778 8.74C34.8045 8.91333 34.9678 9.05333 35.1678 9.16C35.3678 9.26 35.6145 9.31 35.9078 9.31C36.2478 9.31 36.5278 9.23 36.7478 9.07C36.9678 8.91 37.1445 8.71 37.2778 8.47C37.3711 8.30333 37.4378 8.12333 37.4778 7.93C37.5178 7.73 37.5378 7.53333 37.5378 7.34C37.5378 7.1 37.5145 6.88 37.4678 6.68C37.4278 6.48 37.3511 6.29333 37.2378 6.12C37.1045 5.92667 36.9278 5.76333 36.7078 5.63C36.4878 5.49667 36.2178 5.43 35.8978 5.43ZM42.5983 2.93H45.0783C45.4183 2.93 45.7249 2.95 45.9983 2.99C46.2783 3.03 46.5283 3.12333 46.7483 3.27C46.9416 3.39667 47.1049 3.57667 47.2383 3.81C47.3716 4.04333 47.4383 4.34 47.4383 4.7C47.4383 5.06 47.3549 5.38 47.1883 5.66C47.0283 5.94 46.7783 6.14667 46.4383 6.28C46.8916 6.36 47.2316 6.55333 47.4583 6.86C47.6849 7.16 47.7983 7.55 47.7983 8.03C47.7783 8.47 47.6849 8.81333 47.5183 9.06C47.3516 9.30667 47.1383 9.5 46.8783 9.64C46.6183 9.78 46.3249 9.87667 45.9983 9.93C45.6783 9.97667 45.3549 10 45.0283 10H42.5983V2.93ZM43.4683 3.72V6.03H44.8283C45.0149 6.03 45.2083 6.01667 45.4083 5.99C45.6083 5.96333 45.7883 5.90667 45.9483 5.82C46.1349 5.72667 46.2849 5.6 46.3983 5.44C46.5183 5.27333 46.5816 5.04667 46.5883 4.76C46.5883 4.53333 46.5483 4.35333 46.4683 4.22C46.3883 4.08 46.2783 3.97333 46.1383 3.9C45.9983 3.82667 45.8383 3.78 45.6583 3.76C45.4783 3.73333 45.2883 3.72 45.0883 3.72H43.4683ZM44.9983 9.21C45.2116 9.21 45.4249 9.2 45.6383 9.18C45.8583 9.16 46.0649 9.11 46.2583 9.03C46.4583 8.94333 46.6183 8.82 46.7383 8.66C46.8583 8.49333 46.9183 8.27 46.9183 7.99C46.9183 7.75 46.8716 7.55333 46.7783 7.4C46.6916 7.24667 46.5716 7.12667 46.4183 7.04C46.2716 6.95333 46.1016 6.89333 45.9083 6.86C45.7149 6.82667 45.5183 6.81 45.3183 6.81H43.4683V9.21H44.9983ZM53.591 4.73V10C53.591 10.7667 53.391 11.35 52.991 11.75C52.591 12.1567 52.021 12.36 51.281 12.36C50.8343 12.3533 50.431 12.2933 50.071 12.18C49.7177 12.0733 49.391 11.88 49.091 11.6L49.461 10.93C49.721 11.1367 49.9977 11.3 50.291 11.42C50.591 11.54 50.9043 11.6 51.231 11.6C51.5043 11.6 51.7377 11.5567 51.931 11.47C52.1243 11.39 52.281 11.2733 52.401 11.12C52.5277 10.9733 52.6177 10.7967 52.671 10.59C52.731 10.3833 52.761 10.16 52.761 9.92V9.29C52.6743 9.42333 52.5643 9.54333 52.431 9.65C52.3043 9.75 52.1643 9.83333 52.011 9.9C51.8643 9.96 51.7043 10.0033 51.531 10.03C51.3643 10.0633 51.1943 10.08 51.021 10.08C50.621 10.0733 50.2877 10.01 50.021 9.89C49.761 9.77 49.551 9.60333 49.391 9.39C49.2377 9.17667 49.1277 8.92333 49.061 8.63C48.9943 8.33 48.961 8 48.961 7.64V4.73H49.811V7.4C49.811 7.64 49.8243 7.87667 49.851 8.11C49.8843 8.34333 49.9477 8.55 50.041 8.73C50.1343 8.91 50.271 9.05667 50.451 9.17C50.631 9.27667 50.871 9.33 51.171 9.33C51.471 9.33 51.7243 9.26667 51.931 9.14C52.1443 9.01333 52.3077 8.85333 52.421 8.66C52.5477 8.46 52.631 8.24 52.671 8C52.7177 7.76 52.741 7.51333 52.741 7.26V4.73H53.591Z" fill="#AAAAAA"/>
-<path d="M78.9725 9.78155C78.4823 9.78155 78.0354 9.66166 77.6321 9.42189C77.2322 9.17869 76.914 8.84644 76.6776 8.42512C76.4446 8.00038 76.3281 7.51741 76.3281 6.9762C76.3281 6.4487 76.4411 5.976 76.6672 5.55811C76.8932 5.1368 77.2044 4.80454 77.6008 4.56134C78.0007 4.31472 78.4579 4.19141 78.9725 4.19141C79.3516 4.19141 79.7045 4.26334 80.0313 4.4072C80.3617 4.54764 80.6312 4.7446 80.8398 4.99807V4.35582H82.441V9.61713H80.8398V8.9235C80.5964 9.20096 80.3165 9.41333 80 9.56062C79.6836 9.70791 79.3411 9.78155 78.9725 9.78155ZM79.4472 8.44053C79.7254 8.44053 79.9722 8.37888 80.1878 8.25556C80.4034 8.12883 80.5721 7.95585 80.6938 7.73663C80.8155 7.51741 80.8763 7.26736 80.8763 6.98648C80.8763 6.70218 80.8137 6.45213 80.6885 6.23633C80.5668 6.01711 80.3982 5.84584 80.1826 5.72253C79.9705 5.59579 79.7254 5.53242 79.4472 5.53242C79.1725 5.53242 78.9273 5.59579 78.7117 5.72253C78.4962 5.84584 78.3258 6.01711 78.2006 6.23633C78.0754 6.45555 78.0128 6.7056 78.0128 6.98648C78.0128 7.26736 78.0737 7.51741 78.1954 7.73663C78.3206 7.95585 78.4909 8.12883 78.7065 8.25556C78.9221 8.37888 79.169 8.44053 79.4472 8.44053Z" fill="white"/>
-<path d="M84.3246 9.61713V4.35582H85.9259V5.11111C86.1241 4.81653 86.3657 4.59046 86.6508 4.43289C86.9395 4.2719 87.2489 4.19141 87.5793 4.19141C87.767 4.19141 87.9618 4.21881 88.1634 4.27361C88.3651 4.32842 88.5338 4.39864 88.6694 4.48427L88.0017 5.81501C87.8835 5.73623 87.7444 5.67458 87.5845 5.63005C87.428 5.58209 87.282 5.55811 87.1463 5.55811C86.9377 5.55811 86.7395 5.61121 86.5518 5.71739C86.364 5.82358 86.2127 5.9623 86.098 6.13357C85.9832 6.30141 85.9259 6.48295 85.9259 6.6782V9.61713H84.3246Z" fill="white"/>
-<path d="M91.998 9.78155C91.5912 9.78155 91.207 9.70962 90.8453 9.56575C90.4872 9.42189 90.1708 9.22322 89.8961 8.96975C89.6214 8.71285 89.4058 8.41656 89.2493 8.08087C89.0928 7.74176 89.0146 7.37868 89.0146 6.99162C89.0146 6.61825 89.0876 6.26373 89.2336 5.92805C89.3832 5.59237 89.5918 5.29436 89.8595 5.03404C90.1308 4.77371 90.4472 4.56819 90.8088 4.41748C91.1739 4.26676 91.5686 4.19141 91.9928 4.19141C92.3371 4.19141 92.6674 4.23936 92.9838 4.33527C93.3037 4.43118 93.561 4.55449 93.7558 4.70521L93.2081 5.76877C92.9473 5.58038 92.6239 5.48618 92.238 5.48618C91.9076 5.48618 91.6277 5.55811 91.3982 5.70198C91.1687 5.84584 90.9931 6.03252 90.8714 6.26202C90.7532 6.49152 90.6941 6.733 90.6941 6.98648C90.6941 7.26393 90.7584 7.5174 90.8871 7.7469C91.0157 7.97297 91.1965 8.1528 91.4295 8.28639C91.666 8.41998 91.9389 8.48677 92.2484 8.48677C92.4396 8.48677 92.6187 8.46109 92.7856 8.40971C92.9525 8.35833 93.0933 8.28982 93.2081 8.20419L93.7558 9.26775C93.5576 9.41504 93.302 9.53664 92.989 9.63255C92.6761 9.73188 92.3457 9.78155 91.998 9.78155Z" fill="white"/>
-<path d="M97.2278 9.78155C96.7376 9.78155 96.2907 9.66166 95.8874 9.42189C95.4875 9.17869 95.1693 8.84644 94.9329 8.42512C94.6999 8.00038 94.5834 7.51741 94.5834 6.9762C94.5834 6.4487 94.6964 5.976 94.9225 5.55811C95.1485 5.1368 95.4597 4.80454 95.8561 4.56134C96.256 4.31472 96.7132 4.19141 97.2278 4.19141C97.6069 4.19141 97.9598 4.26334 98.2867 4.4072C98.617 4.54764 98.8865 4.7446 99.0951 4.99807V4.35582H100.696V9.61713H99.0951V8.9235C98.8517 9.20096 98.5718 9.41333 98.2554 9.56062C97.9389 9.70791 97.5964 9.78155 97.2278 9.78155ZM97.7025 8.44053C97.9807 8.44053 98.2275 8.37888 98.4431 8.25556C98.6587 8.12883 98.8274 7.95585 98.9491 7.73663C99.0708 7.51741 99.1316 7.26736 99.1316 6.98648C99.1316 6.70218 99.069 6.45213 98.9438 6.23633C98.8221 6.01711 98.6535 5.84584 98.4379 5.72253C98.2258 5.59579 97.9807 5.53242 97.7025 5.53242C97.4278 5.53242 97.1826 5.59579 96.9671 5.72253C96.7515 5.84584 96.5811 6.01711 96.4559 6.23633C96.3307 6.45555 96.2681 6.7056 96.2681 6.98648C96.2681 7.26736 96.329 7.51741 96.4507 7.73663C96.5759 7.95585 96.7463 8.12883 96.9618 8.25556C97.1774 8.37888 97.4243 8.44053 97.7025 8.44053Z" fill="white"/>
-<path d="M102.58 9.61713V4.35582H104.181V4.94155C104.386 4.71548 104.642 4.53394 104.948 4.39693C105.257 4.25991 105.598 4.19141 105.97 4.19141C106.38 4.19141 106.74 4.28046 107.05 4.45858C107.363 4.63327 107.608 4.87819 107.785 5.19332C107.963 5.50502 108.051 5.86982 108.051 6.28771V9.61713H106.45V6.62168C106.45 6.24489 106.349 5.95203 106.148 5.74308C105.949 5.53071 105.676 5.42453 105.329 5.42453C105.092 5.42453 104.887 5.47248 104.713 5.56839C104.543 5.66087 104.411 5.78932 104.317 5.95374C104.226 6.11473 104.181 6.29799 104.181 6.50351V9.61713H102.58Z" fill="white"/>
-<path d="M112.06 9.78155C111.57 9.78155 111.123 9.66166 110.72 9.42189C110.32 9.17869 110.002 8.84644 109.765 8.42512C109.532 8.00038 109.416 7.51741 109.416 6.9762C109.416 6.4487 109.529 5.976 109.755 5.55811C109.981 5.1368 110.292 4.80454 110.689 4.56134C111.088 4.31472 111.546 4.19141 112.06 4.19141C112.439 4.19141 112.792 4.26334 113.119 4.4072C113.449 4.54764 113.719 4.7446 113.928 4.99807V4.35582H115.529V9.61713H113.928V8.9235C113.684 9.20096 113.404 9.41333 113.088 9.56062C112.771 9.70791 112.429 9.78155 112.06 9.78155ZM112.535 8.44053C112.813 8.44053 113.06 8.37888 113.276 8.25556C113.491 8.12883 113.66 7.95585 113.781 7.73663C113.903 7.51741 113.964 7.26736 113.964 6.98648C113.964 6.70218 113.901 6.45213 113.776 6.23633C113.655 6.01711 113.486 5.84584 113.27 5.72253C113.058 5.59579 112.813 5.53242 112.535 5.53242C112.26 5.53242 112.015 5.59579 111.799 5.72253C111.584 5.84584 111.414 6.01711 111.288 6.23633C111.163 6.45555 111.101 6.7056 111.101 6.98648C111.101 7.26736 111.161 7.51741 111.283 7.73663C111.408 7.95585 111.579 8.12883 111.794 8.25556C112.01 8.37888 112.257 8.44053 112.535 8.44053Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M64.7231 10.9963C64.2733 11.5528 63.6207 11.9083 62.9085 11.9846C62.1964 12.0609 61.4831 11.8517 60.9254 11.403C60.3859 10.9325 60.0557 10.2673 60.0072 9.55376C59.9587 8.84018 60.196 8.13659 60.6668 7.59765L64.5272 3.00363C64.9769 2.44711 65.6295 2.09166 66.3416 2.01539C67.0537 1.93913 67.7669 2.1483 68.3246 2.59692C68.8641 3.06737 69.1943 3.73245 69.2429 4.44596C69.2914 5.15948 69.0542 5.86304 68.5834 6.40199L64.7231 10.9963ZM61.8907 10.2541C62.1441 10.458 62.4683 10.5531 62.792 10.5185C63.1157 10.4839 63.4123 10.3223 63.6167 10.0693L67.4766 5.47628C67.6906 5.2313 67.7984 4.91153 67.7764 4.58723C67.7543 4.26292 67.6042 3.96062 67.3591 3.74674C67.1056 3.54286 66.7814 3.4478 66.4578 3.48244C66.1342 3.51708 65.8375 3.6786 65.6331 3.9315L61.7729 8.5236C61.6668 8.64493 61.5857 8.78594 61.5342 8.93858C61.4827 9.09123 61.4618 9.25251 61.4727 9.41321C61.4837 9.57392 61.5262 9.73089 61.5979 9.87517C61.6696 10.0195 61.7691 10.1482 61.8907 10.2541Z" fill="#EDEDED"/>
-<g filter="url(#filter0_f_1521_3854)">
-<path d="M65.3994 8.29235L66.9185 6.48598L67.4547 6.94624L65.9364 8.75248L65.3994 8.29235Z" fill="#B6B6B6"/>
+<svg width="115" height="13" viewBox="0 0 115 13" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.32 3.64C3.13333 3.64 2.94333 3.65667 2.75 3.69C2.56333 3.72333 2.39333 3.78333 2.24 3.87C2.08667 3.95 1.96 4.06333 1.86 4.21C1.76667 4.35 1.72 4.53 1.72 4.75C1.72 5.01667 1.79 5.23333 1.93 5.4C2.07 5.56 2.24 5.68333 2.44 5.77C2.6 5.83667 2.77 5.89333 2.95 5.94C3.13 5.98667 3.31333 6.03 3.5 6.07C3.69333 6.11 3.88 6.15 4.06 6.19C4.24667 6.23 4.42667 6.28 4.6 6.34C5.00667 6.48 5.33 6.68 5.57 6.94C5.81667 7.2 5.94 7.54333 5.94 7.97C5.94 8.37 5.87 8.7 5.73 8.96C5.59667 9.22 5.41333 9.43333 5.18 9.6C4.95333 9.76667 4.68667 9.89 4.38 9.97C4.08 10.0433 3.76 10.08 3.42 10.08C3.08 10.08 2.75333 10.0467 2.44 9.98C2.13333 9.91333 1.85333 9.80333 1.6 9.65C1.34667 9.49667 1.13 9.29667 0.95 9.05C0.77 8.80333 0.643333 8.50333 0.57 8.15H1.48C1.54667 8.37667 1.65 8.56333 1.79 8.71C1.93 8.85667 2.09 8.97333 2.27 9.06C2.45 9.14667 2.64333 9.20667 2.85 9.24C3.06333 9.27333 3.27333 9.29 3.48 9.29C3.68 9.29 3.87333 9.27 4.06 9.23C4.25333 9.18333 4.42333 9.11333 4.57 9.02C4.71667 8.92667 4.83333 8.80667 4.92 8.66C5.00667 8.51333 5.05 8.33667 5.05 8.13C5.05 7.81667 4.96667 7.58333 4.8 7.43C4.63333 7.27667 4.41 7.16 4.13 7.08C3.94333 7.02 3.74667 6.97 3.54 6.93C3.33333 6.89 3.12667 6.84667 2.92 6.8C2.71333 6.75333 2.51 6.7 2.31 6.64C2.11 6.57333 1.92667 6.49667 1.76 6.41C1.49333 6.28333 1.27 6.09 1.09 5.83C0.91 5.56333 0.82 5.23 0.82 4.83C0.82 4.45667 0.893333 4.14333 1.04 3.89C1.18667 3.63667 1.37667 3.43333 1.61 3.28C1.84333 3.12667 2.10333 3.01667 2.39 2.95C2.68333 2.88333 2.99333 2.85 3.32 2.85C3.58667 2.85667 3.82667 2.88 4.04 2.92C4.26 2.95333 4.46667 3.01667 4.66 3.11C4.96 3.24333 5.21 3.44333 5.41 3.71C5.61 3.97667 5.72 4.32 5.74 4.74H4.89C4.86333 4.53333 4.8 4.36 4.7 4.22C4.60667 4.08 4.49 3.96667 4.35 3.88C4.21 3.79333 4.05 3.73333 3.87 3.7C3.69667 3.66 3.51333 3.64 3.32 3.64ZM7.85344 7.68C7.87344 7.91333 7.9201 8.13 7.99344 8.33C8.07344 8.52333 8.1801 8.69333 8.31344 8.84C8.44677 8.98667 8.6101 9.10333 8.80344 9.19C9.00344 9.27 9.23344 9.31 9.49344 9.31C9.6201 9.31 9.7501 9.3 9.88344 9.28C10.0234 9.25333 10.1534 9.21333 10.2734 9.16C10.3934 9.1 10.5001 9.02333 10.5934 8.93C10.6868 8.83667 10.7568 8.72333 10.8034 8.59H11.6734C11.6134 8.84333 11.5101 9.06333 11.3634 9.25C11.2234 9.43667 11.0534 9.59 10.8534 9.71C10.6601 9.83 10.4434 9.92 10.2034 9.98C9.96344 10.0333 9.7201 10.06 9.47344 10.06C9.05344 10.06 8.68677 9.99333 8.37344 9.86C8.06677 9.72667 7.8101 9.54333 7.60344 9.31C7.39677 9.07 7.24344 8.78667 7.14344 8.46C7.04344 8.12667 6.99344 7.76333 6.99344 7.37C6.99344 6.97667 7.04677 6.61667 7.15344 6.29C7.26677 5.95667 7.42677 5.67 7.63344 5.43C7.8401 5.19 8.09344 5.00333 8.39344 4.87C8.69344 4.73667 9.0501 4.67 9.46344 4.67C9.88344 4.67 10.2468 4.75333 10.5534 4.92C10.8601 5.08667 11.1068 5.30667 11.2934 5.58C11.4801 5.84667 11.6101 6.13667 11.6834 6.45C11.7634 6.76333 11.7968 7.05333 11.7834 7.32C11.7834 7.38 11.7801 7.44 11.7734 7.5C11.7734 7.56 11.7701 7.62 11.7634 7.68H7.85344ZM10.9234 6.94C10.9101 6.49333 10.7701 6.13 10.5034 5.85C10.2368 5.57 9.8801 5.43 9.43344 5.43C9.18677 5.43 8.9701 5.47 8.78344 5.55C8.59677 5.63 8.4401 5.74 8.31344 5.88C8.18677 6.02 8.08677 6.18333 8.01344 6.37C7.9401 6.55 7.89344 6.74 7.87344 6.94H10.9234ZM15.2735 10.06C14.8535 10.06 14.4902 9.99333 14.1835 9.86C13.8768 9.72667 13.6235 9.54 13.4235 9.3C13.2235 9.06 13.0735 8.77667 12.9735 8.45C12.8735 8.12333 12.8235 7.76667 12.8235 7.38C12.8235 7.00667 12.8768 6.65667 12.9835 6.33C13.0902 5.99667 13.2468 5.71 13.4535 5.47C13.6602 5.22333 13.9202 5.03 14.2335 4.89C14.5468 4.74333 14.9268 4.67 15.3735 4.67C15.6402 4.67 15.8768 4.7 16.0835 4.76C16.2902 4.81333 16.4835 4.90333 16.6635 5.03C16.8502 5.15 17.0102 5.31 17.1435 5.51C17.2768 5.71 17.3735 5.95333 17.4335 6.24H16.5635C16.4635 5.94667 16.3035 5.73667 16.0835 5.61C15.8702 5.48333 15.6168 5.42333 15.3235 5.43C15.0368 5.43 14.7835 5.48667 14.5635 5.6C14.3502 5.70667 14.1768 5.85 14.0435 6.03C13.9168 6.21 13.8235 6.42 13.7635 6.66C13.7035 6.89333 13.6735 7.13333 13.6735 7.38C13.6735 7.64 13.7035 7.88667 13.7635 8.12C13.8302 8.35333 13.9268 8.56 14.0535 8.74C14.1868 8.91333 14.3568 9.05333 14.5635 9.16C14.7702 9.26 15.0168 9.31 15.3035 9.31C15.4435 9.31 15.5802 9.29667 15.7135 9.27C15.8535 9.24333 15.9802 9.2 16.0935 9.14C16.2135 9.07333 16.3168 8.98667 16.4035 8.88C16.4902 8.77333 16.5535 8.64333 16.5935 8.49H17.4735C17.4202 8.76333 17.3235 9 17.1835 9.2C17.0502 9.39333 16.8835 9.55667 16.6835 9.69C16.4835 9.81667 16.2635 9.91 16.0235 9.97C15.7835 10.03 15.5335 10.06 15.2735 10.06ZM20.7509 9.31C21.2309 9.31 21.5809 9.16667 21.8009 8.88C22.0275 8.58667 22.1409 8.18 22.1409 7.66V4.73H22.9909V7.7C22.9909 8.5 22.7975 9.09333 22.4109 9.48C22.0309 9.86667 21.4775 10.06 20.7509 10.06C20.0242 10.06 19.4709 9.86667 19.0909 9.48C18.7175 9.09333 18.5309 8.5 18.5309 7.7V4.73H19.3809V7.66C19.3809 8.18 19.4942 8.58667 19.7209 8.88C19.9475 9.16667 20.2909 9.31 20.7509 9.31ZM24.3126 10V4.73H25.1326L25.1726 5.55C25.3659 5.24333 25.6126 5.02 25.9126 4.88C26.2126 4.74 26.5526 4.67 26.9326 4.67H27.2026V5.47H26.8926C26.5792 5.47 26.3126 5.52333 26.0926 5.63C25.8726 5.73 25.6926 5.87 25.5526 6.05C25.4192 6.22333 25.3192 6.43 25.2526 6.67C25.1926 6.91 25.1626 7.16333 25.1626 7.43V10H24.3126ZM28.6054 7.68C28.6254 7.91333 28.6721 8.13 28.7454 8.33C28.8254 8.52333 28.9321 8.69333 29.0654 8.84C29.1987 8.98667 29.3621 9.10333 29.5554 9.19C29.7554 9.27 29.9854 9.31 30.2454 9.31C30.3721 9.31 30.5021 9.3 30.6354 9.28C30.7754 9.25333 30.9054 9.21333 31.0254 9.16C31.1454 9.1 31.2521 9.02333 31.3454 8.93C31.4387 8.83667 31.5087 8.72333 31.5554 8.59H32.4254C32.3654 8.84333 32.2621 9.06333 32.1154 9.25C31.9754 9.43667 31.8054 9.59 31.6054 9.71C31.4121 9.83 31.1954 9.92 30.9554 9.98C30.7154 10.0333 30.4721 10.06 30.2254 10.06C29.8054 10.06 29.4387 9.99333 29.1254 9.86C28.8187 9.72667 28.5621 9.54333 28.3554 9.31C28.1487 9.07 27.9954 8.78667 27.8954 8.46C27.7954 8.12667 27.7454 7.76333 27.7454 7.37C27.7454 6.97667 27.7987 6.61667 27.9054 6.29C28.0187 5.95667 28.1787 5.67 28.3854 5.43C28.5921 5.19 28.8454 5.00333 29.1454 4.87C29.4454 4.73667 29.8021 4.67 30.2154 4.67C30.6354 4.67 30.9987 4.75333 31.3054 4.92C31.6121 5.08667 31.8587 5.30667 32.0454 5.58C32.2321 5.84667 32.3621 6.13667 32.4354 6.45C32.5154 6.76333 32.5487 7.05333 32.5354 7.32C32.5354 7.38 32.5321 7.44 32.5254 7.5C32.5254 7.56 32.5221 7.62 32.5154 7.68H28.6054ZM31.6754 6.94C31.6621 6.49333 31.5221 6.13 31.2554 5.85C30.9887 5.57 30.6321 5.43 30.1854 5.43C29.9387 5.43 29.7221 5.47 29.5354 5.55C29.3487 5.63 29.1921 5.74 29.0654 5.88C28.9387 6.02 28.8387 6.18333 28.7654 6.37C28.6921 6.55 28.6454 6.74 28.6254 6.94H31.6754ZM38.3778 10H37.5678L37.5278 9.21C37.3478 9.51 37.0978 9.72667 36.7778 9.86C36.4645 9.99333 36.1345 10.06 35.7878 10.06C35.3878 10.0533 35.0411 9.98333 34.7478 9.85C34.4545 9.71 34.2145 9.52 34.0278 9.28C33.8411 9.04 33.7011 8.76 33.6078 8.44C33.5211 8.11333 33.4778 7.76 33.4778 7.38C33.4778 7 33.5245 6.64667 33.6178 6.32C33.7111 5.98667 33.8545 5.7 34.0478 5.46C34.2411 5.21333 34.4845 5.02 34.7778 4.88C35.0711 4.74 35.4211 4.67 35.8278 4.67C36.1345 4.67 36.4445 4.72667 36.7578 4.84C37.0711 4.95333 37.3278 5.13667 37.5278 5.39V2.93H38.3778V10ZM35.8978 5.43C35.6111 5.43 35.3678 5.48333 35.1678 5.59C34.9678 5.69 34.8045 5.82667 34.6778 6C34.5578 6.17333 34.4678 6.38 34.4078 6.62C34.3545 6.85333 34.3278 7.11 34.3278 7.39C34.3278 7.67 34.3545 7.92333 34.4078 8.15C34.4611 8.37 34.5511 8.56667 34.6778 8.74C34.8045 8.91333 34.9678 9.05333 35.1678 9.16C35.3678 9.26 35.6145 9.31 35.9078 9.31C36.2478 9.31 36.5278 9.23 36.7478 9.07C36.9678 8.91 37.1445 8.71 37.2778 8.47C37.3711 8.30333 37.4378 8.12333 37.4778 7.93C37.5178 7.73 37.5378 7.53333 37.5378 7.34C37.5378 7.1 37.5145 6.88 37.4678 6.68C37.4278 6.48 37.3511 6.29333 37.2378 6.12C37.1045 5.92667 36.9278 5.76333 36.7078 5.63C36.4878 5.49667 36.2178 5.43 35.8978 5.43ZM42.5983 2.93H45.0783C45.4183 2.93 45.7249 2.95 45.9983 2.99C46.2783 3.03 46.5283 3.12333 46.7483 3.27C46.9416 3.39667 47.1049 3.57667 47.2383 3.81C47.3716 4.04333 47.4383 4.34 47.4383 4.7C47.4383 5.06 47.3549 5.38 47.1883 5.66C47.0283 5.94 46.7783 6.14667 46.4383 6.28C46.8916 6.36 47.2316 6.55333 47.4583 6.86C47.6849 7.16 47.7983 7.55 47.7983 8.03C47.7783 8.47 47.6849 8.81333 47.5183 9.06C47.3516 9.30667 47.1383 9.5 46.8783 9.64C46.6183 9.78 46.3249 9.87667 45.9983 9.93C45.6783 9.97667 45.3549 10 45.0283 10H42.5983V2.93ZM43.4683 3.72V6.03H44.8283C45.0149 6.03 45.2083 6.01667 45.4083 5.99C45.6083 5.96333 45.7883 5.90667 45.9483 5.82C46.1349 5.72667 46.2849 5.6 46.3983 5.44C46.5183 5.27333 46.5816 5.04667 46.5883 4.76C46.5883 4.53333 46.5483 4.35333 46.4683 4.22C46.3883 4.08 46.2783 3.97333 46.1383 3.9C45.9983 3.82667 45.8383 3.78 45.6583 3.76C45.4783 3.73333 45.2883 3.72 45.0883 3.72H43.4683ZM44.9983 9.21C45.2116 9.21 45.4249 9.2 45.6383 9.18C45.8583 9.16 46.0649 9.11 46.2583 9.03C46.4583 8.94333 46.6183 8.82 46.7383 8.66C46.8583 8.49333 46.9183 8.27 46.9183 7.99C46.9183 7.75 46.8716 7.55333 46.7783 7.4C46.6916 7.24667 46.5716 7.12667 46.4183 7.04C46.2716 6.95333 46.1016 6.89333 45.9083 6.86C45.7149 6.82667 45.5183 6.81 45.3183 6.81H43.4683V9.21H44.9983ZM53.591 4.73V10C53.591 10.7667 53.391 11.35 52.991 11.75C52.591 12.1567 52.021 12.36 51.281 12.36C50.8343 12.3533 50.431 12.2933 50.071 12.18C49.7177 12.0733 49.391 11.88 49.091 11.6L49.461 10.93C49.721 11.1367 49.9977 11.3 50.291 11.42C50.591 11.54 50.9043 11.6 51.231 11.6C51.5043 11.6 51.7377 11.5567 51.931 11.47C52.1243 11.39 52.281 11.2733 52.401 11.12C52.5277 10.9733 52.6177 10.7967 52.671 10.59C52.731 10.3833 52.761 10.16 52.761 9.92V9.29C52.6743 9.42333 52.5643 9.54333 52.431 9.65C52.3043 9.75 52.1643 9.83333 52.011 9.9C51.8643 9.96 51.7043 10.0033 51.531 10.03C51.3643 10.0633 51.1943 10.08 51.021 10.08C50.621 10.0733 50.2877 10.01 50.021 9.89C49.761 9.77 49.551 9.60333 49.391 9.39C49.2377 9.17667 49.1277 8.92333 49.061 8.63C48.9943 8.33 48.961 8 48.961 7.64V4.73H49.811V7.4C49.811 7.64 49.8243 7.87667 49.851 8.11C49.8843 8.34333 49.9477 8.55 50.041 8.73C50.1343 8.91 50.271 9.05667 50.451 9.17C50.631 9.27667 50.871 9.33 51.171 9.33C51.471 9.33 51.7243 9.26667 51.931 9.14C52.1443 9.01333 52.3077 8.85333 52.421 8.66C52.5477 8.46 52.631 8.24 52.671 8C52.7177 7.76 52.741 7.51333 52.741 7.26V4.73H53.591Z" fill="#333333"/>
+<path d="M78.7911 8.78009C78.3055 8.78009 77.8629 8.6602 77.4634 8.42042C77.0673 8.17723 76.7522 7.84497 76.518 7.42365C76.2873 6.99891 76.1719 6.51594 76.1719 5.97474C76.1719 5.44724 76.2838 4.97454 76.5077 4.55665C76.7315 4.13533 77.0398 3.80308 77.4324 3.55988C77.8285 3.31325 78.2814 3.18994 78.7911 3.18994C79.1665 3.18994 79.5161 3.26187 79.8398 3.40574C80.167 3.54618 80.4339 3.74313 80.6406 3.99661V3.35436H82.2266V8.61567H80.6406V7.92204C80.3995 8.19949 80.1223 8.41186 79.8088 8.55915C79.4954 8.70644 79.1562 8.78009 78.7911 8.78009ZM79.2612 7.43907C79.5368 7.43907 79.7813 7.37741 79.9948 7.2541C80.2084 7.12736 80.3754 6.95438 80.4959 6.73516C80.6165 6.51594 80.6768 6.26589 80.6768 5.98501C80.6768 5.70071 80.6148 5.45066 80.4908 5.23487C80.3702 5.01564 80.2032 4.84438 79.9897 4.72107C79.7796 4.59433 79.5368 4.53096 79.2612 4.53096C78.9891 4.53096 78.7463 4.59433 78.5328 4.72107C78.3193 4.84438 78.1505 5.01564 78.0265 5.23487C77.9025 5.45409 77.8405 5.70414 77.8405 5.98501C77.8405 6.26589 77.9008 6.51594 78.0214 6.73516C78.1453 6.95438 78.3141 7.12736 78.5276 7.2541C78.7412 7.37741 78.9857 7.43907 79.2612 7.43907Z" fill="#121212"/>
+<path d="M84.0922 8.61567V3.35436H85.6782V4.10964C85.8745 3.81506 86.1139 3.58899 86.3963 3.43143C86.6822 3.27044 86.9887 3.18994 87.3159 3.18994C87.5019 3.18994 87.6948 3.21734 87.8945 3.27215C88.0943 3.32695 88.2613 3.39717 88.3956 3.48281L87.7344 4.81355C87.6173 4.73477 87.4795 4.67311 87.3211 4.62858C87.1661 4.58063 87.0214 4.55665 86.8871 4.55665C86.6805 4.55665 86.4842 4.60974 86.2982 4.71593C86.1122 4.82211 85.9624 4.96084 85.8487 5.13211C85.7351 5.29995 85.6782 5.48149 85.6782 5.67673V8.61567H84.0922Z" fill="#121212"/>
+<path d="M91.6926 8.78009C91.2896 8.78009 90.9091 8.70815 90.5509 8.56429C90.1961 8.42043 89.8827 8.22176 89.6106 7.96828C89.3386 7.71138 89.125 7.41509 88.97 7.07941C88.8151 6.7403 88.7376 6.37721 88.7376 5.99015C88.7376 5.61679 88.8099 5.26227 88.9545 4.92659C89.1026 4.5909 89.3093 4.2929 89.5745 4.03257C89.8431 3.77225 90.1565 3.56673 90.5147 3.41601C90.8763 3.2653 91.2673 3.18994 91.6874 3.18994C92.0284 3.18994 92.3556 3.2379 92.669 3.33381C92.9859 3.42971 93.2407 3.55303 93.4336 3.70374L92.8911 4.76731C92.6328 4.57891 92.3125 4.48472 91.9302 4.48472C91.6031 4.48472 91.3258 4.55665 91.0985 4.70051C90.8712 4.84438 90.6973 5.03106 90.5767 5.26056C90.4596 5.49005 90.4011 5.73154 90.4011 5.98501C90.4011 6.26247 90.4648 6.51594 90.5922 6.74544C90.7196 6.97151 90.8987 7.15134 91.1295 7.28493C91.3637 7.41852 91.634 7.48531 91.9406 7.48531C92.13 7.48531 92.3074 7.45962 92.4727 7.40824C92.638 7.35686 92.7775 7.28835 92.8911 7.20272L93.4336 8.26628C93.2373 8.41357 92.9841 8.53517 92.6742 8.63108C92.3642 8.73042 92.037 8.78009 91.6926 8.78009Z" fill="#121212"/>
+<path d="M96.8726 8.78009C96.387 8.78009 95.9444 8.6602 95.5449 8.42042C95.1489 8.17723 94.8337 7.84497 94.5995 7.42365C94.3688 6.99891 94.2534 6.51594 94.2534 5.97474C94.2534 5.44724 94.3653 4.97454 94.5892 4.55665C94.8131 4.13533 95.1213 3.80308 95.5139 3.55988C95.91 3.31325 96.3629 3.18994 96.8726 3.18994C97.248 3.18994 97.5976 3.26187 97.9214 3.40574C98.2485 3.54618 98.5155 3.74313 98.7221 3.99661V3.35436H100.308V8.61567H98.7221V7.92204C98.481 8.19949 98.2038 8.41186 97.8904 8.55915C97.5769 8.70644 97.2377 8.78009 96.8726 8.78009ZM97.3427 7.43907C97.6183 7.43907 97.8628 7.37741 98.0763 7.2541C98.2899 7.12736 98.4569 6.95438 98.5775 6.73516C98.698 6.51594 98.7583 6.26589 98.7583 5.98501C98.7583 5.70071 98.6963 5.45066 98.5723 5.23487C98.4517 5.01564 98.2847 4.84438 98.0712 4.72107C97.8611 4.59433 97.6183 4.53096 97.3427 4.53096C97.0707 4.53096 96.8279 4.59433 96.6143 4.72107C96.4008 4.84438 96.232 5.01564 96.108 5.23487C95.9841 5.45409 95.9221 5.70414 95.9221 5.98501C95.9221 6.26589 95.9823 6.51594 96.1029 6.73516C96.2269 6.95438 96.3956 7.12736 96.6092 7.2541C96.8227 7.37741 97.0672 7.43907 97.3427 7.43907Z" fill="#121212"/>
+<path d="M102.174 8.61567V3.35436H103.76V3.94009C103.963 3.71402 104.216 3.53247 104.519 3.39546C104.826 3.25845 105.163 3.18994 105.532 3.18994C105.938 3.18994 106.295 3.279 106.601 3.45712C106.911 3.63181 107.154 3.87672 107.33 4.19185C107.505 4.50356 107.593 4.86835 107.593 5.28625V8.61567H106.007V5.62022C106.007 5.24343 105.907 4.95056 105.707 4.74162C105.511 4.52925 105.241 4.42306 104.896 4.42306C104.662 4.42306 104.459 4.47102 104.287 4.56693C104.118 4.65941 103.987 4.78786 103.894 4.95228C103.805 5.11327 103.76 5.29652 103.76 5.50204V8.61567H102.174Z" fill="#121212"/>
+<path d="M111.564 8.78009C111.078 8.78009 110.636 8.6602 110.236 8.42042C109.84 8.17723 109.525 7.84497 109.291 7.42365C109.06 6.99891 108.945 6.51594 108.945 5.97474C108.945 5.44724 109.057 4.97454 109.28 4.55665C109.504 4.13533 109.813 3.80308 110.205 3.55988C110.601 3.31325 111.054 3.18994 111.564 3.18994C111.939 3.18994 112.289 3.26187 112.613 3.40574C112.94 3.54618 113.207 3.74313 113.413 3.99661V3.35436H114.999V8.61567H113.413V7.92204C113.172 8.19949 112.895 8.41186 112.582 8.55915C112.268 8.70644 111.929 8.78009 111.564 8.78009ZM112.034 7.43907C112.31 7.43907 112.554 7.37741 112.768 7.2541C112.981 7.12736 113.148 6.95438 113.269 6.73516C113.389 6.51594 113.45 6.26589 113.45 5.98501C113.45 5.70071 113.388 5.45066 113.264 5.23487C113.143 5.01564 112.976 4.84438 112.762 4.72107C112.552 4.59433 112.31 4.53096 112.034 4.53096C111.762 4.53096 111.519 4.59433 111.306 4.72107C111.092 4.84438 110.923 5.01564 110.799 5.23487C110.675 5.45409 110.613 5.70414 110.613 5.98501C110.613 6.26589 110.674 6.51594 110.794 6.73516C110.918 6.95438 111.087 7.12736 111.3 7.2541C111.514 7.37741 111.758 7.43907 112.034 7.43907Z" fill="#121212"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M64.6771 9.99625C64.2317 10.5528 63.5852 10.9083 62.8799 10.9846C62.1745 11.0609 61.468 10.8517 60.9156 10.403C60.3813 9.93247 60.0542 9.26733 60.0061 8.55376C59.9581 7.84018 60.1931 7.13659 60.6595 6.59765L64.4831 2.00363C64.9286 1.44711 65.575 1.09166 66.2803 1.01539C66.9856 0.939131 67.692 1.1483 68.2444 1.59692C68.7787 2.06737 69.1058 2.73245 69.1539 3.44596C69.202 4.15948 68.967 4.86304 68.5008 5.40199L64.6771 9.99625ZM61.8717 9.2541C62.1228 9.45805 62.4439 9.55315 62.7645 9.5185C63.085 9.48386 63.3789 9.3223 63.5813 9.06934L67.4045 4.47628C67.6164 4.2313 67.7232 3.91153 67.7014 3.58723C67.6795 3.26292 67.5309 2.96062 67.2881 2.74674C67.037 2.54286 66.7159 2.4478 66.3954 2.48244C66.0748 2.51708 65.781 2.6786 65.5785 2.9315L61.7551 7.5236C61.65 7.64493 61.5696 7.78594 61.5186 7.93858C61.4676 8.09123 61.4469 8.25251 61.4578 8.41321C61.4686 8.57392 61.5107 8.73089 61.5817 8.87517C61.6528 9.01946 61.7513 9.14822 61.8717 9.2541Z" fill="#121212"/>
+<g filter="url(#filter0_f_1724_2982)">
+<path d="M65.3478 7.29113L66.8524 5.48476L67.3835 5.94502L65.8796 7.75126L65.3478 7.29113Z" fill="#848484"/>
 </g>
-<g filter="url(#filter1_f_1521_3854)">
-<path d="M62.6842 5.82804L64.1636 4.17438L64.7352 4.43843L63.2565 6.09187L62.6842 5.82804Z" fill="#B6B6B6"/>
+<g filter="url(#filter1_f_1724_2982)">
+<path d="M62.6577 4.82707L64.123 3.1734L64.6891 3.43745L63.2246 5.0909L62.6577 4.82707Z" fill="#848484"/>
 </g>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M68.5007 10.9769C68.7186 11.2578 68.991 11.4919 69.3017 11.6651C69.6123 11.8383 69.9548 11.9471 70.3086 11.985C70.6623 12.0228 71.0201 11.989 71.3604 11.8854C71.7008 11.7819 72.0167 11.6108 72.2892 11.3824C72.5618 11.154 72.7854 10.8729 72.9466 10.5562C73.1078 10.2394 73.2033 9.89338 73.2274 9.53886C73.2515 9.18434 73.2037 8.8286 73.0868 8.49297C72.97 8.15734 72.7865 7.84873 72.5473 7.58563L68.6961 3.00147C68.2474 2.44615 67.5963 2.09146 66.8859 2.01536C66.1756 1.93926 65.464 2.14798 64.9076 2.59564C64.3695 3.06508 64.04 3.72872 63.9916 4.44071C63.9431 5.15269 64.1798 5.85474 64.6494 6.39254L68.5007 10.9769ZM71.3264 10.2364C71.0735 10.4399 70.7501 10.5348 70.4272 10.5002C70.1043 10.4656 69.8083 10.3044 69.6044 10.052L65.7531 5.46881C65.5397 5.22436 65.4321 4.90528 65.4541 4.58167C65.4761 4.25806 65.6258 3.95641 65.8704 3.74299C66.1233 3.53947 66.4467 3.44456 66.7697 3.47914C67.0926 3.51371 67.3886 3.67492 67.5926 3.92735L71.4439 8.50959C71.5497 8.63064 71.6307 8.77134 71.6821 8.92365C71.7335 9.07595 71.7543 9.23688 71.7435 9.39724C71.7326 9.5576 71.6902 9.71424 71.6186 9.85822C71.5471 10.0022 71.4477 10.1307 71.3264 10.2364Z" fill="#EDEDED"/>
-<g filter="url(#filter2_f_1521_3854)">
-<path d="M68.9808 3.733L70.1664 5.36528L69.518 5.45759L68.3322 3.82576L68.9808 3.733Z" fill="#B6B6B6"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M68.4196 9.97693C68.6355 10.2578 68.9053 10.4919 69.213 10.6651C69.5207 10.8383 69.8599 10.9471 70.2103 10.985C70.5607 11.0228 70.915 10.989 71.2521 10.8854C71.5892 10.7819 71.9021 10.6108 72.1721 10.3824C72.4421 10.154 72.6635 9.87294 72.8232 9.55617C72.9828 9.2394 73.0774 8.89338 73.1013 8.53886C73.1252 8.18434 73.0778 7.8286 72.9621 7.49297C72.8463 7.15734 72.6646 6.84873 72.4277 6.58562L68.6131 2.00147C68.1687 1.44615 67.5239 1.09146 66.8202 1.01536C66.1166 0.939261 65.4118 1.14798 64.8607 1.59564C64.3277 2.06508 64.0014 2.72872 63.9534 3.44071C63.9055 4.15269 64.1398 4.85474 64.605 5.39254L68.4196 9.97693ZM71.2184 9.23637C70.968 9.43988 70.6476 9.53478 70.3278 9.50021C70.008 9.46563 69.7148 9.30442 69.5128 9.05201L65.6982 4.46881C65.4868 4.22436 65.3803 3.90528 65.4021 3.58167C65.4238 3.25806 65.5721 2.95641 65.8143 2.74299C66.0648 2.53947 66.3852 2.44456 66.7051 2.47914C67.025 2.51371 67.3181 2.67492 67.5202 2.92735L71.3348 7.50959C71.4396 7.63064 71.5198 7.77134 71.5707 7.92365C71.6216 8.07595 71.6423 8.23688 71.6315 8.39724C71.6207 8.5576 71.5787 8.71424 71.5079 8.85822C71.437 9.0022 71.3385 9.1307 71.2184 9.23637Z" fill="#121212"/>
+<g filter="url(#filter2_f_1724_2982)">
+<path d="M68.8945 2.73251L70.0689 4.3648L69.4266 4.4571L68.2521 2.82527L68.8945 2.73251Z" fill="#848484"/>
 </g>
-<path d="M67.6666 5.18138L68.6987 6.25897C70.1181 4.27931 68.5063 2.06351 66.8228 2.00586L66.3887 3.49437C67.4102 3.33062 68.0611 4.33457 67.6666 5.18138Z" fill="url(#paint0_linear_1521_3854)"/>
+<path d="M67.5939 4.18235L68.6162 5.25995C70.0221 3.28029 68.4256 1.06448 66.7582 1.00684L66.3281 2.49534C67.3399 2.3316 67.9846 3.33555 67.5939 4.18235Z" fill="url(#paint0_linear_1724_2982)"/>
 <defs>
-<filter id="filter0_f_1521_3854" x="63.0604" y="4.14734" width="6.73315" height="6.94458" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter0_f_1724_2982" x="63.6536" y="3.79076" width="5.42433" height="5.65455" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="1.16949" result="effect1_foregroundBlur_1521_3854"/>
+<feGaussianBlur stdDeviation="0.847049" result="effect1_foregroundBlur_1724_2982"/>
 </filter>
-<filter id="filter1_f_1521_3854" x="60.3451" y="1.83582" width="6.72925" height="6.59497" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter1_f_1724_2982" x="60.9641" y="1.47924" width="5.41945" height="5.30568" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="1.16949" result="effect1_foregroundBlur_1521_3854"/>
+<feGaussianBlur stdDeviation="0.847049" result="effect1_foregroundBlur_1724_2982"/>
 </filter>
-<filter id="filter2_f_1521_3854" x="65.993" y="1.39441" width="6.51245" height="6.40259" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<filter id="filter2_f_1724_2982" x="66.5579" y="1.03832" width="5.20558" height="5.11281" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
 <feFlood flood-opacity="0" result="BackgroundImageFix"/>
 <feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feGaussianBlur stdDeviation="1.16949" result="effect1_foregroundBlur_1521_3854"/>
+<feGaussianBlur stdDeviation="0.847049" result="effect1_foregroundBlur_1724_2982"/>
 </filter>
-<linearGradient id="paint0_linear_1521_3854" x1="67.4516" y1="2.78341" x2="68.3598" y2="6.13986" gradientUnits="userSpaceOnUse">
-<stop stop-color="#EDEDED"/>
-<stop offset="1" stop-color="#ECECEC"/>
+<linearGradient id="paint0_linear_1724_2982" x1="67.3809" y1="1.78439" x2="68.2966" y2="5.13642" gradientUnits="userSpaceOnUse">
+<stop stop-color="#121212"/>
+<stop offset="1" stop-color="#171717"/>
 </linearGradient>
 </defs>
 </svg>
diff --git a/src/assets/images/light/send-icon.svg b/src/assets/images/light/send-icon.svg
index 7869a076..e1d1e278 100644
--- a/src/assets/images/light/send-icon.svg
+++ b/src/assets/images/light/send-icon.svg
@@ -1,3 +1,3 @@
 <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.22754 13.7735L13.7735 4.22754M13.7735 4.22754H8.47046M13.7735 4.22754L13.7732 9.53084" stroke="#F7F7F7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.22656 13.7735L13.7725 4.22754M13.7725 4.22754H8.46948M13.7725 4.22754L13.7722 9.53084" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/light/slider-right.svg b/src/assets/images/light/slider-right.svg
index dee928e6..486412d7 100644
--- a/src/assets/images/light/slider-right.svg
+++ b/src/assets/images/light/slider-right.svg
@@ -1,3 +1,3 @@
 <svg width="8" height="12" viewBox="0 0 8 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.5 11L6.5 6L1.5 1" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M1.5 11L6.5 6L1.5 1" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/light/tokens-icon-selected.svg b/src/assets/images/light/tokens-icon-selected.svg
index d6ea4a51..96a25742 100644
--- a/src/assets/images/light/tokens-icon-selected.svg
+++ b/src/assets/images/light/tokens-icon-selected.svg
@@ -1,9 +1,9 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_919_2607)">
-<path d="M8.5 14.6667C8.5 15.9553 9.54467 17 10.8333 17H13C14.3807 17 15.5 15.8807 15.5 14.5C15.5 13.1193 14.3807 12 13 12H11C9.61929 12 8.5 10.8807 8.5 9.5C8.5 8.11929 9.61929 7 11 7H13.1667C14.4553 7 15.5 8.04467 15.5 9.33333M12 5.5V7M12 17V18.5M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<g clip-path="url(#clip0_1724_2998)">
+<path d="M8.5 14.6667C8.5 15.9553 9.54467 17 10.8333 17H13C14.3807 17 15.5 15.8807 15.5 14.5C15.5 13.1193 14.3807 12 13 12H11C9.61929 12 8.5 10.8807 8.5 9.5C8.5 8.11929 9.61929 7 11 7H13.1667C14.4553 7 15.5 8.04467 15.5 9.33333M12 5.5V7M12 17V18.5M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </g>
 <defs>
-<clipPath id="clip0_919_2607">
+<clipPath id="clip0_1724_2998">
 <rect width="24" height="24" fill="white"/>
 </clipPath>
 </defs>
diff --git a/src/assets/images/light/tokens-icon.svg b/src/assets/images/light/tokens-icon.svg
index faa3df12..8f04aca8 100644
--- a/src/assets/images/light/tokens-icon.svg
+++ b/src/assets/images/light/tokens-icon.svg
@@ -1,9 +1,9 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_847_4315)">
+<g clip-path="url(#clip0_1724_3079)">
 <path d="M8.5 14.6667C8.5 15.9553 9.54467 17 10.8333 17H13C14.3807 17 15.5 15.8807 15.5 14.5C15.5 13.1193 14.3807 12 13 12H11C9.61929 12 8.5 10.8807 8.5 9.5C8.5 8.11929 9.61929 7 11 7H13.1667C14.4553 7 15.5 8.04467 15.5 9.33333M12 5.5V7M12 17V18.5M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </g>
 <defs>
-<clipPath id="clip0_847_4315">
+<clipPath id="clip0_1724_3079">
 <rect width="24" height="24" fill="white"/>
 </clipPath>
 </defs>
diff --git a/src/components/AppFooter.vue b/src/components/AppFooter.vue
index 3e347364..9d0e5a7e 100644
--- a/src/components/AppFooter.vue
+++ b/src/components/AppFooter.vue
@@ -26,7 +26,9 @@ function getIcon(icon: string, pathName: string) {
 </script>
 
 <template>
-  <footer class="flex items-center px-12 py-2 dark:bg-black-400">
+  <footer
+    class="flex items-center px-12 py-2 bg-gray-900 border-gray-800 border-t-1 dark:bg-black-400 dark:border-0"
+  >
     <nav v-if="userStore.isLoggedIn" class="flex flex-grow justify-between">
       <router-link
         :to="{ name: 'home' }"
@@ -35,7 +37,7 @@ function getIcon(icon: string, pathName: string) {
       >
         <div
           class="w-xxxl h-xxl rounded-md flex items-center justify-center"
-          :class="{ 'bg-white-100': isCurrentRoute('home') }"
+          :class="{ 'bg-black-500 dark:bg-white-100': isCurrentRoute('home') }"
         >
           <img
             :src="getIcon('tokens-icon', 'home')"
@@ -45,7 +47,9 @@ function getIcon(icon: string, pathName: string) {
         </div>
         <span
           class="text-xs font-normal text-gray-100"
-          :class="{ 'text-white-100': isCurrentRoute('home') }"
+          :class="{
+            'text-black-300 dark:text-white-100': isCurrentRoute('home'),
+          }"
           >Tokens</span
         >
       </router-link>
@@ -56,13 +60,15 @@ function getIcon(icon: string, pathName: string) {
       >
         <div
           class="w-xxxl h-xxl rounded-md flex items-center justify-center"
-          :class="{ 'bg-white-100': isCurrentRoute('Nfts') }"
+          :class="{ 'bg-black-500 dark:bg-white-100': isCurrentRoute('Nfts') }"
         >
           <img :src="getIcon('nfts-icon', 'Nfts')" alt="nfts" />
         </div>
         <span
           class="text-xs font-normal text-gray-100"
-          :class="{ 'text-white-100': isCurrentRoute('Nfts') }"
+          :class="{
+            'text-black-300 dark:text-white-100': isCurrentRoute('Nfts'),
+          }"
           >NFT</span
         >
       </router-link>
@@ -73,13 +79,15 @@ function getIcon(icon: string, pathName: string) {
       >
         <div
           class="w-xxxl h-xxl rounded-md flex items-center justify-center"
-          :class="{ 'bg-white-100': isCurrentRoute('profile') }"
+          :class="{ 'bg-black-500 bg-white-100': isCurrentRoute('profile') }"
         >
           <img :src="getIcon('profile-icon', 'profile')" alt="profile" />
         </div>
         <span
           class="text-xs font-normal text-gray-100"
-          :class="{ 'text-white-100': isCurrentRoute('profile') }"
+          :class="{
+            'text-black-300 dark:text-white-100': isCurrentRoute('profile'),
+          }"
           >Profile</span
         >
       </router-link>
@@ -90,7 +98,9 @@ function getIcon(icon: string, pathName: string) {
       >
         <div
           class="w-xxxl h-xxl rounded-md flex items-center justify-center"
-          :class="{ 'bg-white-100': isCurrentRoute('activities') }"
+          :class="{
+            'bg-black-500 dark:bg-white-100': isCurrentRoute('activities'),
+          }"
         >
           <img
             :src="getIcon('notifications-icon', 'activities')"
@@ -99,7 +109,9 @@ function getIcon(icon: string, pathName: string) {
         </div>
         <span
           class="text-xs font-normal text-gray-100"
-          :class="{ 'text-white-100': isCurrentRoute('activities') }"
+          :class="{
+            'text-black-300 dark:text-white-100': isCurrentRoute('activities'),
+          }"
           >Activity</span
         >
       </router-link>
diff --git a/src/components/BaseModal.vue b/src/components/BaseModal.vue
index 01bc5167..e9a01662 100644
--- a/src/components/BaseModal.vue
+++ b/src/components/BaseModal.vue
@@ -19,7 +19,7 @@ function handleCollapse() {
 <template>
   <div class="fixed flex justify-center items-center inset-0 z-50 p-3 overlay">
     <div
-      class="card absolute flex flex-col pt-2"
+      class="card absolute flex flex-col pt-2 rounded-b-none"
       :class="{ collapse: canModalCollapse }"
     >
       <div class="flex justify-center">
diff --git a/src/components/GasPrice.vue b/src/components/GasPrice.vue
index ebcc8316..566b7838 100644
--- a/src/components/GasPrice.vue
+++ b/src/components/GasPrice.vue
@@ -101,35 +101,41 @@ function handleCustomGasPriceInput(value) {
       <span class="text-sm font-medium">Gas Fees</span>
       <div class="text-xs font-normal">
         <span class="text-gray-100">Transaction Time:</span>
-        <span class="text-white-100">
+        <span class="text-black-500 dark:text-white-100">
           ~{{ hasGasStation ? '-' : transactionTime }} mins
         </span>
       </div>
     </div>
     <div class="card flex p-1">
       <div
-        class="p-1 w-full text-center text-gray-100 text-base font-normal cursor-pointer rounded-sm hover:bg-black-300"
+        class="p-1 w-full text-center text-base font-normal cursor-pointer rounded-sm hover:bg-black-500 dark:hover:bg-black-300 focus-visible:bg-black-500 dark:focus-visible:bg-black-300"
         :class="{
-          'bg-black-300 text-white-100': selectedGasMethod === 'normal',
+          'bg-black-500 dark:bg-black-300 text-white-100':
+            selectedGasMethod === 'normal',
+          'text-gray-100': selectedGasMethod !== 'normal',
         }"
         @click.stop="selectedGasMethod = 'normal'"
       >
         Normal
       </div>
       <div
-        class="p-1 w-full text-center text-gray-100 text-base font-normal cursor-pointer rounded-sm hover:bg-black-300"
+        class="p-1 w-full text-center text-base font-normal cursor-pointer rounded-sm hover:bg-black-500 dark:hover:bg-black-300 focus-visible:bg-black-500 dark:focus-visible:bg-black-300"
         :class="{
           'cursor-not-allowed opacity-60 pointer-events-none': !hasGasStation,
-          'bg-black-300 text-white-100': selectedGasMethod === 'fast',
+          'bg-black-500 dark:bg-black-300 text-white-100':
+            selectedGasMethod === 'fast',
+          'text-gray-100': selectedGasMethod !== 'fast',
         }"
         @click.stop="hasGasStation ? (selectedGasMethod = 'fast') : void 0"
       >
         Fast
       </div>
       <div
-        class="p-1 w-full text-center text-gray-100 text-base font-normal cursor-pointer rounded-sm hover:bg-black-300"
+        class="p-1 w-full text-center text-base font-normal cursor-pointer rounded-sm hover:bg-black-500 dark:hover:bg-black-300 focus-visible:bg-black-500 dark:focus-visible:bg-black-300"
         :class="{
-          'bg-black-300 text-white-100': selectedGasMethod === 'custom',
+          'bg-black-500 dark:bg-black-300 text-white-100':
+            selectedGasMethod === 'custom',
+          'text-gray-100': selectedGasMethod !== 'custom',
         }"
         @click.stop="selectedGasMethod = 'custom'"
       >
diff --git a/src/components/SwipeToAction.vue b/src/components/SwipeToAction.vue
index 389e1285..64d87832 100644
--- a/src/components/SwipeToAction.vue
+++ b/src/components/SwipeToAction.vue
@@ -52,7 +52,7 @@ function handleDragStart(e) {
 </script>
 
 <template>
-  <div class="bg-gray-300 rounded-sm p-[2px]">
+  <div class="bg-white-400 dark:bg-gray-300 rounded-sm p-[2px]">
     <div
       class="relative rounded-sm overflow-hidden"
       @touchstart="handleDragStart"
diff --git a/src/index.css b/src/index.css
index 27ece784..b1035758 100644
--- a/src/index.css
+++ b/src/index.css
@@ -35,7 +35,7 @@
 
 @layer base {
   body {
-    @apply font-onest text-black-100 dark:text-white-100 leading-normal;
+    @apply font-onest text-black-500 dark:text-white-100 leading-normal;
   }
 
   button {
@@ -47,40 +47,42 @@
 
   input,
   select {
-    @apply bg-transparent outline-none shadow-none dark:placeholder:text-gray-100 font-normal text-base p-[10px];
+    @apply bg-transparent outline-none shadow-none placeholder:text-gray-100 font-normal text-base p-[10px];
   }
 }
 
 @layer components {
   .btn-primary {
-    @apply dark:bg-white-100 dark:active:bg-gray-400 dark:text-black-200 dark:hover:shadow-sm dark:hover:shadow-dark-100
-          rounded-sm;
+    @apply bg-black-500 dark:bg-white-100 dark:active:bg-gray-400 text-white-100 dark:text-black-200 hover:shadow-sm
+    focus-visible:shadow-sm hover:shadow-dark-100 focus-visible:shadow-dark-100 rounded-sm;
   }
 
   .btn-secondary {
-    @apply dark:active:bg-gray-500 dark:text-white-200 dark:hover:shadow-sm dark:hover:shadow-dark-100
-          box-border dark:border-white-200 border-default rounded-sm;
+    @apply active:bg-gray-700 dark:active:bg-gray-500 text-black-500
+           dark:text-white-200 hover:shadow-sm focus-visible:shadow-sm hover:shadow-dark-100
+           focus-visible:shadow-dark-100 box-border border-black-500 dark:border-white-200 border-default rounded-sm;
   }
 
   .btn-tertiary {
-    @apply dark:text-white-100 dark:hover:dark-text-shadow-100;
+    @apply text-black-500 dark:text-white-100 hover:dark-text-shadow-100 focus-visible:dark-text-shadow-100;
   }
 
   .btn-quaternery {
-    @apply dark:bg-black-100 dark:text-white-100 dark:active:text-gray-400 dark:hover:dark-text-shadow-100
-          box-border dark:border-gray-200 border-default;
+    @apply bg-white-300 dark:bg-black-100 text-black-100 dark:text-white-100 dark:active:text-gray-400
+           hover:dark-text-shadow-100 focus-visible:dark-text-shadow-100
+           box-border border-gray-800 dark:border-gray-200 border-default;
   }
 
   .card {
-    @apply dark:bg-black-200 dark:border-gray-200 border rounded-md;
+    @apply bg-white-400 dark:bg-black-200 border-gray-800 dark:border-gray-200 border rounded-md;
   }
 
   .input-field {
-    @apply dark:bg-gray-300 rounded-sm flex items-center;
+    @apply bg-white-400 dark:bg-gray-300 rounded-sm flex items-center;
   }
 
   .input-active {
-    @apply outline-1 dark:outline-white-200 outline;
+    @apply outline-1 outline-black-500 dark:outline-white-200 outline;
   }
 }
 
@@ -89,6 +91,10 @@
     text-shadow: 0 0 6px rgb(236 236 236 / 45%);
   }
 
+  .text-shadow-100 {
+    text-shadow: 0 0 6px rgb(236 236 236 / 45%);
+  }
+
   .font-onest {
     font-family: Onest, sans-serif;
   }
diff --git a/src/pages/SendTokens.vue b/src/pages/SendTokens.vue
index 3e584b70..d04f686c 100644
--- a/src/pages/SendTokens.vue
+++ b/src/pages/SendTokens.vue
@@ -337,7 +337,7 @@ function handleTokenChange(e) {
             </div>
             <div class="text-gray-100 text-xs font-normal">
               Total Balance:
-              <span class="text-white-100"
+              <span class="text-black-500 dark:text-white-100"
                 >{{ Number(selectedTokenBalance) }}
                 {{ selectedToken.symbol }}</span
               >
@@ -355,7 +355,6 @@ function handleTokenChange(e) {
                 <option
                   v-for="token in tokenList"
                   :key="token.address"
-                  class="text-black hover:text-white"
                   :value="JSON.stringify(token)"
                 >
                   {{ token.symbol }}

From a993e39f2150638ec45e64ec357ca5bc107efac2 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 23 May 2023 12:02:35 +0530
Subject: [PATCH 069/153] Add light theme icons

---
 src/assets/images/dark/copy.svg           |  4 +--
 src/assets/images/light/copy.svg          |  4 +--
 src/assets/images/light/download.svg      |  2 +-
 src/assets/images/light/external-link.svg |  2 +-
 src/assets/images/light/eye-off.svg       |  4 +--
 src/assets/images/light/eye.svg           |  4 +--
 src/assets/images/light/forward-arrow.svg |  2 +-
 src/components/AppFooter.vue              |  4 ++-
 src/components/BuyTokens.vue              |  9 +++--
 src/components/ExportKeyModal.vue         |  8 ++---
 src/components/PinBasedRecoveryModal.vue  | 40 +++++++++++++----------
 src/components/PrivateKeyCautionModal.vue |  3 +-
 src/index.css                             | 11 +++++++
 13 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/src/assets/images/dark/copy.svg b/src/assets/images/dark/copy.svg
index 4bfd6759..4d62753e 100644
--- a/src/assets/images/dark/copy.svg
+++ b/src/assets/images/dark/copy.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 10H11.8667C12.6134 10 12.9866 9.99998 13.2719 9.85466C13.5227 9.72682 13.727 9.5229 13.8548 9.27202C14.0001 8.9868 14.0001 8.61344 14.0001 7.8667V4.13335C14.0001 3.38662 14.0001 3.01324 13.8548 2.72803C13.727 2.47714 13.5227 2.27316 13.2719 2.14532C12.9866 2 12.6135 2 11.8668 2H8.13346C7.38673 2 7.01308 2 6.72786 2.14532C6.47698 2.27316 6.27316 2.47714 6.14532 2.72803C6 3.01324 6 3.38665 6 4.13338V6.00005M2 11.8667V8.13338C2 7.38665 2 7.01324 2.14532 6.72803C2.27316 6.47714 2.47698 6.27316 2.72786 6.14532C3.01308 6 3.38673 6 4.13346 6H7.8668C8.61353 6 8.98664 6 9.27186 6.14532C9.52274 6.27316 9.72699 6.47714 9.85482 6.72803C10.0001 7.01324 10.0001 7.38661 10.0001 8.13335V11.8667C10.0001 12.6134 10.0001 12.9868 9.85482 13.272C9.72699 13.5229 9.52274 13.7268 9.27186 13.8547C8.98664 14 8.61353 14 7.8668 14H4.13346C3.38673 14 3.01308 14 2.72786 13.8547C2.47698 13.7268 2.27316 13.5229 2.14532 13.272C2 12.9868 2 12.6135 2 11.8667Z" stroke="#F7F7F7" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 8V6.6C8 6.03995 8 5.75992 8.10899 5.54601C8.20487 5.35785 8.35785 5.20487 8.54601 5.10899C8.75992 5 9.03995 5 9.6 5H13.4C13.9601 5 14.2401 5 14.454 5.10899C14.6422 5.20487 14.7951 5.35785 14.891 5.54601C15 5.75992 15 6.03995 15 6.6V10.4C15 10.9601 15 11.2401 14.891 11.454C14.7951 11.6422 14.6422 11.7951 14.454 11.891C14.2401 12 13.9601 12 13.4 12H12M6.6 15H10.4C10.9601 15 11.2401 15 11.454 14.891C11.6422 14.7951 11.7951 14.6422 11.891 14.454C12 14.2401 12 13.9601 12 13.4V9.6C12 9.03995 12 8.75992 11.891 8.54601C11.7951 8.35785 11.6422 8.20487 11.454 8.10899C11.2401 8 10.9601 8 10.4 8H6.6C6.03995 8 5.75992 8 5.54601 8.10899C5.35785 8.20487 5.20487 8.35785 5.10899 8.54601C5 8.75992 5 9.03995 5 9.6V13.4C5 13.9601 5 14.2401 5.10899 14.454C5.20487 14.6422 5.35785 14.7951 5.54601 14.891C5.75992 15 6.03995 15 6.6 15Z" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/light/copy.svg b/src/assets/images/light/copy.svg
index 4bfd6759..00538f55 100644
--- a/src/assets/images/light/copy.svg
+++ b/src/assets/images/light/copy.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 10H11.8667C12.6134 10 12.9866 9.99998 13.2719 9.85466C13.5227 9.72682 13.727 9.5229 13.8548 9.27202C14.0001 8.9868 14.0001 8.61344 14.0001 7.8667V4.13335C14.0001 3.38662 14.0001 3.01324 13.8548 2.72803C13.727 2.47714 13.5227 2.27316 13.2719 2.14532C12.9866 2 12.6135 2 11.8668 2H8.13346C7.38673 2 7.01308 2 6.72786 2.14532C6.47698 2.27316 6.27316 2.47714 6.14532 2.72803C6 3.01324 6 3.38665 6 4.13338V6.00005M2 11.8667V8.13338C2 7.38665 2 7.01324 2.14532 6.72803C2.27316 6.47714 2.47698 6.27316 2.72786 6.14532C3.01308 6 3.38673 6 4.13346 6H7.8668C8.61353 6 8.98664 6 9.27186 6.14532C9.52274 6.27316 9.72699 6.47714 9.85482 6.72803C10.0001 7.01324 10.0001 7.38661 10.0001 8.13335V11.8667C10.0001 12.6134 10.0001 12.9868 9.85482 13.272C9.72699 13.5229 9.52274 13.7268 9.27186 13.8547C8.98664 14 8.61353 14 7.8668 14H4.13346C3.38673 14 3.01308 14 2.72786 13.8547C2.47698 13.7268 2.27316 13.5229 2.14532 13.272C2 12.9868 2 12.6135 2 11.8667Z" stroke="#F7F7F7" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 8V6.6C8 6.03995 8 5.75992 8.10899 5.54601C8.20487 5.35785 8.35785 5.20487 8.54601 5.10899C8.75992 5 9.03995 5 9.6 5H13.4C13.9601 5 14.2401 5 14.454 5.10899C14.6422 5.20487 14.7951 5.35785 14.891 5.54601C15 5.75992 15 6.03995 15 6.6V10.4C15 10.9601 15 11.2401 14.891 11.454C14.7951 11.6422 14.6422 11.7951 14.454 11.891C14.2401 12 13.9601 12 13.4 12H12M6.6 15H10.4C10.9601 15 11.2401 15 11.454 14.891C11.6422 14.7951 11.7951 14.6422 11.891 14.454C12 14.2401 12 13.9601 12 13.4V9.6C12 9.03995 12 8.75992 11.891 8.54601C11.7951 8.35785 11.6422 8.20487 11.454 8.10899C11.2401 8 10.9601 8 10.4 8H6.6C6.03995 8 5.75992 8 5.54601 8.10899C5.35785 8.20487 5.20487 8.35785 5.10899 8.54601C5 8.75992 5 9.03995 5 9.6V13.4C5 13.9601 5 14.2401 5.10899 14.454C5.20487 14.6422 5.35785 14.7951 5.54601 14.891C5.75992 15 6.03995 15 6.6 15Z" stroke="#333333" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/light/download.svg b/src/assets/images/light/download.svg
index e6bdb36d..8c5c3d19 100644
--- a/src/assets/images/light/download.svg
+++ b/src/assets/images/light/download.svg
@@ -1,3 +1,3 @@
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15 15H5M13.3333 9.44444L10 12.7778M10 12.7778L6.66667 9.44444M10 12.7778V5" stroke="white" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M15 15H5M13.3333 9.44444L10 12.7778M10 12.7778L6.66667 9.44444M10 12.7778V5" stroke="#333333" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/light/external-link.svg b/src/assets/images/light/external-link.svg
index af0dbb52..e0611a5e 100644
--- a/src/assets/images/light/external-link.svg
+++ b/src/assets/images/light/external-link.svg
@@ -1,3 +1,3 @@
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M17.5 7.50001L17.5 2.50001M17.5 2.50001H12.5M17.5 2.50001L10 10M8.33333 2.5H6.5C5.09987 2.5 4.3998 2.5 3.86502 2.77248C3.39462 3.01217 3.01217 3.39462 2.77248 3.86502C2.5 4.3998 2.5 5.09987 2.5 6.5V13.5C2.5 14.9001 2.5 15.6002 2.77248 16.135C3.01217 16.6054 3.39462 16.9878 3.86502 17.2275C4.3998 17.5 5.09987 17.5 6.5 17.5H13.5C14.9001 17.5 15.6002 17.5 16.135 17.2275C16.6054 16.9878 16.9878 16.6054 17.2275 16.135C17.5 15.6002 17.5 14.9001 17.5 13.5V11.6667" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.5 7.50001L17.5 2.50001M17.5 2.50001H12.5M17.5 2.50001L10 10M8.33333 2.5H6.5C5.09987 2.5 4.3998 2.5 3.86502 2.77248C3.39462 3.01217 3.01217 3.39462 2.77248 3.86502C2.5 4.3998 2.5 5.09987 2.5 6.5V13.5C2.5 14.9001 2.5 15.6002 2.77248 16.135C3.01217 16.6054 3.39462 16.9878 3.86502 17.2275C4.3998 17.5 5.09987 17.5 6.5 17.5H13.5C14.9001 17.5 15.6002 17.5 16.135 17.2275C16.6054 16.9878 16.9878 16.6054 17.2275 16.135C17.5 15.6002 17.5 14.9001 17.5 13.5V11.6667" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/light/eye-off.svg b/src/assets/images/light/eye-off.svg
index 1b7c08be..250f9544 100644
--- a/src/assets/images/light/eye-off.svg
+++ b/src/assets/images/light/eye-off.svg
@@ -1,10 +1,10 @@
 <svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g clip-path="url(#clip0_847_4731)">
-<path d="M4.47623 2.1218C4.64556 2.09676 4.82025 2.08333 5.00017 2.08333C7.12726 2.08333 8.52304 3.96035 8.99196 4.70284C9.04871 4.79271 9.07709 4.83764 9.09297 4.90695C9.1049 4.959 9.10489 5.04111 9.09295 5.09316C9.07706 5.16246 9.04848 5.20769 8.99133 5.29815C8.86639 5.4959 8.67591 5.77379 8.42354 6.07519M2.8018 2.79793C1.90094 3.40904 1.28935 4.25807 1.00879 4.7022C0.951785 4.79245 0.923281 4.83757 0.907391 4.90687C0.895457 4.95891 0.895452 5.04102 0.90738 5.09307C0.923262 5.16237 0.951638 5.2073 1.00839 5.29716C1.47731 6.03965 2.87309 7.91667 5.00017 7.91667C5.85784 7.91667 6.59662 7.6115 7.20367 7.19858M1.25017 1.25L8.75017 8.75M4.11629 4.11612C3.89008 4.34232 3.75017 4.65482 3.75017 5C3.75017 5.69036 4.30982 6.25 5.00017 6.25C5.34535 6.25 5.65785 6.11009 5.88406 5.88388" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.47623 2.1218C4.64556 2.09676 4.82025 2.08333 5.00017 2.08333C7.12726 2.08333 8.52304 3.96035 8.99196 4.70284C9.04871 4.79271 9.07709 4.83764 9.09297 4.90695C9.1049 4.959 9.10489 5.04111 9.09295 5.09316C9.07706 5.16246 9.04848 5.20769 8.99133 5.29815C8.86639 5.4959 8.67591 5.77379 8.42354 6.07519M2.8018 2.79793C1.90094 3.40904 1.28935 4.25807 1.00879 4.7022C0.951785 4.79245 0.923281 4.83757 0.907391 4.90687C0.895457 4.95891 0.895452 5.04102 0.90738 5.09307C0.923262 5.16237 0.951638 5.2073 1.00839 5.29716C1.47731 6.03965 2.87309 7.91667 5.00017 7.91667C5.85784 7.91667 6.59662 7.6115 7.20367 7.19858M1.25017 1.25L8.75017 8.75M4.11629 4.11612C3.89008 4.34232 3.75017 4.65482 3.75017 5C3.75017 5.69036 4.30982 6.25 5.00017 6.25C5.34535 6.25 5.65785 6.11009 5.88406 5.88388" stroke="#333333" stroke-linecap="round" stroke-linejoin="round"/>
 </g>
 <defs>
 <clipPath id="clip0_847_4731">
-<rect width="10" height="10" fill="white"/>
+<rect width="10" height="10" fill="#333333"/>
 </clipPath>
 </defs>
 </svg>
diff --git a/src/assets/images/light/eye.svg b/src/assets/images/light/eye.svg
index 366da07c..33b0c06c 100644
--- a/src/assets/images/light/eye.svg
+++ b/src/assets/images/light/eye.svg
@@ -1,4 +1,4 @@
 <svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.00838 5.29708C0.95164 5.20723 0.923268 5.1623 0.907385 5.09301C0.895455 5.04096 0.895455 4.95888 0.907385 4.90683C0.923268 4.83754 0.95164 4.79261 1.00838 4.70276C1.4773 3.96027 2.87308 2.08325 5.00017 2.08325C7.12725 2.08325 8.52303 3.96027 8.99195 4.70276C9.0487 4.79261 9.07707 4.83754 9.09295 4.90683C9.10488 4.95888 9.10488 5.04096 9.09295 5.09301C9.07707 5.1623 9.0487 5.20723 8.99195 5.29708C8.52303 6.03957 7.12725 7.91659 5.00017 7.91659C2.87308 7.91659 1.4773 6.03957 1.00838 5.29708Z" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.00017 6.24992C5.69052 6.24992 6.25017 5.69027 6.25017 4.99992C6.25017 4.30956 5.69052 3.74992 5.00017 3.74992C4.30981 3.74992 3.75017 4.30956 3.75017 4.99992C3.75017 5.69027 4.30981 6.24992 5.00017 6.24992Z" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M1.00838 5.29708C0.95164 5.20723 0.923268 5.1623 0.907385 5.09301C0.895455 5.04096 0.895455 4.95888 0.907385 4.90683C0.923268 4.83754 0.95164 4.79261 1.00838 4.70276C1.4773 3.96027 2.87308 2.08325 5.00017 2.08325C7.12725 2.08325 8.52303 3.96027 8.99195 4.70276C9.0487 4.79261 9.07707 4.83754 9.09295 4.90683C9.10488 4.95888 9.10488 5.04096 9.09295 5.09301C9.07707 5.1623 9.0487 5.20723 8.99195 5.29708C8.52303 6.03957 7.12725 7.91659 5.00017 7.91659C2.87308 7.91659 1.4773 6.03957 1.00838 5.29708Z" stroke="#333333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.00017 6.24992C5.69052 6.24992 6.25017 5.69027 6.25017 4.99992C6.25017 4.30956 5.69052 3.74992 5.00017 3.74992C4.30981 3.74992 3.75017 4.30956 3.75017 4.99992C3.75017 5.69027 4.30981 6.24992 5.00017 6.24992Z" stroke="#333333" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/images/light/forward-arrow.svg b/src/assets/images/light/forward-arrow.svg
index e809e41a..4e1d006d 100644
--- a/src/assets/images/light/forward-arrow.svg
+++ b/src/assets/images/light/forward-arrow.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 12H20M20 12L14 18M20 12L14 6" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4 12H20M20 12L14 18M20 12L14 6" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/components/AppFooter.vue b/src/components/AppFooter.vue
index 9d0e5a7e..51cbd606 100644
--- a/src/components/AppFooter.vue
+++ b/src/components/AppFooter.vue
@@ -79,7 +79,9 @@ function getIcon(icon: string, pathName: string) {
       >
         <div
           class="w-xxxl h-xxl rounded-md flex items-center justify-center"
-          :class="{ 'bg-black-500 bg-white-100': isCurrentRoute('profile') }"
+          :class="{
+            'bg-black-500 dark:bg-white-100': isCurrentRoute('profile'),
+          }"
         >
           <img :src="getIcon('profile-icon', 'profile')" alt="profile" />
         </div>
diff --git a/src/components/BuyTokens.vue b/src/components/BuyTokens.vue
index c700f811..26de7c08 100644
--- a/src/components/BuyTokens.vue
+++ b/src/components/BuyTokens.vue
@@ -117,7 +117,8 @@ function handleDone() {
           :class="{
             'opacity-60 cursor-not-allowed': !props.transakNetwork,
             'hover:border-gray-100 cursor-pointer': props.transakNetwork,
-            'border-gray-100 bg-black-300': selectedProvider === 'transak',
+            'border-gray-100 bg-white-300 dark:bg-black-300':
+              selectedProvider === 'transak',
           }"
           @click.stop="
             props.transakNetwork ? (selectedProvider = 'transak') : void 0
@@ -142,7 +143,8 @@ function handleDone() {
           :class="{
             'opacity-60 cursor-not-allowed': !props.rampNetwork,
             'hover:border-gray-100 cursor-pointer': props.rampNetwork,
-            'border-gray-100 bg-black-300': selectedProvider === 'ramp',
+            'border-gray-100 bg-white-300 dark:bg-black-300':
+              selectedProvider === 'ramp',
           }"
           @click.stop="props.rampNetwork ? (selectedProvider = 'ramp') : void 0"
         >
@@ -165,7 +167,8 @@ function handleDone() {
           :class="{
             'opacity-60 cursor-not-allowed': !props.onRampMoney,
             'hover:border-gray-100 cursor-pointer': props.onRampMoney,
-            'border-gray-100 bg-black-300': selectedProvider === 'onramp.money',
+            'border-gray-100 bg-white-300 dark:bg-black-300':
+              selectedProvider === 'onramp.money',
           }"
           @click.stop="
             props.onRampMoney ? (selectedProvider = 'onramp.money') : void 0
diff --git a/src/components/ExportKeyModal.vue b/src/components/ExportKeyModal.vue
index cea0d178..fe575037 100644
--- a/src/components/ExportKeyModal.vue
+++ b/src/components/ExportKeyModal.vue
@@ -41,11 +41,7 @@ const emit = defineEmits(['copy', 'download', 'close'])
         </div>
         <div
           class="absolute inset-0 rounded-sm transition-all duration-200 z-10"
-          :style="
-            showPK
-              ? ''
-              : `background: rgb(49 49 49 / 62%); backdrop-filter: blur(3.5px)`
-          "
+          :class="showPK ? '' : 'glass-effect'"
         ></div>
       </div>
     </div>
@@ -61,7 +57,7 @@ const emit = defineEmits(['copy', 'download', 'close'])
         class="flex gap-1 items-center justify-center btn-tertiary text-sm font-medium p-2"
         @click.stop="emit('download')"
       >
-        <img src="@/assets/images/download.svg" class="w-lg h-lg" />
+        <img :src="getImage('download.svg')" class="w-lg h-lg" />
         <span>Download</span>
       </button>
     </div>
diff --git a/src/components/PinBasedRecoveryModal.vue b/src/components/PinBasedRecoveryModal.vue
index e0a3d8d4..a210ac03 100644
--- a/src/components/PinBasedRecoveryModal.vue
+++ b/src/components/PinBasedRecoveryModal.vue
@@ -2,6 +2,8 @@
 import { ref } from 'vue'
 import { useToast } from 'vue-toastification'
 
+import { getImage } from '@/utils/getImage'
+
 const emit = defineEmits(['proceed', 'back', 'switch-alternate'])
 
 const password = ref('')
@@ -34,37 +36,41 @@ function handleProceed() {
           <input
             v-model.trim="password"
             :type="passwordType"
-            class="text-base p-4 input text-ellipsis overflow-hidden whitespace-nowrap w-full"
+            class="text-sm p-3 input-field text-ellipsis overflow-hidden whitespace-nowrap w-full focus:input-field-active"
             placeholder="Enter a alphanumberic pin"
           />
           <img
             v-if="passwordType === 'password'"
-            src="@/assets/images/show-eye.png"
-            class="absolute top-0 right-0 p-[0.5rem] cursor-pointer invert dark:invert-0"
+            :src="getImage('eye.svg')"
+            class="absolute top-[50%] right-3 w-4 cursor-pointer"
+            style="transform: translateY(-50%)"
             title="Show password"
             @click.stop="passwordType = 'text'"
           />
           <img
             v-else
-            src="@/assets/images/hide-eye.png"
-            class="absolute top-0 right-0 p-[0.5rem] cursor-pointer invert dark:invert-0"
+            :src="getImage('eye-off.svg')"
+            class="absolute top-[50%] right-3 w-4 cursor-pointer"
+            style="transform: translateY(-50%)"
             title="Hide password"
             @click.stop="passwordType = 'password'"
           />
         </div>
       </div>
-      <button
-        class="mt-1 text-sm sm:text-xs rounded-xl font-semibold text-white dark:bg-white bg-black dark:text-black w-full h-10 sm:h-8 uppercase"
-        type="submit"
-      >
-        Proceed
-      </button>
-      <button
-        class="font-semibold capitalize text-sm sm:text-xs"
-        @click.stop="emit('switch-alternate')"
-      >
-        Answer Security Questions Instead
-      </button>
+      <div class="flex flex-col mt-1 justify-center items-center gap-4">
+        <button
+          class="mt-1 text-sm btn-primary p-2 uppercase w-48"
+          type="submit"
+        >
+          Proceed
+        </button>
+        <button
+          class="font-semibold capitalize text-sm btn-tertiary"
+          @click.stop="emit('switch-alternate')"
+        >
+          Answer Security Questions Instead
+        </button>
+      </div>
     </form>
   </div>
 </template>
diff --git a/src/components/PrivateKeyCautionModal.vue b/src/components/PrivateKeyCautionModal.vue
index 687f75f4..c38fdbac 100644
--- a/src/components/PrivateKeyCautionModal.vue
+++ b/src/components/PrivateKeyCautionModal.vue
@@ -17,10 +17,11 @@ const emit = defineEmits(['proceed', 'close'])
       <p>
         Please store your keys in a safe place as anyone with access to it can
         take over your wallet.
+        <br />
         <a
           :href="`${DOCS_URL}/howto/wallet_exkey.html`"
           target="_blank"
-          class="font-bold text-white-100 cursor-pointer"
+          class="font-bold text-black-500 dark:text-white-100 cursor-pointer"
           >LEARN MORE</a
         >
       </p>
diff --git a/src/index.css b/src/index.css
index b1035758..a9339e2d 100644
--- a/src/index.css
+++ b/src/index.css
@@ -98,4 +98,15 @@
   .font-onest {
     font-family: Onest, sans-serif;
   }
+
+  .glass-effect {
+    background: #eeeeee9e;
+    backdrop-filter: blur(3.5px);
+    @apply dark:glass-effect-dark;
+  }
+
+  .glass-effect-dark {
+    background: rgb(49 49 49 / 62%);
+    backdrop-filter: blur(3.5px);
+  }
 }

From fb84b6810b49ddcadceed4a25244bac99435bed2 Mon Sep 17 00:00:00 2001
From: Karthik Durai <iamkarthiksiddarth@gmail.com>
Date: Tue, 23 May 2023 12:56:43 +0530
Subject: [PATCH 070/153] implement code to get rpc config from Auth SDK (#327)

and use that as default
---
 src/pages/loggedInView.vue | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index 90e1ee53..6d730176 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -57,6 +57,7 @@ onMounted(async () => {
     await getRpcConfig()
     initKeeper()
     connectToParent()
+    await getRpcConfigFromParent()
     await setTheme()
     await getAccountDetails()
     appStore.showWallet = true
@@ -250,6 +251,25 @@ async function getRpcConfig() {
   }
 }
 
+async function getRpcConfigFromParent() {
+  try {
+    const parentConnectionInstance = await parentConnection.promise
+    const rpcConfig = await parentConnectionInstance.getRpcConfig()
+    if (rpcConfig) {
+      const chainId = Number(rpcConfig.chainId)
+      const chainToBeSet = enabledChainList.value.find(
+        (chain) => chain.chainId === chainId
+      )
+      if (chainToBeSet) {
+        rpcStore.setSelectedRPCConfig(chainToBeSet)
+        rpcStore.setRpcConfig(chainToBeSet)
+      }
+    }
+  } catch (err) {
+    console.log({ err })
+  }
+}
+
 async function handleGetPublicKey(id: string, verifier: LoginType) {
   const authProvider = await getAuthProvider(appStore.id as string)
   return await authProvider.getPublicKey({ id, verifier })

From 68315747754202b517b798d5b4e6758792b84fd7 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 23 May 2023 13:15:47 +0530
Subject: [PATCH 071/153] Update UI for light theme

---
 src/assets/images/dark/copy-big.svg           | 10 +++++
 src/assets/images/light/copy-big.svg          | 10 +++++
 src/components/PinBasedRecoveryModal.vue      |  2 +-
 src/components/SearchQuestion.vue             | 14 +++---
 .../SecurityQuestionRecoveryModal.vue         | 12 ++---
 src/components/SelectQuestion.vue             | 12 ++---
 src/components/UserWallet.vue                 | 15 +++----
 src/pages/MFARequiredScreen.vue               |  2 +-
 src/pages/MFARestoreScreen.vue                | 44 +++++++++----------
 src/pages/MFASetup.vue                        | 25 ++++++-----
 src/pages/loggedInView.vue                    |  2 +-
 src/pages/profileScreen.vue                   | 28 ++++++------
 12 files changed, 100 insertions(+), 76 deletions(-)
 create mode 100644 src/assets/images/dark/copy-big.svg
 create mode 100644 src/assets/images/light/copy-big.svg

diff --git a/src/assets/images/dark/copy-big.svg b/src/assets/images/dark/copy-big.svg
new file mode 100644
index 00000000..7144da86
--- /dev/null
+++ b/src/assets/images/dark/copy-big.svg
@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1212_2765)">
+<path d="M6.66699 6.66699V4.33366C6.66699 3.40024 6.66699 2.93353 6.84865 2.57701C7.00844 2.2634 7.2634 2.00844 7.57701 1.84865C7.93353 1.66699 8.40024 1.66699 9.33366 1.66699H15.667C16.6004 1.66699 17.0671 1.66699 17.4236 1.84865C17.7372 2.00844 17.9922 2.2634 18.152 2.57701C18.3337 2.93353 18.3337 3.40024 18.3337 4.33366V10.667C18.3337 11.6004 18.3337 12.0671 18.152 12.4236C17.9922 12.7372 17.7372 12.9922 17.4236 13.152C17.0671 13.3337 16.6004 13.3337 15.667 13.3337H13.3337M4.33366 18.3337H10.667C11.6004 18.3337 12.0671 18.3337 12.4236 18.152C12.7372 17.9922 12.9922 17.7372 13.152 17.4236C13.3337 17.0671 13.3337 16.6004 13.3337 15.667V9.33366C13.3337 8.40024 13.3337 7.93353 13.152 7.57701C12.9922 7.2634 12.7372 7.00844 12.4236 6.84865C12.0671 6.66699 11.6004 6.66699 10.667 6.66699H4.33366C3.40024 6.66699 2.93353 6.66699 2.57701 6.84865C2.2634 7.00844 2.00844 7.2634 1.84865 7.57701C1.66699 7.93353 1.66699 8.40024 1.66699 9.33366V15.667C1.66699 16.6004 1.66699 17.0671 1.84865 17.4236C2.00844 17.7372 2.2634 17.9922 2.57701 18.152C2.93353 18.3337 3.40024 18.3337 4.33366 18.3337Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_1212_2765">
+<rect width="20" height="20" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/assets/images/light/copy-big.svg b/src/assets/images/light/copy-big.svg
new file mode 100644
index 00000000..bce71877
--- /dev/null
+++ b/src/assets/images/light/copy-big.svg
@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1212_2765)">
+<path d="M6.66699 6.66699V4.33366C6.66699 3.40024 6.66699 2.93353 6.84865 2.57701C7.00844 2.2634 7.2634 2.00844 7.57701 1.84865C7.93353 1.66699 8.40024 1.66699 9.33366 1.66699H15.667C16.6004 1.66699 17.0671 1.66699 17.4236 1.84865C17.7372 2.00844 17.9922 2.2634 18.152 2.57701C18.3337 2.93353 18.3337 3.40024 18.3337 4.33366V10.667C18.3337 11.6004 18.3337 12.0671 18.152 12.4236C17.9922 12.7372 17.7372 12.9922 17.4236 13.152C17.0671 13.3337 16.6004 13.3337 15.667 13.3337H13.3337M4.33366 18.3337H10.667C11.6004 18.3337 12.0671 18.3337 12.4236 18.152C12.7372 17.9922 12.9922 17.7372 13.152 17.4236C13.3337 17.0671 13.3337 16.6004 13.3337 15.667V9.33366C13.3337 8.40024 13.3337 7.93353 13.152 7.57701C12.9922 7.2634 12.7372 7.00844 12.4236 6.84865C12.0671 6.66699 11.6004 6.66699 10.667 6.66699H4.33366C3.40024 6.66699 2.93353 6.66699 2.57701 6.84865C2.2634 7.00844 2.00844 7.2634 1.84865 7.57701C1.66699 7.93353 1.66699 8.40024 1.66699 9.33366V15.667C1.66699 16.6004 1.66699 17.0671 1.84865 17.4236C2.00844 17.7372 2.2634 17.9922 2.57701 18.152C2.93353 18.3337 3.40024 18.3337 4.33366 18.3337Z" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_1212_2765">
+<rect width="20" height="20" fill="#333333"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/components/PinBasedRecoveryModal.vue b/src/components/PinBasedRecoveryModal.vue
index a210ac03..b6af5957 100644
--- a/src/components/PinBasedRecoveryModal.vue
+++ b/src/components/PinBasedRecoveryModal.vue
@@ -36,7 +36,7 @@ function handleProceed() {
           <input
             v-model.trim="password"
             :type="passwordType"
-            class="text-sm p-3 input-field text-ellipsis overflow-hidden whitespace-nowrap w-full focus:input-field-active"
+            class="text-sm p-3 input-field text-ellipsis overflow-hidden whitespace-nowrap w-full focus:input-active"
             placeholder="Enter a alphanumberic pin"
           />
           <img
diff --git a/src/components/SearchQuestion.vue b/src/components/SearchQuestion.vue
index b64cd9a1..8c0f6e67 100644
--- a/src/components/SearchQuestion.vue
+++ b/src/components/SearchQuestion.vue
@@ -69,13 +69,13 @@ function displayValue() {
   <Combobox v-slot="{ open }" v-model="selectedQuestion" nullable>
     <div class="relative">
       <div
-        class="relative w-full cursor-default overflow-hidden flex flex-nowrap input-field p-1 pr-2 outline-none"
+        class="relative w-full cursor-default overflow-hidden flex flex-nowrap input-field p-1 pr-3 focus:input-active"
         :class="{
-          'outline-black dark:outline-white outline-1 outline': isFocused,
+          'input-active': isFocused,
         }"
       >
         <ComboboxInput
-          class="flex-1 border-none text-sm bg-transparent text-left justify-between text-black dark:text-white truncate outline-none"
+          class="flex-1 border-none text-sm bg-transparent text-left justify-between py-1 px-3 truncate"
           placeholder="Enter or select the question"
           :display-value="displayValue()"
           @change="handleChange"
@@ -85,7 +85,7 @@ function displayValue() {
         <ComboboxButton class="h-auto align-middle">
           <img
             src="@/assets/images/arrow-gray.svg"
-            class="transition-all will-change-transform delay-300"
+            class="transition-all will-change-transform delay-300 w-lg h-lg"
             :class="{ '-rotate-180': open }"
           />
         </ComboboxButton>
@@ -97,7 +97,7 @@ function displayValue() {
       >
         <div v-show="open && filteredQuestions.length">
           <ComboboxOptions
-            class="absolute max-h-60 w-full p-2 debossed-card text-base focus:outline-black dark:focus:outline-white overflow-auto rounded-t-none rounded-r-none z-10"
+            class="absolute max-h-48 w-full py-2 px-1 card text-sm overflow-auto rounded-t-none z-10"
             static
           >
             <ComboboxOption
@@ -108,9 +108,9 @@ function displayValue() {
               :value="question"
             >
               <li
-                class="relative cursor-pointer select-none p-3 rounded-[10px] flex justify-between hover:bg-zinc-200 dark:hover:bg-zinc-800"
+                class="relative cursor-pointer select-none p-3 rounded-sm flex justify-between hover:bg-gray-200"
                 :class="{
-                  'bg-zinc-200 dark:bg-zinc-800': active,
+                  'bg-gray-200': active,
                 }"
               >
                 <span
diff --git a/src/components/SecurityQuestionRecoveryModal.vue b/src/components/SecurityQuestionRecoveryModal.vue
index 8d5c455b..9afabb8d 100644
--- a/src/components/SecurityQuestionRecoveryModal.vue
+++ b/src/components/SecurityQuestionRecoveryModal.vue
@@ -97,7 +97,7 @@ function handleProceed() {
         class="flex flex-col gap-2"
       >
         <div class="flex flex-col gap-1">
-          <label>Question {{ n }}</label>
+          <label class="text-sm text-gray-100">Question {{ n }}</label>
           <SelectQuestion
             :questions="selectedQuestions"
             :selected-question="getSelectedQuestion(props.questions[n - 1])"
@@ -105,23 +105,23 @@ function handleProceed() {
           />
         </div>
         <div class="flex flex-col gap-1">
-          <label>Answer {{ n }}</label>
+          <label class="text-sm text-gray-100">Answer {{ n }}</label>
           <input
             v-model.trim="answers[n - 1].answer"
             :placeholder="customPlaceholders[n - 1]"
-            class="text-base p-4 input text-ellipsis overflow-hidden whitespace-nowrap"
+            class="text-sm p-2 input-field text-ellipsis overflow-hidden whitespace-nowrap focus:input-active"
           />
         </div>
       </div>
-      <div class="flex flex-col gap-4">
+      <div class="flex flex-col mt-1 justify-center items-center gap-4">
         <button
-          class="mt-4 text-sm sm:text-xs rounded-xl font-semibold text-white dark:bg-white bg-black dark:text-black w-full h-10 sm:h-8 uppercase"
+          class="mt-1 text-sm btn-primary p-2 uppercase w-48"
           type="submit"
         >
           Proceed
         </button>
         <button
-          class="font-semibold capitalize text-sm sm:text-xs"
+          class="font-semibold capitalize text-sm btn-tertiary"
           @click.stop="emit('switch-alternate')"
         >
           Enter security PIN Instead
diff --git a/src/components/SelectQuestion.vue b/src/components/SelectQuestion.vue
index 00fafd81..7024b013 100644
--- a/src/components/SelectQuestion.vue
+++ b/src/components/SelectQuestion.vue
@@ -36,19 +36,19 @@ function handleChange(question: string[]) {
 <template>
   <Listbox v-model="selectedQuestionRef" @update:model-value="handleChange">
     <div
-      class="relative w-full cursor-default flex flex-nowrap rounded-[10px] input p-4 outline-none"
+      class="relative w-full cursor-default flex flex-nowrap rounded-sm input-field py-2 px-4 outline-none"
     >
       <ListboxButton
-        class="flex flex-1 border-none text-base leading-5 bg-transparent text-left justify-between text-black dark:text-white truncate outline-none h-auto"
+        class="flex flex-1 border-none text-sm bg-transparent text-left justify-between items-center truncate outline-none h-auto"
       >
         {{ selectedQuestionRef?.[1] }}
         <img
           src="@/assets/images/arrow-gray.svg"
-          class="transition-all will-change-transform delay-300"
+          class="transition-all will-change-transform delay-300 w-lg h-lg"
         />
       </ListboxButton>
       <ListboxOptions
-        class="absolute top-full left-0 max-h-60 w-full p-2 debossed-card text-base focus:outline-black dark:focus:outline-white overflow-auto rounded-t-none rounded-r-none z-10"
+        class="absolute top-full left-0 max-h-60 w-full py-2 px-1 card text-sm focus:outline-black-100 dark:focus:outline-white-100 overflow-auto rounded-t-none z-10"
       >
         <ListboxOption
           v-for="question in questions"
@@ -58,9 +58,9 @@ function handleChange(question: string[]) {
           :value="question"
         >
           <li
-            class="relative cursor-pointer select-none p-4 rounded-[10px] flex justify-between hover:bg-zinc-200 dark:hover:bg-zinc-800 text-black dark:text-white"
+            class="relative cursor-pointer select-none py-2 px-3 rounded-sm flex justify-between items-center hover:bg-gray-200"
             :class="{
-              'bg-zinc-200 dark:bg-zinc-800': active,
+              'bg-gray-200': active,
             }"
           >
             <span
diff --git a/src/components/UserWallet.vue b/src/components/UserWallet.vue
index 38ea26e4..2826e52f 100644
--- a/src/components/UserWallet.vue
+++ b/src/components/UserWallet.vue
@@ -14,7 +14,7 @@ import { useModalStore } from '@/store/modal'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
 import { getImage } from '@/utils/getImage'
-// import { isSupportedByOnRampMoney } from '@/utils/onrampmoney.ramp'
+import { isSupportedByOnRampMoney } from '@/utils/onrampmoney.ramp'
 import { getRampSupportedNetworks } from '@/utils/rampsdk'
 import { getRequestHandler } from '@/utils/requestHandlerSingleton'
 import { getTransakSupportedNetworks } from '@/utils/transak'
@@ -62,13 +62,12 @@ const rampNetwork = computed(() => {
 })
 
 const onRampMoney = computed(() => {
-  // const selectedChainId = Number(rpcStore.selectedChainId)
-  // if (isSupportedByOnRampMoney(selectedChainId)) {
-  //   return selectedChainId
-  // } else {
-  //   return false
-  // }
-  return false
+  const selectedChainId = Number(rpcStore.selectedChainId)
+  if (isSupportedByOnRampMoney(selectedChainId)) {
+    return selectedChainId
+  } else {
+    return false
+  }
 })
 
 function showLoader(message: string) {
diff --git a/src/pages/MFARequiredScreen.vue b/src/pages/MFARequiredScreen.vue
index 4cf97bf4..b5b99aa8 100644
--- a/src/pages/MFARequiredScreen.vue
+++ b/src/pages/MFARequiredScreen.vue
@@ -116,7 +116,7 @@ function goToHome() {
           <a
             :href="`${DOCS_URL}/concepts/mfa.html`"
             target="_blank"
-            class="text-white-100 font-bold cursor-pointer"
+            class="text-black-500 dark:text-white-100 font-bold cursor-pointer"
             >LEARN MORE</a
           >
         </span>
diff --git a/src/pages/MFARestoreScreen.vue b/src/pages/MFARestoreScreen.vue
index fd8c453c..97b9c4cf 100644
--- a/src/pages/MFARestoreScreen.vue
+++ b/src/pages/MFARestoreScreen.vue
@@ -49,28 +49,28 @@ initStorage(appId)
 const storage = getStorage()
 
 onBeforeMount(async () => {
-  // loader.value = {
-  //   show: true,
-  //   message: 'Loading metadata...',
-  // }
-  // dkgShare = JSON.parse(storage.local.getItem('pk') as string)
-  // core = new Core(
-  //   dkgShare.pk,
-  //   dkgShare.id,
-  //   appId,
-  //   GATEWAY_URL,
-  //   AUTH_NETWORK === 'dev'
-  // )
-  // securityQuestionModule.init(core)
-  // try {
-  //   questions.value = await securityQuestionModule.getQuestions()
-  // } catch (e) {
-  //   console.log(e)
-  // }
-  // loader.value = {
-  //   show: false,
-  //   message: '',
-  // }
+  loader.value = {
+    show: true,
+    message: 'Loading metadata...',
+  }
+  dkgShare = JSON.parse(storage.local.getItem('pk') as string)
+  core = new Core(
+    dkgShare.pk,
+    dkgShare.id,
+    appId,
+    GATEWAY_URL,
+    AUTH_NETWORK === 'dev'
+  )
+  securityQuestionModule.init(core)
+  try {
+    questions.value = await securityQuestionModule.getQuestions()
+  } catch (e) {
+    console.log(e)
+  }
+  loader.value = {
+    show: false,
+    message: '',
+  }
 })
 
 function handleProceed(val: 'pin-based' | 'question-based') {
diff --git a/src/pages/MFASetup.vue b/src/pages/MFASetup.vue
index e669459a..25664003 100644
--- a/src/pages/MFASetup.vue
+++ b/src/pages/MFASetup.vue
@@ -316,20 +316,22 @@ function handlePinBack() {
           <input
             v-model.trim="pinToEncryptMFAShare"
             :type="passwordType"
-            class="text-base p-3 input-field focus:input-active focus-visible:input-active text-ellipsis overflow-hidden whitespace-nowrap w-full"
+            class="text-sm py-2 px-4 input-field focus:input-active focus-visible:input-active text-ellipsis overflow-hidden whitespace-nowrap w-full"
             placeholder="Enter a alphanumberic pin, minimum 6 characters"
           />
           <img
             v-if="passwordType === 'password'"
             :src="getImage('eye.svg')"
-            class="absolute top-0 right-0 m-3 w-lg h-lg cursor-pointer"
+            class="absolute top-[50%] right-4 w-lg h-lg cursor-pointer"
+            style="transform: translateY(-50%)"
             title="Show password"
             @click.stop="passwordType = 'text'"
           />
           <img
             v-else
             :src="getImage('eye-off.svg')"
-            class="absolute top-0 right-0 m-3 w-lg h-lg cursor-pointer"
+            class="absolute top-[50%] right-4 w-lg h-lg cursor-pointer"
+            style="transform: translateY(-50%)"
             title="Hide password"
             @click.stop="passwordType = 'password'"
           />
@@ -359,18 +361,21 @@ function handlePinBack() {
   </div>
   <div v-else class="card w-full max-w-[40rem] mx-auto h-max min-h-max">
     <div class="overflow-y-auto">
-      <h2 class="font-bold text-lg uppercase m-8">
+      <h2 class="font-bold text-lg uppercase my-4 mx-8">
         RECOVERY METHOD 1: Security Questions
       </h2>
       <hr />
-      <form class="flex flex-col p-8 gap-8" @submit.prevent="handleSubmit">
+      <form
+        class="flex flex-col py-4 px-8 gap-6"
+        @submit.prevent="handleSubmit"
+      >
         <div
           v-for="i in totalQuestions"
           :key="`Security-Question-${i}`"
           class="flex flex-col gap-2"
         >
           <div class="flex flex-col gap-1">
-            <label class="font-medium text-sm">Question {{ i }}</label>
+            <label class="text-sm">Question {{ i }}</label>
             <SearchQuestion
               :questions="globalQuestions"
               :value="getSelectedQuestion(i)"
@@ -384,9 +389,9 @@ function handlePinBack() {
             </div>
           </div>
           <div class="flex flex-col gap-1">
-            <label class="font-medium text-sm">Answer {{ i }}</label>
+            <label class="text-sm">Answer {{ i }}</label>
             <input
-              class="text-base p-3 input-field text-ellipsis overflow-hidden whitespace-nowrap"
+              class="text-sm py-2 px-4 input-field text-ellipsis overflow-hidden whitespace-nowrap focus:input-active"
               :placeholder="customPlaceholders[i - 1]"
               :value="getAnswer(i)"
               @input="addAnswer(i, $event.target?.value)"
@@ -396,14 +401,14 @@ function handlePinBack() {
         <div class="flex justify-end gap-4">
           <button
             type="reset"
-            class="btn-secondary text-sm font-bold uppercase p-2 w-[8rem]"
+            class="btn-secondary text-sm font-bold uppercase p-2 w-32"
             @click.stop="handleCancel"
           >
             Cancel
           </button>
           <button
             type="submit"
-            class="btn-primary text-sm font-bold uppercase p-2 w-[8rem]"
+            class="btn-primary text-sm font-bold uppercase p-2 w-32"
           >
             Proceed
           </button>
diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index 87957f9e..09bea1ca 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -283,7 +283,7 @@ onBeforeRouteLeave((to) => {
         @click.stop="handleMFACreation"
       >
         <div class="flex items-center gap-2">
-          <span class="font-semibold text-white text-sm"
+          <span class="font-semibold text-white-100 text-sm"
             >Enhance your wallet security</span
           >
           <img src="@/assets/images/export.svg" class="w-5" />
diff --git a/src/pages/profileScreen.vue b/src/pages/profileScreen.vue
index a535b382..5c6744c4 100644
--- a/src/pages/profileScreen.vue
+++ b/src/pages/profileScreen.vue
@@ -179,22 +179,22 @@ watch(
     <div class="flex justify-center align-center">
       <span class="text-lg font-bold">Profile</span>
     </div>
-    <div class="card p-4 flex flex-col gap-5">
-      <div v-if="name" class="flex flex-col gap-1">
+    <div class="card p-4 flex flex-col gap-4">
+      <div v-if="name" class="flex flex-col">
         <span class="text-sm text-gray-100">Name</span>
         <span class="text-lg font-bold">
           {{ name }}
         </span>
       </div>
-      <div class="flex flex-col gap-1">
+      <div class="flex flex-col">
         <span class="text-sm text-gray-100">Email ID</span>
         <span class="text-lg font-bold">
           {{ email }}
         </span>
       </div>
-      <div class="flex flex-col gap-1">
+      <div class="flex flex-col">
         <span class="text-sm text-gray-100">Wallet Address</span>
-        <div class="flex gap-1">
+        <div class="flex gap-2">
           <span class="text-lg font-bold">
             {{ walletAddressShrinked }}
           </span>
@@ -205,36 +205,36 @@ watch(
             "
           >
             <img
-              :src="getImage('copy.svg')"
+              :src="getImage('copy-big.svg')"
               alt="Click to copy"
-              class="w-lg h-lg"
+              class="w-md h-md"
             />
           </button>
         </div>
       </div>
-      <div class="flex flex-col gap-1">
+      <div class="flex flex-col">
         <span class="text-sm text-gray-100">Private Key</span>
         <button
-          class="flex gap-1"
+          class="flex gap-2 items-center"
           title="Click to export private key"
           @click.stop="handleShowPrivateKeyCautionModal"
         >
           <span class="text-lg font-bold"> Export Key </span>
-          <img :src="getImage('external-link.svg')" class="w-lg h-lg" />
+          <img :src="getImage('external-link.svg')" class="w-md h-md" />
         </button>
       </div>
-      <div class="flex flex-col gap-1">
+      <div class="flex flex-col">
         <span class="text-sm text-gray-100">Enhance Wallet Security</span>
-        <div class="flex gap-1">
+        <div>
           <button
             v-if="!user.hasMfa"
-            class="text-lg font-bold"
+            class="text-lg font-bold flex gap-2 items-center"
             title="Click to setup MFA"
             @click.stop="handleShowMFAProceedModal(true)"
           >
             <span v-if="true">Setup Now</span>
             <span v-else>Update Security Questions</span>
-            <img :src="getImage('external-link.svg')" class="w-lg h-lg" />
+            <img :src="getImage('external-link.svg')" class="w-md h-md" />
           </button>
           <span v-else class="text-lg font-bold">In use</span>
         </div>

From 17fceaa3e91dafbb9f34d44e5e3937563f30e072 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 23 May 2023 13:33:28 +0530
Subject: [PATCH 072/153] Add component for radio

---
 src/components/BuyTokens.vue | 38 +++++++++++++-----------------------
 src/index.css                | 17 ++++++++++++++++
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/components/BuyTokens.vue b/src/components/BuyTokens.vue
index 26de7c08..41e2495a 100644
--- a/src/components/BuyTokens.vue
+++ b/src/components/BuyTokens.vue
@@ -113,12 +113,14 @@ function handleDone() {
       </div>
       <form class="flex flex-col gap-2 mt-5" @submit.prevent="handleBuy">
         <div
-          class="flex gap-3 p-4 items-center justify-between border border-1 border-gray-200 rounded-sm transition-all duration-300 ease-in-out"
+          class="flex gap-3 p-4 items-center justify-between border border-1 rounded-sm transition-all duration-300 ease-in-out"
           :class="{
             'opacity-60 cursor-not-allowed': !props.transakNetwork,
             'hover:border-gray-100 cursor-pointer': props.transakNetwork,
-            'border-gray-100 bg-white-300 dark:bg-black-300':
+            'border-black-500 dark:border-gray-100 bg-white-300 dark:bg-black-300':
               selectedProvider === 'transak',
+            'border-gray-800 dark:border-gray-200':
+              selectedProvider !== 'transak',
           }"
           @click.stop="
             props.transakNetwork ? (selectedProvider = 'transak') : void 0
@@ -135,16 +137,17 @@ function handleDone() {
             value="transak"
             name="provider"
             :disabled="!props.transakNetwork"
-            class="grid p-0 place-content-center w-xs h-xs bg-gray-600 rounded-full appearance-none before:bg-white-100"
+            class="radio"
           />
         </div>
         <div
-          class="flex gap-3 p-4 items-center justify-between border border-1 border-gray-200 rounded-sm transition-all duration-300 ease-in-out"
+          class="flex gap-3 p-4 items-center justify-between border border-1 rounded-sm transition-all duration-300 ease-in-out"
           :class="{
             'opacity-60 cursor-not-allowed': !props.rampNetwork,
             'hover:border-gray-100 cursor-pointer': props.rampNetwork,
-            'border-gray-100 bg-white-300 dark:bg-black-300':
+            'border-black-500 dark:border-gray-100 bg-white-300 dark:bg-black-300':
               selectedProvider === 'ramp',
+            'border-gray-800 dark:border-gray-200': selectedProvider !== 'ramp',
           }"
           @click.stop="props.rampNetwork ? (selectedProvider = 'ramp') : void 0"
         >
@@ -159,16 +162,18 @@ function handleDone() {
             value="ramp"
             name="provider"
             :disabled="!props.rampNetwork"
-            class="grid p-0 place-content-center w-xs h-xs bg-gray-600 rounded-full appearance-none before:bg-white-100"
+            class="radio"
           />
         </div>
         <div
-          class="flex gap-3 p-4 items-center justify-between border border-1 border-gray-200 rounded-sm transition-all duration-300 ease-in-out"
+          class="flex gap-3 p-4 items-center justify-between border border-1 rounded-sm transition-all duration-300 ease-in-out"
           :class="{
             'opacity-60 cursor-not-allowed': !props.onRampMoney,
             'hover:border-gray-100 cursor-pointer': props.onRampMoney,
-            'border-gray-100 bg-white-300 dark:bg-black-300':
+            'border-black-500 dark:border-gray-100 bg-white-300 dark:bg-black-300':
               selectedProvider === 'onramp.money',
+            'border-gray-800 dark:border-gray-200':
+              selectedProvider !== 'onramp.money',
           }"
           @click.stop="
             props.onRampMoney ? (selectedProvider = 'onramp.money') : void 0
@@ -189,7 +194,7 @@ function handleDone() {
             value="onramp.money"
             name="provider"
             :disabled="props.onRampMoney === false"
-            class="grid p-0 place-content-center w-xs h-xs bg-gray-600 rounded-full appearance-none before:bg-white-100"
+            class="radio"
           />
         </div>
         <div class="flex mt-8">
@@ -204,18 +209,3 @@ function handleDone() {
     </div>
   </div>
 </template>
-
-<style scoped>
-input[type='radio']::before {
-  width: 10px;
-  height: 10px;
-  content: '';
-  border-radius: 50%;
-  transition: 120ms transform ease-in-out;
-  transform: scale(0);
-}
-
-input[type='radio']:checked::before {
-  transform: scale(1);
-}
-</style>
diff --git a/src/index.css b/src/index.css
index a9339e2d..aa684e59 100644
--- a/src/index.css
+++ b/src/index.css
@@ -84,6 +84,23 @@
   .input-active {
     @apply outline-1 outline-black-500 dark:outline-white-200 outline;
   }
+
+  .radio {
+    @apply grid p-0 place-content-center w-xs h-xs bg-gray-800 dark:bg-gray-600 rounded-full appearance-none before:bg-black-500 dark:before:bg-white-100;
+  }
+
+  .radio::before {
+    width: 10px;
+    height: 10px;
+    content: '';
+    border-radius: 50%;
+    transition: 120ms transform ease-in-out;
+    transform: scale(0);
+  }
+
+  .radio:checked::before {
+    transform: scale(1);
+  }
 }
 
 @layer utilities {

From c532584cdf17e220c3681ca28d13da1e3ad1e47a Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 23 May 2023 16:13:27 +0530
Subject: [PATCH 073/153] Update MFA proceed modal

---
 src/components/MFAProceedModal.vue | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/components/MFAProceedModal.vue b/src/components/MFAProceedModal.vue
index bb429f63..09581aba 100644
--- a/src/components/MFAProceedModal.vue
+++ b/src/components/MFAProceedModal.vue
@@ -5,31 +5,27 @@ const emit = defineEmits(['proceed', 'close'])
 </script>
 
 <template>
-  <div class="px-1 py-2">
-    <div class="flex justify-between">
-      <div class="modal-title font-semibold">Enhance Wallet Security</div>
-      <img
-        src="@/assets/images/close-icon.svg"
-        class="cursor-pointer invert dark:invert-0"
-        @click.stop="emit('close')"
-      />
+  <div class="px-1 py-2 flex flex-col gap-4">
+    <div class="flex justify-center">
+      <div class="font-bold text-lg">Enhance Wallet Security</div>
     </div>
-    <div class="modal-description mt-2 mb-5 flex flex-col gap-4">
+    <div class="text-sm text-gray-100 flex flex-col gap-2">
       <p>
         Turn on MFA by setting up security questions and a PIN. You will need to
         enter either of them to authenticate when you login to a new device or
         browser.
+        <br />
         <a
           :href="`${DOCS_URL}/concepts/mfa.html`"
           target="_blank"
-          class="text-blue-500 font-semibold cursor-pointer"
+          class="font-bold text-black-500 dark:text-white-100 cursor-pointer"
           >LEARN MORE</a
         >
       </p>
     </div>
     <div>
       <button
-        class="text-sm sm:text-xs rounded-xl font-semibold text-white dark:bg-white bg-black dark:text-black w-full h-10 sm:h-8 uppercase"
+        class="uppercase text-sm font-bold p-3 btn-primary flex justify-center items-center w-full"
         @click.stop="emit('proceed')"
       >
         Proceed

From 77fbb2dd30d5e875debcf89d1566aa5e96be0923 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 23 May 2023 17:58:35 +0530
Subject: [PATCH 074/153] Move radius styles to iframe instead of internal div

---
 src/App.vue                     | 12 ++++--------
 src/components/WalletButton.vue |  8 --------
 src/store/app.ts                |  8 ++++++++
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index fdcf88c2..2d33fbd1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -90,8 +90,7 @@ function onClickOfHeader() {
   <div v-if="sdkVersion === 'v3'" class="flex flex-col h-full">
     <div
       v-show="expandWallet"
-      class="flex flex-col h-full bg-white-300 dark:bg-black-300 rounded-t-md overflow-hidden"
-      :class="{ 'rounded-md': !isMobileViewport() }"
+      class="flex flex-col h-full bg-white-300 dark:bg-black-300 overflow-hidden"
     >
       <div class="flex justify-center mt-2 mb-2">
         <button class="flex flex-grow justify-center" @click="onClickOfHeader">
@@ -100,10 +99,7 @@ function onClickOfHeader() {
         </button>
       </div>
       <WalletHeader />
-      <div
-        class="flex-grow wallet__container m-1 p-3"
-        :class="{ 'p-0': compactMode }"
-      >
+      <div class="flex-grow wallet__container m-1 p-3">
         <RouterView class="min-h-fullxs flex-grow" />
         <BaseModal v-if="modal.show" />
         <img
@@ -116,7 +112,7 @@ function onClickOfHeader() {
     </div>
     <div
       v-show="showWalletButton"
-      class="h-full bg-white-300 dark:bg-black-300 rounded-t-sm"
+      class="h-full bg-white-300 dark:bg-black-300"
     >
       <WalletButton />
     </div>
@@ -124,7 +120,7 @@ function onClickOfHeader() {
   <div v-else class="flex flex-col h-full bg-white-300 dark:bg-black-300">
     <div
       class="flex-grow wallet__container p-4"
-      :class="{ 'rounded-b-xl p-0': compactMode }"
+      :class="{ 'p-0': compactMode }"
     >
       <RouterView class="min-h-full" />
       <BaseModal v-if="modal.show" />
diff --git a/src/components/WalletButton.vue b/src/components/WalletButton.vue
index 9a54da2e..c7739b9b 100644
--- a/src/components/WalletButton.vue
+++ b/src/components/WalletButton.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 
-import RequestCountBadge from '@/components/RequestCountBadge.vue'
 import { useAppStore } from '@/store/app'
 import { useRequestStore } from '@/store/request'
 import { getImage } from '@/utils/getImage'
@@ -24,13 +23,6 @@ const showRequestCountBadge = computed(() => {
 
 <template>
   <div class="h-full relative">
-    <div
-      v-if="showRequestCountBadge"
-      class="z-[999] absolute top-0"
-      :class="[appStore.walletPosition === 'right' ? 'right-1' : 'left-1']"
-    >
-      <RequestCountBadge :request-count="requestCount" />
-    </div>
     <button
       class="flex items-center justify-center flex-grow h-full w-full"
       @click="onClickOfButton"
diff --git a/src/store/app.ts b/src/store/app.ts
index 2ef5d26f..f68fb0be 100644
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -68,6 +68,14 @@ export const useAppStore = defineStore('app', {
         style.bottom = expandWallet && !mobileViewport ? '30px' : '0'
         style.transition = 'all 300ms ease-in-out'
         style.position = 'fixed'
+        style.overflow = 'hidden'
+        style.borderRadius = mobileViewport ? '0' : '10px'
+        if (!compactMode && !expandWallet) {
+          style.borderBottomLeftRadius = '0'
+          style.borderBottomRightRadius = '0'
+          style.borderTopRightRadius = '5px'
+          style.borderTopLeftRadius = '5px'
+        }
         return style
       }
     },

From a1a31cdffeec32e21bfc52c280f805125d5532ff Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 25 May 2023 09:40:55 +0530
Subject: [PATCH 075/153] Remove user wallet from NFT Screen

---
 src/pages/NFTScreen.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/NFTScreen.vue b/src/pages/NFTScreen.vue
index 8572340e..d4003042 100644
--- a/src/pages/NFTScreen.vue
+++ b/src/pages/NFTScreen.vue
@@ -5,7 +5,6 @@ import { onBeforeRouteLeave } from 'vue-router'
 
 import AppLoader from '@/components/AppLoader.vue'
 import NFTView from '@/components/NFTView.vue'
-import UserWallet from '@/components/UserWallet.vue'
 import { useAppStore } from '@/store/app'
 import { useParentConnectionStore } from '@/store/parentConnection'
 import { useUserStore } from '@/store/user'
@@ -48,7 +47,6 @@ onBeforeRouteLeave((to) => {
     <AppLoader :message="loader.message" />
   </div>
   <div v-else class="h-full">
-    <UserWallet page="nft" @refresh="handleRefresh" />
     <div class="pb-5 flex flex-col gap-1">
       <div class="font-semibold">Assets</div>
       <div class="wallet__card rounded-[10px] flex flex-col">

From 4e322af1fd61c4ac59c4cb345a8557531f6677e9 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 26 May 2023 13:01:07 +0530
Subject: [PATCH 076/153] Fix NFT View

---
 src/assets/images/dark/settings.svg  |  3 ++
 src/assets/images/light/settings.svg |  3 ++
 src/components/NFTView.vue           | 53 +++++++---------------------
 src/pages/NFTScreen.vue              |  2 +-
 src/pages/loggedInView.vue           |  2 +-
 5 files changed, 21 insertions(+), 42 deletions(-)
 create mode 100644 src/assets/images/dark/settings.svg
 create mode 100644 src/assets/images/light/settings.svg

diff --git a/src/assets/images/dark/settings.svg b/src/assets/images/dark/settings.svg
new file mode 100644
index 00000000..e34bbce9
--- /dev/null
+++ b/src/assets/images/dark/settings.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.6667 15.0001L17.5 15.0001M2.5 15.0001H4.16667M4.16667 15.0001C4.16667 16.1507 5.09941 17.0834 6.25 17.0834C7.40059 17.0834 8.33333 16.1507 8.33333 15.0001C8.33333 13.8495 7.40059 12.9167 6.25 12.9167C5.09941 12.9167 4.16667 13.8495 4.16667 15.0001ZM16.6667 10.0001H17.5M2.5 10.0001H8.33333M10.8333 5.00008H17.5M10.8333 5.00008C10.8333 3.84949 9.90059 2.91675 8.75 2.91675C7.59941 2.91675 6.66667 3.84949 6.66667 5.00008C6.66667 6.15067 7.59941 7.08341 8.75 7.08341C9.90059 7.08341 10.8333 6.15067 10.8333 5.00008ZM2.5 5.00008H3.33333M13.75 12.0834C12.5994 12.0834 11.6667 11.1507 11.6667 10.0001C11.6667 8.84949 12.5994 7.91675 13.75 7.91675C14.9006 7.91675 15.8333 8.84949 15.8333 10.0001C15.8333 11.1507 14.9006 12.0834 13.75 12.0834Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/settings.svg b/src/assets/images/light/settings.svg
new file mode 100644
index 00000000..5a794537
--- /dev/null
+++ b/src/assets/images/light/settings.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.6667 15.0001L17.5 15.0001M2.5 15.0001H4.16667M4.16667 15.0001C4.16667 16.1507 5.09941 17.0834 6.25 17.0834C7.40059 17.0834 8.33333 16.1507 8.33333 15.0001C8.33333 13.8495 7.40059 12.9167 6.25 12.9167C5.09941 12.9167 4.16667 13.8495 4.16667 15.0001ZM16.6667 10.0001H17.5M2.5 10.0001H8.33333M10.8333 5.00008H17.5M10.8333 5.00008C10.8333 3.84949 9.90059 2.91675 8.75 2.91675C7.59941 2.91675 6.66667 3.84949 6.66667 5.00008C6.66667 6.15067 7.59941 7.08341 8.75 7.08341C9.90059 7.08341 10.8333 6.15067 10.8333 5.00008ZM2.5 5.00008H3.33333M13.75 12.0834C12.5994 12.0834 11.6667 11.1507 11.6667 10.0001C11.6667 8.84949 12.5994 7.91675 13.75 7.91675C14.9006 7.91675 15.8333 8.84949 15.8333 10.0001C15.8333 11.1507 14.9006 12.0834 13.75 12.0834Z" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/NFTView.vue b/src/components/NFTView.vue
index c39b9eec..41142436 100644
--- a/src/components/NFTView.vue
+++ b/src/components/NFTView.vue
@@ -6,6 +6,7 @@ import type { NFT } from '@/models/NFT'
 import { NFTDB } from '@/services/nft.service'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
+import { getImage } from '@/utils/getImage'
 import { getDetailedNFTs } from '@/utils/nftUtils'
 import { getStorage } from '@/utils/storageWrapper'
 
@@ -69,7 +70,7 @@ watch(
 
 <template>
   <div>
-    <div class="flex flex-col divide-y-[1px] max-h-72 divide-gray-600">
+    <div class="flex flex-col max-h-80">
       <div
         v-if="loader.show"
         class="flex justify-center items-center flex-1flex p-5"
@@ -78,11 +79,8 @@ watch(
           {{ loader.message }}
         </p>
       </div>
-      <div v-else class="overflow-y-scroll">
-        <div
-          v-if="nfts.length"
-          class="grid grid-cols-2 gap-[10px] pt-5 pb-4 mx-4 mr-[6px]"
-        >
+      <div v-else class="p-3 m-1 overflow-y-scroll">
+        <div v-if="nfts.length" class="grid grid-cols-2 gap-[10px]">
           <div
             v-for="nft in nfts"
             :key="`nft-${nft.address}-${nft.tokenId}`"
@@ -97,17 +95,17 @@ watch(
             "
           >
             <div
-              class="h-[136px] sm:h-[96px] rounded m-1 bg-center bg-cover"
+              class="h-[136px] rounded m-1 bg-center bg-cover"
               :style="{ 'background-image': `url(${nft.imageUrl})` }"
             ></div>
-            <div class="flex flex-col gap-1 p-[10px]">
+            <div class="flex flex-col px-2">
               <span
-                class="nft-card-title font-normal overflow-hidden whitespace-nowrap text-ellipsis"
+                class="text-gray-100 text-sm overflow-hidden whitespace-nowrap text-ellipsis"
                 :title="nft.name"
                 >{{ nft.name }}</span
               >
               <span
-                class="nft-card-collection font-normal overflow-hidden whitespace-nowrap text-ellipsis"
+                class="text-gray-100 text-xs overflow-hidden whitespace-nowrap text-ellipsis"
                 :title="nft.collectionName"
                 >{{ nft.collectionName }}</span
               >
@@ -121,40 +119,15 @@ watch(
           >
         </div>
       </div>
-      <div class="flex justify-center mx-4">
-        <div
-          class="flex py-4 gap-2 items-center cursor-pointer flex-grow justify-center"
+      <div class="flex justify-center">
+        <button
+          class="btn-quaternery border-b-0 border-x-0 flex py-1 gap-1 text-sm items-center cursor-pointer flex-grow justify-center"
           @click.stop="handleManageNFT"
         >
-          <img
-            src="@/assets/images/settings.svg"
-            class="invert dark:invert-0"
-          />
+          <img :src="getImage('settings.svg')" />
           <span class="assets-view__add-token-text leading-[1]">Manage</span>
-        </div>
+        </button>
       </div>
     </div>
   </div>
 </template>
-
-<style>
-.assets-view__asset-name {
-  max-width: 12ch;
-  font-size: var(--fs-350);
-  line-height: 1.5;
-}
-
-.nft-card {
-  background: var(--nft-card-background);
-}
-
-.nft-card-title {
-  font-size: var(--fs-300);
-  color: var(--nft-card-title);
-}
-
-.nft-card-collection {
-  font-size: var(--fs-250);
-  color: var(--nft-card-collection);
-}
-</style>
diff --git a/src/pages/NFTScreen.vue b/src/pages/NFTScreen.vue
index d4003042..74e5a867 100644
--- a/src/pages/NFTScreen.vue
+++ b/src/pages/NFTScreen.vue
@@ -49,7 +49,7 @@ onBeforeRouteLeave((to) => {
   <div v-else class="h-full">
     <div class="pb-5 flex flex-col gap-1">
       <div class="font-semibold">Assets</div>
-      <div class="wallet__card rounded-[10px] flex flex-col">
+      <div class="card flex flex-col overflow-hidden">
         <NFTView
           :refresh-state="refreshState"
           @refreshed="refreshState = false"
diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index 23fefff8..1b13182f 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -305,7 +305,7 @@ onBeforeRouteLeave((to) => {
     <Transition name="fade" mode="out-in">
       <button
         v-if="showMfaBanner"
-        class="bg-blue-700 rounded-lg p-4 flex justify-between items-center cursor-pointer"
+        class="bg-blue-700 rounded-lg px-4 py-1 flex justify-between items-center cursor-pointer"
         @click.stop="handleMFACreation"
       >
         <div class="flex items-center gap-2">

From 7bcec1910c21f496bc2d288a5cbd695dd72ba4ea Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 26 May 2023 14:21:58 +0530
Subject: [PATCH 077/153] List NFTs page

---
 src/assets/images/dark/edit.svg  |  3 ++
 src/assets/images/light/edit.svg |  3 ++
 src/components/NFTView.vue       |  2 +-
 src/pages/ManageNFTScreen.vue    | 76 ++++++--------------------------
 4 files changed, 21 insertions(+), 63 deletions(-)
 create mode 100644 src/assets/images/dark/edit.svg
 create mode 100644 src/assets/images/light/edit.svg

diff --git a/src/assets/images/dark/edit.svg b/src/assets/images/dark/edit.svg
new file mode 100644
index 00000000..c48e203e
--- /dev/null
+++ b/src/assets/images/dark/edit.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.33301 16.6659H2.58301C2.58301 16.8648 2.66203 17.0556 2.80268 17.1962C2.94333 17.3369 3.1341 17.4159 3.33301 17.4159L3.33301 16.6659ZM3.33301 13.3326L2.80268 12.8022C2.66203 12.9429 2.58301 13.1337 2.58301 13.3326H3.33301ZM12.3902 4.27536L11.8599 3.74503L11.8599 3.74504L12.3902 4.27536ZM14.2758 4.27536L13.7455 4.80569V4.80569L14.2758 4.27536ZM15.7235 5.72308L16.2538 5.19275L16.2538 5.19275L15.7235 5.72308ZM15.7235 7.6087L15.1932 7.07837V7.07837L15.7235 7.6087ZM6.66634 16.6659L6.66635 17.4159C6.86526 17.4159 7.05602 17.3369 7.19667 17.1962L6.66634 16.6659ZM16.2804 6.40841L16.9937 6.17665L16.2804 6.40841ZM16.2804 6.92338L15.5671 6.69161L16.2804 6.92338ZM13.0755 3.71852L12.8438 3.00523L13.0755 3.71852ZM13.5906 3.71852L13.8223 3.00523L13.5906 3.71852ZM10.53 6.13558C10.2371 5.84269 9.76224 5.84269 9.46934 6.13558C9.17645 6.42847 9.17645 6.90335 9.46934 7.19624L10.53 6.13558ZM12.8027 10.5296C13.0956 10.8225 13.5704 10.8225 13.8633 10.5296C14.1562 10.2367 14.1562 9.76181 13.8633 9.46891L12.8027 10.5296ZM4.08301 16.6659V13.3326H2.58301V16.6659H4.08301ZM3.86334 13.8629L12.9205 4.80569L11.8599 3.74504L2.80268 12.8022L3.86334 13.8629ZM13.7455 4.80569L15.1932 6.25341L16.2538 5.19275L14.8061 3.74503L13.7455 4.80569ZM15.1932 7.07837L6.13601 16.1356L7.19667 17.1962L16.2539 8.13903L15.1932 7.07837ZM6.66634 15.9159L3.333 15.9159L3.33301 17.4159L6.66635 17.4159L6.66634 15.9159ZM15.1932 6.25341C15.3669 6.42717 15.465 6.52601 15.5308 6.60354C15.5909 6.67437 15.579 6.67672 15.5671 6.64018L16.9937 6.17665C16.92 5.94983 16.7946 5.77452 16.6743 5.63276C16.5596 5.49769 16.4101 5.34901 16.2538 5.19275L15.1932 6.25341ZM16.2539 8.13903C16.4101 7.98277 16.5596 7.83409 16.6743 7.69901C16.7946 7.55725 16.92 7.38194 16.9937 7.15514L15.5671 6.69161C15.579 6.65508 15.5909 6.65743 15.5308 6.72826C15.465 6.80577 15.367 6.90462 15.1932 7.07837L16.2539 8.13903ZM15.5671 6.64018C15.5725 6.65691 15.5725 6.67488 15.5671 6.69161L16.9937 7.15514C17.097 6.83713 17.097 6.49465 16.9937 6.17665L15.5671 6.64018ZM12.9205 4.8057C13.0943 4.63195 13.1931 4.53393 13.2706 4.46814C13.3414 4.40802 13.3438 4.41995 13.3073 4.43181L12.8438 3.00523C12.617 3.07892 12.4417 3.20426 12.2999 3.32461C12.1648 3.43927 12.0161 3.58877 11.8599 3.74503L12.9205 4.8057ZM14.8061 3.74503C14.6499 3.58881 14.5012 3.43931 14.3662 3.32466C14.2245 3.20431 14.0492 3.07893 13.8223 3.00523L13.3588 4.43181C13.3222 4.41993 13.3246 4.40797 13.3954 4.46809C13.4729 4.5339 13.5717 4.63191 13.7455 4.80569L14.8061 3.74503ZM13.3073 4.43181C13.324 4.42637 13.3421 4.42637 13.3588 4.43181L13.8223 3.00523C13.5043 2.9019 13.1618 2.9019 12.8438 3.00523L13.3073 4.43181ZM9.46934 7.19624L12.8027 10.5296L13.8633 9.46891L10.53 6.13558L9.46934 7.19624Z" fill="#F7F7F7"/>
+</svg>
diff --git a/src/assets/images/light/edit.svg b/src/assets/images/light/edit.svg
new file mode 100644
index 00000000..336aaaab
--- /dev/null
+++ b/src/assets/images/light/edit.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.33301 16.6659H2.58301C2.58301 16.8648 2.66203 17.0556 2.80268 17.1962C2.94333 17.3369 3.1341 17.4159 3.33301 17.4159L3.33301 16.6659ZM3.33301 13.3326L2.80268 12.8022C2.66203 12.9429 2.58301 13.1337 2.58301 13.3326H3.33301ZM12.3902 4.27536L11.8599 3.74503L11.8599 3.74504L12.3902 4.27536ZM14.2758 4.27536L13.7455 4.80569V4.80569L14.2758 4.27536ZM15.7235 5.72308L16.2538 5.19275L16.2538 5.19275L15.7235 5.72308ZM15.7235 7.6087L15.1932 7.07837V7.07837L15.7235 7.6087ZM6.66634 16.6659L6.66635 17.4159C6.86526 17.4159 7.05602 17.3369 7.19667 17.1962L6.66634 16.6659ZM16.2804 6.40841L16.9937 6.17665L16.2804 6.40841ZM16.2804 6.92338L15.5671 6.69161L16.2804 6.92338ZM13.0755 3.71852L12.8438 3.00523L13.0755 3.71852ZM13.5906 3.71852L13.8223 3.00523L13.5906 3.71852ZM10.53 6.13558C10.2371 5.84269 9.76224 5.84269 9.46934 6.13558C9.17645 6.42847 9.17645 6.90335 9.46934 7.19624L10.53 6.13558ZM12.8027 10.5296C13.0956 10.8225 13.5704 10.8225 13.8633 10.5296C14.1562 10.2367 14.1562 9.76181 13.8633 9.46891L12.8027 10.5296ZM4.08301 16.6659V13.3326H2.58301V16.6659H4.08301ZM3.86334 13.8629L12.9205 4.80569L11.8599 3.74504L2.80268 12.8022L3.86334 13.8629ZM13.7455 4.80569L15.1932 6.25341L16.2538 5.19275L14.8061 3.74503L13.7455 4.80569ZM15.1932 7.07837L6.13601 16.1356L7.19667 17.1962L16.2539 8.13903L15.1932 7.07837ZM6.66634 15.9159L3.333 15.9159L3.33301 17.4159L6.66635 17.4159L6.66634 15.9159ZM15.1932 6.25341C15.3669 6.42717 15.465 6.52601 15.5308 6.60354C15.5909 6.67437 15.579 6.67672 15.5671 6.64018L16.9937 6.17665C16.92 5.94983 16.7946 5.77452 16.6743 5.63276C16.5596 5.49769 16.4101 5.34901 16.2538 5.19275L15.1932 6.25341ZM16.2539 8.13903C16.4101 7.98277 16.5596 7.83409 16.6743 7.69901C16.7946 7.55725 16.92 7.38194 16.9937 7.15514L15.5671 6.69161C15.579 6.65508 15.5909 6.65743 15.5308 6.72826C15.465 6.80577 15.367 6.90462 15.1932 7.07837L16.2539 8.13903ZM15.5671 6.64018C15.5725 6.65691 15.5725 6.67488 15.5671 6.69161L16.9937 7.15514C17.097 6.83713 17.097 6.49465 16.9937 6.17665L15.5671 6.64018ZM12.9205 4.8057C13.0943 4.63195 13.1931 4.53393 13.2706 4.46814C13.3414 4.40802 13.3438 4.41995 13.3073 4.43181L12.8438 3.00523C12.617 3.07892 12.4417 3.20426 12.2999 3.32461C12.1648 3.43927 12.0161 3.58877 11.8599 3.74503L12.9205 4.8057ZM14.8061 3.74503C14.6499 3.58881 14.5012 3.43931 14.3662 3.32466C14.2245 3.20431 14.0492 3.07893 13.8223 3.00523L13.3588 4.43181C13.3222 4.41993 13.3246 4.40797 13.3954 4.46809C13.4729 4.5339 13.5717 4.63191 13.7455 4.80569L14.8061 3.74503ZM13.3073 4.43181C13.324 4.42637 13.3421 4.42637 13.3588 4.43181L13.8223 3.00523C13.5043 2.9019 13.1618 2.9019 12.8438 3.00523L13.3073 4.43181ZM9.46934 7.19624L12.8027 10.5296L13.8633 9.46891L10.53 6.13558L9.46934 7.19624Z" fill="#333333"/>
+</svg>
diff --git a/src/components/NFTView.vue b/src/components/NFTView.vue
index 41142436..ee05a290 100644
--- a/src/components/NFTView.vue
+++ b/src/components/NFTView.vue
@@ -121,7 +121,7 @@ watch(
       </div>
       <div class="flex justify-center">
         <button
-          class="btn-quaternery border-b-0 border-x-0 flex py-1 gap-1 text-sm items-center cursor-pointer flex-grow justify-center"
+          class="btn-quaternery border-b-0 border-t-1 border-x-0 flex py-1 gap-1 text-sm items-center cursor-pointer flex-grow justify-center"
           @click.stop="handleManageNFT"
         >
           <img :src="getImage('settings.svg')" />
diff --git a/src/pages/ManageNFTScreen.vue b/src/pages/ManageNFTScreen.vue
index 7354ffc7..c87f8552 100644
--- a/src/pages/ManageNFTScreen.vue
+++ b/src/pages/ManageNFTScreen.vue
@@ -7,13 +7,12 @@ import { NFT } from '@/models/NFT'
 import { NFTDB } from '@/services/nft.service'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
+import { getImage } from '@/utils/getImage'
 import { getStorage } from '@/utils/storageWrapper'
-import { useImage } from '@/utils/useImage'
 
 const router = useRouter()
 const userStore = useUserStore()
 const rpcStore = useRpcStore()
-const getImage = useImage()
 
 const loader = reactive({
   show: false,
@@ -55,24 +54,22 @@ function handleEditToken(nft: NFT) {
   <div v-if="loader.show" class="flex justify-center items-center flex-1">
     <AppLoader :message="loader.message" />
   </div>
-  <div v-else class="flex-grow">
-    <div class="wallet__card rounded-[10px] flex flex-1 flex-col min-h-full">
-      <div
-        class="flex flex-col items-center min-h-full p-4 sm:p-2 space-y-5 sm:space-y-2 flex-grow"
-      >
-        <h1 class="home__title w-full text-left font-semibold">Manage NFTs</h1>
+  <div v-else class="flex-grow mb-5">
+    <div class="flex flex-1 flex-col min-h-full">
+      <div class="flex flex-col items-center min-h-full flex-grow gap-5">
+        <h1 class="w-full text-center text-lg font-bold">Manage NFTs</h1>
         <div
-          class="home__body-container flex flex-col w-full h-full max-h-[440px] text-left p-2 debossed-card flex-grow divide-y-[1px] divide-gray-400 dark:divide-gray-800"
+          class="card flex flex-col w-full h-full max-h-max text-left flex-grow overflow-hidden"
         >
           <div
             v-if="nfts.length"
-            class="flex flex-col flex-grow overflow-y-scroll -mr-[6px]"
+            class="flex flex-col flex-grow overflow-y-scroll py-2"
           >
             <div
               v-for="nft in nfts"
               :key="`nft-${nft.address}-${nft.tokenId}`"
               :title="`${nft.collectionName} (${nft.tokenId}) - ${nft.name}`"
-              class="select-none p-3 rounded-[10px] flex justify-between gap-1 hover:bg-zinc-200 dark:hover:bg-zinc-800 text-black dark:text-white nft-container"
+              class="select-none flex justify-between text-base px-4 py-2 nft-container"
               :class="{
                 'cursor-pointer': !nft.autodetected,
               }"
@@ -83,7 +80,7 @@ function handleEditToken(nft: NFT) {
               </span>
               <img
                 v-if="!nft.autodetected"
-                :src="getImage('edit-icon')"
+                :src="getImage('edit.svg')"
                 class="opacity-0"
               />
             </div>
@@ -95,66 +92,21 @@ function handleEditToken(nft: NFT) {
             >
           </div>
           <div class="flex justify-center">
-            <div
-              class="flex py-2 mt-2 gap-2 items-center cursor-pointer flex-grow justify-center"
+            <button
+              class="btn-quaternery flex py-1 gap-1 items-center cursor-pointer flex-grow justify-center border-b-0 border-x-0 border-t-1"
               @click.stop="handleAddToken"
             >
-              <img
-                src="@/assets/images/plus.svg"
-                class="invert dark:invert-0"
-              />
-              <span class="assets-view__add-token-text leading-[1]">New</span>
-            </div>
+              <img :src="getImage('plus.svg')" />
+              <span class="text-sm">New</span>
+            </button>
           </div>
         </div>
-        <div class="flex w-full text-sm sm:text-xs justify-center">
-          <button
-            class="text-sm sm:text-xs rounded-xl font-semibold text-black border-black border-2 dark:text-white dark:border-white w-full h-10 sm:h-8 uppercase"
-            @click="handleClose"
-          >
-            Close
-          </button>
-        </div>
       </div>
     </div>
   </div>
 </template>
 
 <style>
-.home__title {
-  font-size: var(--fs-500);
-}
-
-.home__body-container {
-  color: var(--fg-color);
-  border-radius: 10px;
-}
-
-.home__body-content-label {
-  font-size: var(--fs-300);
-  font-weight: 600;
-  color: var(--fg-color-secondary);
-}
-
-.home__body-content-value {
-  display: flex;
-  align-items: center;
-  font-size: var(--fs-400);
-  font-weight: 400;
-}
-
-.home__footer-button-outline {
-  color: var(--outlined-button-fg-color);
-  border-color: var(--outlined-button-border-color);
-}
-
-.home__footer-button-filled {
-  flex: 1;
-  color: var(--filled-button-fg-color);
-  background-color: var(--filled-button-bg-color);
-  border-radius: 10px;
-}
-
 .nft-container:hover img {
   opacity: 1;
 }

From 9f9b1326f4c334dbe579ba7998a904f795a2a10a Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 29 May 2023 15:50:50 +0530
Subject: [PATCH 078/153] NFT description

---
 src/App.vue                      |  2 +-
 src/assets/images/dark/send.svg  |  3 ++
 src/assets/images/light/send.svg |  3 ++
 src/components/NFTView.vue       |  4 +-
 src/pages/NFTScreen.vue          |  2 +-
 src/pages/NftDetailsScreen.vue   | 74 +++++++++++---------------------
 6 files changed, 34 insertions(+), 54 deletions(-)
 create mode 100644 src/assets/images/dark/send.svg
 create mode 100644 src/assets/images/light/send.svg

diff --git a/src/App.vue b/src/App.vue
index 2d33fbd1..21bda313 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -100,7 +100,7 @@ function onClickOfHeader() {
       </div>
       <WalletHeader />
       <div class="flex-grow wallet__container m-1 p-3">
-        <RouterView class="min-h-fullxs flex-grow" />
+        <RouterView class="flex-grow" />
         <BaseModal v-if="modal.show" />
         <img
           v-if="showFooter"
diff --git a/src/assets/images/dark/send.svg b/src/assets/images/dark/send.svg
new file mode 100644
index 00000000..afaa5300
--- /dev/null
+++ b/src/assets/images/dark/send.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.58964 11.4103L12.6281 7.3718M16.7593 4.9072L13.3504 15.986C13.0448 16.9792 12.8921 17.4758 12.6285 17.6404C12.4 17.7832 12.1167 17.8067 11.8678 17.7034C11.5808 17.5843 11.3482 17.1196 10.8835 16.1902L8.72432 11.8719C8.65058 11.7244 8.61367 11.6507 8.56441 11.5868C8.5207 11.5301 8.47007 11.4792 8.41336 11.4355C8.34946 11.3862 8.27552 11.3494 8.12803 11.2756L3.80977 9.11649C2.88035 8.65178 2.4156 8.41952 2.29651 8.1325C2.19323 7.88359 2.21678 7.60002 2.35958 7.37147C2.52423 7.10794 3.02086 6.9552 4.01404 6.64961L15.0929 3.24074C15.8737 3.00049 16.2639 2.88035 16.5277 2.97717C16.7574 3.06151 16.9386 3.24255 17.0229 3.47227C17.1198 3.736 16.9995 4.12641 16.7593 4.9072Z" stroke="#F7F7F7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/send.svg b/src/assets/images/light/send.svg
new file mode 100644
index 00000000..d3b271a4
--- /dev/null
+++ b/src/assets/images/light/send.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.58964 11.4103L12.6281 7.3718M16.7593 4.9072L13.3504 15.986C13.0448 16.9792 12.8921 17.4758 12.6285 17.6404C12.4 17.7832 12.1167 17.8067 11.8678 17.7034C11.5808 17.5843 11.3482 17.1196 10.8835 16.1902L8.72432 11.8719C8.65058 11.7244 8.61367 11.6507 8.56441 11.5868C8.5207 11.5301 8.47007 11.4792 8.41336 11.4355C8.34946 11.3862 8.27552 11.3494 8.12803 11.2756L3.80977 9.11649C2.88035 8.65178 2.4156 8.41952 2.29651 8.1325C2.19323 7.88359 2.21678 7.60002 2.35958 7.37147C2.52423 7.10794 3.02086 6.9552 4.01404 6.64961L15.0929 3.24074C15.8737 3.00049 16.2639 2.88035 16.5277 2.97717C16.7574 3.06151 16.9386 3.24255 17.0229 3.47227C17.1198 3.736 16.9995 4.12641 16.7593 4.9072Z" stroke="#333333" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/NFTView.vue b/src/components/NFTView.vue
index ee05a290..23c820f1 100644
--- a/src/components/NFTView.vue
+++ b/src/components/NFTView.vue
@@ -70,10 +70,10 @@ watch(
 
 <template>
   <div>
-    <div class="flex flex-col max-h-80">
+    <div class="flex flex-col max-h-96">
       <div
         v-if="loader.show"
-        class="flex justify-center items-center flex-1flex p-5"
+        class="flex justify-center items-center flex-1 flex p-5"
       >
         <p class="m-auto font-semibold text-sm sm:text-xs px-4">
           {{ loader.message }}
diff --git a/src/pages/NFTScreen.vue b/src/pages/NFTScreen.vue
index 74e5a867..c546fa1c 100644
--- a/src/pages/NFTScreen.vue
+++ b/src/pages/NFTScreen.vue
@@ -48,7 +48,7 @@ onBeforeRouteLeave((to) => {
   </div>
   <div v-else class="h-full">
     <div class="pb-5 flex flex-col gap-1">
-      <div class="font-semibold">Assets</div>
+      <span class="uppercase font-lg font-bold">NFTs</span>
       <div class="card flex flex-col overflow-hidden">
         <NFTView
           :refresh-state="refreshState"
diff --git a/src/pages/NftDetailsScreen.vue b/src/pages/NftDetailsScreen.vue
index df79ef7a..30762164 100644
--- a/src/pages/NftDetailsScreen.vue
+++ b/src/pages/NftDetailsScreen.vue
@@ -5,6 +5,7 @@ import { useRouter } from 'vue-router'
 import SendNft from '@/components/SendNft.vue'
 import type { NFTContractType } from '@/models/NFT'
 import { useModalStore } from '@/store/modal'
+import { getImage } from '@/utils/getImage'
 
 type NftDetails = {
   type: NFTContractType
@@ -19,7 +20,7 @@ type NftDetails = {
 }
 
 type NftAttributes = {
-  trait: string
+  trait_type: string
   value: string
 }
 
@@ -88,50 +89,47 @@ function handleClose() {
           <div class="px-4 my-5">
             <div class="flex justify-between gap-3">
               <div
-                class="overflow-hidden whitespace-nowrap text-ellipsis max-w-[16ch] font-semibold nft-title"
+                class="overflow-hidden whitespace-nowrap text-ellipsis max-w-[16ch] font-semibold text-xl font-bold"
                 :title="props.name"
               >
                 {{ props.name }}
               </div>
-              <div class="flex gap-3">
-                <img
-                  src="@/assets/images/send.svg"
-                  class="cursor-pointer invert dark:invert-0"
-                  @click.stop="openNftModal"
-                />
+              <div class="flex gap-1">
+                <button @click.stop="openNftModal">
+                  <img :src="getImage('send.svg')" />
+                </button>
               </div>
             </div>
-            <div class="mt-5 flex flex-col gap-3">
-              <div class="font-semibold font-montserrat nft-label">
-                Description
-              </div>
-              <div v-if="props.description" class="nft-description font-normal">
+            <div class="mt-5 flex flex-col gap-1">
+              <div class="font-bold text-sm">Description</div>
+              <div
+                v-if="props.description"
+                class="text-xs text-gray-100 font-normal"
+              >
                 {{ props.description }}
               </div>
-              <span v-else class="nft-description font-normal">
+              <span v-else class="text-xs text-gray-100 font-normal">
                 No description provided
               </span>
             </div>
-            <div class="mt-5 flex flex-col gap-3">
-              <div class="font-semibold font-montserrat nft-label">
-                Attributes
-              </div>
+            <div class="mt-5 flex flex-col gap-1">
+              <div class="font-bold text-sm">Attributes</div>
               <div v-if="props.attributes?.length" class="flex gap-2 flex-wrap">
                 <div
                   v-for="attribute in nftAttributes"
-                  :key="`${attribute.trait}-${attribute.value}`"
-                  class="nft-attribute-box rounded-[10px] p-2 flex flex-col gap-1"
+                  :key="`${attribute.trait_type}-${attribute.value}`"
+                  class="rounded-lg py-2 px-3 flex flex-col bg-gray-200"
                   :title="JSON.stringify(attribute)"
                 >
-                  <div
-                    class="nft-attribute-trait font-semibold font-montserrat"
-                  >
-                    {{ attribute.trait }}
+                  <div class="text-xs text-gray-100 font-normal">
+                    {{ attribute.trait_type }}
+                  </div>
+                  <div class="font-medium text-sm">
+                    {{ attribute.value }}
                   </div>
-                  <div class="nft-attribute-value">{{ attribute.value }}</div>
                 </div>
               </div>
-              <div v-else class="nft-description font-normal">
+              <div v-else class="text-xs text-gray-100 font-normal">
                 No attributes provided
               </div>
             </div>
@@ -148,27 +146,3 @@ function handleClose() {
     </Teleport>
   </div>
 </template>
-
-<style scoped>
-.nft-title {
-  font-size: var(--fs-500);
-}
-
-.nft-label {
-  font-size: var(--fs-300);
-}
-
-.nft-description,
-.nft-attribute-trait {
-  font-size: var(--fs-250);
-  color: var(--fg-color-secondary);
-}
-
-.nft-attribute-value {
-  font-size: var(--fs-400);
-}
-
-.nft-attribute-box {
-  background: var(--debossed-box-color);
-}
-</style>

From bedad7c829afdd611a017211a08ea50982749e6e Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 29 May 2023 21:16:14 +0530
Subject: [PATCH 079/153] Add send nft design

---
 src/components/GasPrice.vue           |  58 ++++-------
 src/components/NFTView.vue            |   4 +-
 src/components/SendNftPreview.vue     | 115 ++++++++++------------
 src/pages/NFTScreen.vue               |   2 +-
 src/pages/NftDetailsScreen.vue        |  18 ++--
 src/pages/SelectNftScreen.vue         |   8 --
 src/{components => pages}/SendNft.vue | 132 +++++++++++++++-----------
 src/routes/index.ts                   |  10 +-
 8 files changed, 159 insertions(+), 188 deletions(-)
 rename src/{components => pages}/SendNft.vue (65%)

diff --git a/src/components/GasPrice.vue b/src/components/GasPrice.vue
index 566b7838..7a77fe7d 100644
--- a/src/components/GasPrice.vue
+++ b/src/components/GasPrice.vue
@@ -99,7 +99,7 @@ function handleCustomGasPriceInput(value) {
   <div class="flex flex-col gap-1">
     <div class="flex justify-between items-baseline">
       <span class="text-sm font-medium">Gas Fees</span>
-      <div class="text-xs font-normal">
+      <div v-if="false" class="text-xs font-normal">
         <span class="text-gray-100">Transaction Time:</span>
         <span class="text-black-500 dark:text-white-100">
           ~{{ hasGasStation ? '-' : transactionTime }} mins
@@ -143,46 +143,22 @@ function handleCustomGasPriceInput(value) {
       </div>
     </div>
   </div>
-  <div v-if="selectedGasMethod === 'custom'" class="space-y-1">
-    <div class="space-x-1 mb-2 text-xs text-zinc-400">
-      <span class="font-semibold">Base Fee:</span>
-      <span class="text-black dark:text-white">{{ props.baseFee }} Gwei</span>
-    </div>
-    <div class="flex justify-between sm:flex-col sm:space-y-1">
-      <label class="text-xs text-zinc-400 font-semibold" for="amount">
-        Set Custom Fee
-      </label>
-      <p v-if="rpcStore.currency" class="space-x-1 text-xs text-zinc-400">
-        <span>Conversion Rate:</span>
-        <span class="text-black dark:text-white">{{
-          conversionRate || 'NA'
-        }}</span>
-      </p>
-    </div>
-    <div
-      class="flex divide-x space-x-1 p-2 sm:p-1 input rounded-lg"
-      :class="{
-        'outline-black dark:outline-white outline-1 outline': isGasPriceFocused,
-      }"
-    >
-      <input
-        id="custom-gas-fee-amount"
-        :value="props.gasPrice"
-        autocomplete="off"
-        type="text"
-        class="text-base sm:text-sm bg-transparent w-full rounded-lg border-none outline-none"
-        placeholder="0.5"
-        @input="(evt) => handleCustomGasPriceInput(evt.target.value)"
-        @focus="isGasPriceFocused = true"
-        @blur="isGasPriceFocused = false"
-      />
-      <div class="p-2 border-l-[1px] border-l-slate-400 px-1">
-        <p
-          class="text-sm pl-1 w-[4.375rem] text-ellipsis whitespace-nowrap overflow-hidden"
-        >
-          {{ GAS_FEE_UNIT }}
-        </p>
-      </div>
+  <div v-if="selectedGasMethod === 'custom'" class="flex flex-col gap-1">
+    <label class="text-sm font-medium" for="quantity"> Set Custom Fee </label>
+    <input
+      id="quantity"
+      v-model="gasFee"
+      required
+      type="text"
+      class="input-field"
+      :class="{ 'input-active': isGasPriceFocused }"
+      placeholder="Enter Recipient’s Wallet Address"
+      @focus="isGasPriceFocused = true"
+      @blur="isGasPriceFocused = false"
+    />
+    <div class="flex justify-end gap-1">
+      <span class="text-xs text-gray-100">Base Fee:</span>
+      <span class="text-xs">{{ props.baseFee }} Gwei</span>
     </div>
   </div>
 </template>
diff --git a/src/components/NFTView.vue b/src/components/NFTView.vue
index 23c820f1..5c861cca 100644
--- a/src/components/NFTView.vue
+++ b/src/components/NFTView.vue
@@ -79,7 +79,7 @@ watch(
           {{ loader.message }}
         </p>
       </div>
-      <div v-else class="p-3 m-1 overflow-y-scroll">
+      <div v-else class="p-3 m-1 overflow-y-auto">
         <div v-if="nfts.length" class="grid grid-cols-2 gap-[10px]">
           <div
             v-for="nft in nfts"
@@ -88,7 +88,7 @@ watch(
             @click.stop="
               router.push({
                 name: 'NftDetails',
-                params: {
+                query: {
                   ...getNftDetailValues(nft),
                 },
               })
diff --git a/src/components/SendNftPreview.vue b/src/components/SendNftPreview.vue
index 60898af6..182686c8 100644
--- a/src/components/SendNftPreview.vue
+++ b/src/components/SendNftPreview.vue
@@ -1,8 +1,10 @@
 <script setup lang="ts">
+import SwipeToAction from '@/components/SwipeToAction.vue'
 import { useRpcStore } from '@/store/rpc'
+import { getImage } from '@/utils/getImage'
 import { useImage } from '@/utils/useImage'
 
-const getImage = useImage()
+const getImageOld = useImage()
 const rpcStore = useRpcStore()
 
 type NftPreviewProps = {
@@ -25,76 +27,59 @@ const nativeCurrency = rpcStore.nativeCurrency.symbol
 
 const txFees =
   Number(props.previewData.gasFee) * Number(props.previewData.estimatedGas)
+
+function truncateAddress(address: string) {
+  return `${address.slice(0, 5)}....${address.slice(-5)}`
+}
 </script>
 
 <template>
-  <div class="space-y-4 overflow-auto flex flex-col">
-    <div class="flex flex-col space-y-3 sm:space-y-2">
-      <p class="text-xl sm:text-sm font-semibold">Preview</p>
-    </div>
-    <div class="w-full aspect-square rounded-[10px] overflow-hidden">
-      <img
-        :src="props.previewData.imageUrl"
-        class="object-cover object-center"
-      />
-    </div>
-    <div class="space-y-1">
-      <p class="text-xs text-zinc-400">Network</p>
-      <p class="text-base sm:text-sm">
-        {{ rpcStore.selectedRpcConfig?.chainName }}
-      </p>
-    </div>
-    <div class="space-y-1">
-      <p class="text-xs text-zinc-400 font-semibold">Sender’s Wallet Address</p>
-      <p
-        class="text-base truncate"
-        :title="props.previewData.senderWalletAddress"
-      >
-        {{ props.previewData.senderWalletAddress }}
-      </p>
-    </div>
-    <div class="flex justify-center">
-      <img :src="getImage('arrow-down-icon')" alt="arrow down icon" />
-    </div>
-    <div class="space-y-1">
-      <p class="text-xs text-zinc-400 font-semibold">
-        Recipient’s Wallet Address
-      </p>
-      <p
-        class="text-sm truncate"
-        :title="props.previewData.recipientWalletAddress"
-      >
-        {{ props.previewData.recipientWalletAddress }}
-      </p>
-    </div>
-    <div class="space-y-3">
-      <div class="space-y-[10px]">
-        <div
-          class="flex flex-col text-sm sm:text-xs font-normal flex-nowrap gap-1"
-        >
-          <p class="text-xs text-zinc-400 font-semibold">Gas Fees</p>
-          <p
-            :title="`${txFees} ${nativeCurrency}`"
-            class="overflow-hidden text-ellipsis whitespace-nowrap"
+  <div class="flex flex-col flex-grow justify-between">
+    <div class="flex flex-col flex-grow gap-7">
+      <div class="relative flex justify-center items-center">
+        <button class="absolute left-0" @click.stop="emits('close')">
+          <img :src="getImage('back-arrow.svg')" class="w-6 h-6" />
+        </button>
+        <span class="text-lg font-bold">Confirm Transfer</span>
+      </div>
+      <div class="mx-auto w-16 aspect-square rounded-[10px] overflow-hidden">
+        <img
+          :src="props.previewData.imageUrl"
+          class="object-cover object-center w-full h-full"
+        />
+      </div>
+      <div class="flex justify-between items-center">
+        <div class="flex flex-col gap-1">
+          <span class="text-sm font-medium text-gray-100"
+            >Sender’s Address</span
+          >
+          <span class="text-base">
+            {{ truncateAddress(props.previewData.senderWalletAddress) }}
+          </span>
+        </div>
+        <img :src="getImage('forward-arrow.svg')" class="w-6 h-6" />
+        <div class="flex flex-col gap-1">
+          <span class="text-sm font-medium text-gray-100"
+            >Recipient’s Address</span
+          >
+          <span class="text-base">
+            {{ truncateAddress(props.previewData.recipientWalletAddress) }}
+          </span>
+        </div>
+      </div>
+      <div class="flex flex-col gap-1">
+        <div class="flex justify-between">
+          <span class="text-base font-normal text-gray-100">Quantity</span>
+          <span class="text-base">10</span>
+        </div>
+        <div class="flex justify-between">
+          <span class="text-base font-normal text-gray-100">Gas Fee</span>
+          <span class="text-base"
+            >{{ props.previewData.gasFee }} {{ nativeCurrency }}</span
           >
-            {{ txFees }} {{ nativeCurrency }}
-          </p>
         </div>
       </div>
     </div>
-    <div class="flex justify-between">
-      <button
-        class="text-sm sm:text-xs rounded-xl border-2 border-black dark:border-white bg-transparent text-black dark:text-white w-36 h-9 sm:w-20 sm:h-8 uppercase"
-        @click="emits('close')"
-      >
-        Back
-      </button>
-      <button
-        class="text-sm sm:text-xs rounded-xl text-white dark:bg-white bg-black dark:text-black w-36 h-9 sm:w-20 sm:h-8 uppercase"
-        @click="emits('submit')"
-      >
-        Send
-      </button>
-    </div>
+    <SwipeToAction message="Swipe to Transfer" @success="emits('submit')" />
   </div>
 </template>
diff --git a/src/pages/NFTScreen.vue b/src/pages/NFTScreen.vue
index c546fa1c..4de3e9f3 100644
--- a/src/pages/NFTScreen.vue
+++ b/src/pages/NFTScreen.vue
@@ -47,7 +47,7 @@ onBeforeRouteLeave((to) => {
     <AppLoader :message="loader.message" />
   </div>
   <div v-else class="h-full">
-    <div class="pb-5 flex flex-col gap-1">
+    <div class="pb-5 flex flex-col gap-3">
       <span class="uppercase font-lg font-bold">NFTs</span>
       <div class="card flex flex-col overflow-hidden">
         <NFTView
diff --git a/src/pages/NftDetailsScreen.vue b/src/pages/NftDetailsScreen.vue
index 30762164..272d236f 100644
--- a/src/pages/NftDetailsScreen.vue
+++ b/src/pages/NftDetailsScreen.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup>
 import { computed, ref, type ComputedRef, type Ref } from 'vue'
-import { useRouter } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router'
 
-import SendNft from '@/components/SendNft.vue'
 import type { NFTContractType } from '@/models/NFT'
 import { useModalStore } from '@/store/modal'
 import { getImage } from '@/utils/getImage'
@@ -17,6 +16,7 @@ type NftDetails = {
   imageUrl: string
   animationUrl?: string
   attributes?: string
+  balance?: string
 }
 
 type NftAttributes = {
@@ -26,11 +26,13 @@ type NftAttributes = {
 
 type ModalState = 'send-nft' | false
 
-const props = defineProps<NftDetails>()
 const router = useRouter()
+const route = useRoute()
 const showModal: Ref<ModalState> = ref(false)
 const modalStore = useModalStore()
 
+const props = route.query as NftDetails
+
 const nftAttributes: ComputedRef<NftAttributes[]> = computed(() => {
   if (props.attributes) {
     return JSON.parse(props.attributes)
@@ -39,8 +41,7 @@ const nftAttributes: ComputedRef<NftAttributes[]> = computed(() => {
 })
 
 function openNftModal() {
-  modalStore.setShowModal(true)
-  showModal.value = 'send-nft'
+  router.push({ name: 'SendNfts', params: { ...props } })
 }
 
 function handleClose() {
@@ -137,12 +138,5 @@ function handleClose() {
         </div>
       </div>
     </div>
-    <Teleport v-if="showModal" to="#modal-container">
-      <SendNft
-        v-if="showModal === 'send-nft'"
-        :nft="{ ...props, attributes: nftAttributes }"
-        @close="handleClose"
-      />
-    </Teleport>
   </div>
 </template>
diff --git a/src/pages/SelectNftScreen.vue b/src/pages/SelectNftScreen.vue
index c03d42f0..ce4b843a 100644
--- a/src/pages/SelectNftScreen.vue
+++ b/src/pages/SelectNftScreen.vue
@@ -2,7 +2,6 @@
 import { onMounted, ref, type Ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 
-import SendNft from '@/components/SendNft.vue'
 import type { NFT } from '@/models/NFT'
 import { NFTDB } from '@/services/nft.service'
 import { useModalStore } from '@/store/modal'
@@ -139,12 +138,5 @@ rpcStore.$subscribe(getNFTAssets)
         </div>
       </div>
     </div>
-    <Teleport v-if="showModal" to="#modal-container">
-      <SendNft
-        v-if="showModal === 'send-nft' && selectedNft"
-        :nft="selectedNft"
-        @close="handleClose"
-      />
-    </Teleport>
   </div>
 </template>
diff --git a/src/components/SendNft.vue b/src/pages/SendNft.vue
similarity index 65%
rename from src/components/SendNft.vue
rename to src/pages/SendNft.vue
index a4bf4ab0..4175040e 100644
--- a/src/components/SendNft.vue
+++ b/src/pages/SendNft.vue
@@ -7,7 +7,7 @@ import { useToast } from 'vue-toastification'
 import AppLoader from '@/components/AppLoader.vue'
 import GasPrice from '@/components/GasPrice.vue'
 import SendNftPreview from '@/components/SendNftPreview.vue'
-import { NFT } from '@/models/NFT'
+import { type NFTContractType } from '@/models/NFT'
 import {
   getGasPrice,
   GAS_AVAILABLE_CHAIN_IDS,
@@ -15,12 +15,22 @@ import {
 import { useActivitiesStore } from '@/store/activities'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
+import { getImage } from '@/utils/getImage'
 import { convertGweiToEth } from '@/utils/gweiToEth'
 import { getRequestHandler } from '@/utils/requestHandlerSingleton'
 import { useImage } from '@/utils/useImage'
 
 type SendNftProps = {
-  nft: NFT
+  type: NFTContractType
+  address: string
+  tokenId: string
+  collectionName: string
+  name: string
+  description?: string
+  imageUrl: string
+  animationUrl?: string
+  attributes?: string
+  balance?: number
 }
 
 const emit = defineEmits(['close'])
@@ -30,7 +40,7 @@ const showPreview = ref(false)
 const rpcStore = useRpcStore()
 const userStore = useUserStore()
 const activitiesStore = useActivitiesStore()
-const getImage = useImage()
+const getImageOld = useImage()
 const toast = useToast()
 const isWalletAddressFocused = ref(false)
 const chainId = Number(rpcStore.selectedChainId)
@@ -46,6 +56,8 @@ const loader = ref({
   message: '',
 })
 const baseFee = ref('0')
+const quantity = ref(1)
+const isQuantityFocused = ref(false)
 
 watch(
   () => gasFeeInGwei.value,
@@ -120,18 +132,22 @@ async function handleSendToken() {
       .toHexString()
 
     const txHash = await accountHandler.sendNft(
-      props.nft.type,
-      props.nft.address,
+      props.type,
+      props.address,
       userStore.walletAddress,
       setHexPrefix(recipientWalletAddress.value),
-      props.nft.tokenId,
+      props.tokenId,
       1,
       gasFees
     )
+    const nft = {
+      ...props,
+    }
+    nft.attributes = props.attributes ? JSON.parse(props.attributes) : []
     await activitiesStore.fetchAndSaveNFTActivityFromHash({
       chainId: rpcStore.selectedRpcConfig?.chainId,
       txHash,
-      nft: props.nft,
+      nft,
       recipientAddress: setHexPrefix(recipientWalletAddress.value),
     })
     router.back()
@@ -162,11 +178,11 @@ async function handleShowPreview() {
       const accountHandler = getRequestHandler().getAccountHandler()
       estimatedGas.value = (
         await accountHandler.estimateNftGas(
-          props.nft.type,
-          props.nft.address,
+          props.type,
+          props.address,
           userStore.walletAddress,
           recipientWalletAddress.value,
-          props.nft.tokenId,
+          props.tokenId,
           1
         )
       ).toString()
@@ -185,7 +201,7 @@ async function handleShowPreview() {
   <div v-if="loader.show" class="h-full flex justify-center items-center">
     <AppLoader :message="loader.message" />
   </div>
-  <div v-else class="w-full">
+  <div v-else class="w-full flex flex-grow mb-5">
     <SendNftPreview
       v-if="showPreview"
       :preview-data="{
@@ -193,72 +209,74 @@ async function handleShowPreview() {
         recipientWalletAddress: setHexPrefix(recipientWalletAddress),
         gasFee: gasFeeInEth,
         estimatedGas,
-        nftContractAddress: props.nft.address,
-        tokenId: props.nft.tokenId,
-        imageUrl: props.nft.imageUrl,
+        nftContractAddress: props.address,
+        tokenId: props.tokenId,
+        imageUrl: props.imageUrl,
       }"
       @close="showPreview = false"
       @submit="handleSendToken"
     />
-    <div v-else class="space-y-3 overflow-auto flex flex-col justify-between">
-      <div class="flex flex-col space-y-3 sm:space-y-2">
-        <div class="flex justify-between">
-          <p class="text-xl sm:text-sm font-semibold">Send</p>
-          <button class="h-auto" @click="emit('close')">
-            <img :src="getImage('close-icon')" alt="close icon" />
-          </button>
-        </div>
+    <div v-else class="flex flex-col flex-grow justify-between gap-5">
+      <div class="relative flex justify-center items-center">
+        <button class="absolute left-0" @click.stop="router.go(-1)">
+          <img :src="getImage('back-arrow.svg')" class="w-6 h-6" />
+        </button>
+        <span class="text-lg font-bold">Send Token</span>
       </div>
-      <div class="mt-4 flex justify-center">
-        <img :src="props.nft.imageUrl" class="rounded-[10px] w-24 h-24" />
+      <div class="flex justify-center">
+        <img :src="props.imageUrl" class="rounded-[10px] w-24 h-24" />
       </div>
       <form
-        class="space-y-4 sm:space-y-3 px-[1px]"
-        @submit.prevent="handleShowPreview"
+        class="flex flex-col flex-grow justify-between gap-5"
+        @submit.prevent="showPreview = true"
       >
-        <div class="space-y-1">
-          <label
-            class="text-xs text-zinc-400 font-semibold"
-            for="recipientWalletAddress"
-          >
-            Recipient’s Wallet Address
-          </label>
-          <div
-            class="flex space-x-1 px-2 py-4 sm:p-1 input rounded-lg"
-            :class="{
-              'outline-black dark:outline-white outline-1 outline':
-                isWalletAddressFocused,
-            }"
-          >
+        <div class="flex flex-col gap-3">
+          <div class="flex flex-col gap-1">
+            <label class="text-sm font-medium" for="recipientWalletAddress">
+              Recipient’s Wallet Address
+            </label>
             <input
               id="recipientWalletAddress"
               v-model="recipientWalletAddress"
               required
               type="text"
-              class="text-base sm:text-sm w-full bg-transparent rounded-lg border-none outline-none overflow-hidden text-ellipsis"
-              placeholder="6yhjtikn7..."
+              class="input-field"
+              :class="{ 'input-active': isWalletAddressFocused }"
+              placeholder="Enter Recipient’s Wallet Address"
               @focus="isWalletAddressFocused = true"
               @blur="isWalletAddressFocused = false"
             />
           </div>
+          <div v-if="props.type === 'erc1155'" class="flex flex-col gap-1">
+            <label class="text-sm font-medium" for="quantity"> Quantity </label>
+            <input
+              id="quantity"
+              v-model="quantity"
+              required
+              type="text"
+              class="input-field"
+              :class="{ 'input-active': isQuantityFocused }"
+              placeholder="Enter Recipient’s Wallet Address"
+              @focus="isQuantityFocused = true"
+              @blur="isQuantityFocused = false"
+            />
+            <div class="flex justify-end gap-1">
+              <span class="text-xs text-gray-100">Total:</span>
+              <span class="text-xs">{{ props.balance }} copies</span>
+            </div>
+          </div>
+          <GasPrice
+            :gas-price="gasFeeInGwei"
+            :gas-prices="gasPrices"
+            :base-fee="baseFee"
+            @gas-price-input="handleSetGasPrice"
+          />
         </div>
-        <GasPrice
-          :gas-price="`${gasFeeInGwei}`"
-          :gas-prices="gasPrices"
-          :base-fee="baseFee"
-          @gas-price-input="handleSetGasPrice"
-        />
-        <div class="flex justify-between">
-          <button
-            class="text-sm sm:text-xs rounded-xl border-2 border-black dark:border-white bg-transparent text-black dark:text-white w-36 h-9 sm:w-20 sm:h-8 uppercase"
-            @click.stop="emit('close')"
-          >
-            Cancel
-          </button>
+        <div class="flex">
           <button
-            class="text-sm sm:text-xs rounded-xl text-white dark:bg-white bg-black dark:text-black w-36 h-9 sm:w-20 sm:h-8 uppercase"
+            class="btn-primary uppercase p-[10px] font-bold text-base flex-grow text-center"
           >
-            Proceed
+            Preview
           </button>
         </div>
       </form>
diff --git a/src/routes/index.ts b/src/routes/index.ts
index a299789e..0c1c3bef 100644
--- a/src/routes/index.ts
+++ b/src/routes/index.ts
@@ -18,6 +18,7 @@ import NFTScreen from '@/pages/NFTScreen.vue'
 import ProfileScreen from '@/pages/profileScreen.vue'
 import RequestsScreen from '@/pages/RequestsScreen.vue'
 import SelectNftScreen from '@/pages/SelectNftScreen.vue'
+import SendNft from '@/pages/SendNft.vue'
 import SendTokens from '@/pages/SendTokens.vue'
 import SignInV2 from '@/pages/signInV2.vue'
 
@@ -102,7 +103,6 @@ const routes: RouteRecordRaw[] = [
         name: 'NftDetails',
         path: '/nfts/details',
         component: NftDetailsScreen,
-        props: true,
       },
       {
         name: 'requests',
@@ -126,9 +126,15 @@ const routes: RouteRecordRaw[] = [
       },
       {
         name: 'SendTokens',
-        path: 'tokens/send',
+        path: '/tokens/send',
         component: SendTokens,
       },
+      {
+        name: 'SendNfts',
+        path: '/nfts/send',
+        component: SendNft,
+        props: true,
+      },
     ],
   },
 ]

From 59a3cb5955af7d065903466e6bf7a5176520a48f Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 30 May 2023 11:48:44 +0530
Subject: [PATCH 080/153] Move secured by arcana to header

---
 src/App.vue                     |  6 ------
 src/components/WalletHeader.vue | 19 ++++++++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2d33fbd1..3a0df79d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,7 +13,6 @@ import { useModalStore } from '@/store/modal'
 import { useParentConnectionStore } from '@/store/parentConnection'
 import { useRequestStore } from '@/store/request'
 import { getImage } from '@/utils/getImage'
-import { isMobileViewport } from '@/utils/isMobileViewport'
 import { initializeOnRampMoney } from '@/utils/onrampmoney.ramp'
 import { fetchTransakNetworks } from '@/utils/transak'
 
@@ -102,11 +101,6 @@ function onClickOfHeader() {
       <div class="flex-grow wallet__container m-1 p-3">
         <RouterView class="min-h-fullxs flex-grow" />
         <BaseModal v-if="modal.show" />
-        <img
-          v-if="showFooter"
-          :src="getImage('secured-by-arcana.svg')"
-          class="h-xs mb-2"
-        />
       </div>
       <WalletFooter v-if="showFooter" />
     </div>
diff --git a/src/components/WalletHeader.vue b/src/components/WalletHeader.vue
index 9b045087..407318f2 100644
--- a/src/components/WalletHeader.vue
+++ b/src/components/WalletHeader.vue
@@ -28,13 +28,18 @@ watch(
 <template>
   <div>
     <header class="flex justify-between px-4 py-2">
-      <div class="flex items-center gap-2">
-        <img
-          :src="appStore.appLogo?.horizontal"
-          alt="App Logo"
-          class="w-xl h-xl"
-        />
-        <span class="font-bold text-lg">{{ appStore.name }}</span>
+      <div class="flex flex-col">
+        <div class="flex items-center gap-2">
+          <img
+            :src="appStore.appLogo?.horizontal"
+            alt="App Logo"
+            class="w-xl h-xl"
+          />
+          <span class="font-bold text-lg">{{ appStore.name }}</span>
+        </div>
+        <div class="flex justify-start">
+          <img :src="getImage('secured-by-arcana.svg')" class="h-3 ml-8" />
+        </div>
       </div>
       <div class="flex items-center gap-3">
         <button class="w-xl h-xl rounded-full">

From c0a2fc304bc88dc77dba1c8873ff9ef71bbc8216 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 30 May 2023 12:35:54 +0530
Subject: [PATCH 081/153] Add chainlist dropdown arrow

---
 src/assets/images/dark/arrow-down.svg  |  3 ++
 src/assets/images/light/arrow-down.svg |  3 ++
 src/components/AssetsView.vue          |  2 +-
 src/components/ChainListModal.vue      | 49 ++++++++++++++++++++++++++
 src/components/WalletHeader.vue        | 31 +++++++++++++---
 5 files changed, 82 insertions(+), 6 deletions(-)
 create mode 100644 src/assets/images/dark/arrow-down.svg
 create mode 100644 src/assets/images/light/arrow-down.svg
 create mode 100644 src/components/ChainListModal.vue

diff --git a/src/assets/images/dark/arrow-down.svg b/src/assets/images/dark/arrow-down.svg
new file mode 100644
index 00000000..a851a1e8
--- /dev/null
+++ b/src/assets/images/dark/arrow-down.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.3333 8.33301L9.99996 11.6663L6.66663 8.33301" stroke="white" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/arrow-down.svg b/src/assets/images/light/arrow-down.svg
new file mode 100644
index 00000000..99d241cc
--- /dev/null
+++ b/src/assets/images/light/arrow-down.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.3333 8.33301L9.99996 11.6663L6.66663 8.33301" stroke="#333333" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/AssetsView.vue b/src/components/AssetsView.vue
index d3e54023..73913dfd 100644
--- a/src/components/AssetsView.vue
+++ b/src/components/AssetsView.vue
@@ -152,7 +152,7 @@ rpcStore.$subscribe(getAssetsBalance)
         <span class="m-auto font-normal text-base">No tokens added</span>
       </div>
       <button
-        class="flex py-3 gap-2 items-center justify-center flex-grow btn-quaternery border-r-0 border-l-0 border-b-0"
+        class="flex py-1 gap-2 items-center justify-center flex-grow btn-quaternery border-r-0 border-l-0 border-b-0"
         @click.stop="handleAddToken"
       >
         <img :src="getImage('plus.svg')" class="h-lg w-lg" />
diff --git a/src/components/ChainListModal.vue b/src/components/ChainListModal.vue
new file mode 100644
index 00000000..028d3e21
--- /dev/null
+++ b/src/components/ChainListModal.vue
@@ -0,0 +1,49 @@
+<script setup lang="ts">
+import VueQrious from 'vue-qrious'
+import { useToast } from 'vue-toastification'
+
+import { useUserStore } from '@/store/user'
+import { getImage } from '@/utils/getImage'
+
+const userStore = useUserStore()
+const toast = useToast()
+
+async function copyToClipboard(value: string) {
+  try {
+    await navigator.clipboard.writeText(value)
+    toast.success('Wallet address copied')
+  } catch (err) {
+    toast.error('Failed to copy wallet address')
+  }
+}
+</script>
+
+<template>
+  <div class="flex flex-col">
+    <div class="flex items-center justify-center">
+      <p class="text-xl font-bold">Receive Tokens</p>
+    </div>
+    <p class="text-xs text-gray-100 mt-5">
+      Scan QR code to copy your address in order to send tokens to this address.
+    </p>
+  </div>
+  <div
+    class="flex justify-center items-center mt-4 p-2 bg-white-100 rounded-sm"
+  >
+    <VueQrious
+      :value="userStore.walletAddress"
+      :size="400"
+      class="w-full h-full"
+    />
+  </div>
+  <div class="flex items-center justify-center gap-1 mt-6 mb-2">
+    <p class="text-sm font-medium">{{ userStore.walletAddressShrinked }}</p>
+    <button
+      class="h-sm w-sm"
+      title="Click to copy wallet address"
+      @click="copyToClipboard(userStore.walletAddress)"
+    >
+      <img :src="getImage('copy.svg')" alt="Copy wallet address" />
+    </button>
+  </div>
+</template>
diff --git a/src/components/WalletHeader.vue b/src/components/WalletHeader.vue
index 407318f2..db498375 100644
--- a/src/components/WalletHeader.vue
+++ b/src/components/WalletHeader.vue
@@ -1,26 +1,37 @@
 <script setup lang="ts">
 import { ref, type Ref, watch } from 'vue'
 
+import ChainListModal from '@/components/ChainListModal.vue'
 import ReceiveTokens from '@/components/ReceiveTokens.vue'
 import { useAppStore } from '@/store/app'
 import { useModalStore } from '@/store/modal'
 import { getImage } from '@/utils/getImage'
 
-type ModalState = 'receive' | false
+type ModalState = 'receive' | 'chain-list' | false
 
 const appStore = useAppStore()
 const showModal: Ref<ModalState> = ref(false)
 const modalStore = useModalStore()
+const isChainListExpanded = ref(false)
 
 function openReceiveTokens(open) {
   modalStore.setShowModal(open)
   showModal.value = open ? 'receive' : false
 }
 
+function openChainList() {
+  modalStore.setShowModal(true)
+  isChainListExpanded.value = true
+  showModal.value = 'chain-list'
+}
+
 watch(
   () => modalStore.show,
   (show) => {
-    if (!show) showModal.value = false
+    if (!show) {
+      showModal.value = false
+      isChainListExpanded.value = false
+    }
   }
 )
 </script>
@@ -35,15 +46,24 @@ watch(
             alt="App Logo"
             class="w-xl h-xl"
           />
-          <span class="font-bold text-lg">{{ appStore.name }}</span>
+          <span class="font-bold text-lg max-w-20 overflow-hidde">{{
+            appStore.name
+          }}</span>
         </div>
         <div class="flex justify-start">
           <img :src="getImage('secured-by-arcana.svg')" class="h-3 ml-8" />
         </div>
       </div>
       <div class="flex items-center gap-3">
-        <button class="w-xl h-xl rounded-full">
-          <img :src="`/chain-logos/ethereum-icon.png`" alt="Network Icon" />
+        <button class="flex items-center" @click.stop="openChainList()">
+          <div class="w-xl h-xl rounded-full">
+            <img :src="`/chain-logos/ethereum-icon.png`" alt="Network Icon" />
+          </div>
+          <img
+            :src="getImage('arrow-down.svg')"
+            class="transition-all duration-200 ease-in-out"
+            :class="{ '-rotate-180': isChainListExpanded }"
+          />
         </button>
         <button class="w-xl h-xl" @click.stop="openReceiveTokens(true)">
           <img :src="getImage('qr-code.svg')" alt="Wallet Icon" />
@@ -52,6 +72,7 @@ watch(
     </header>
     <Teleport v-if="modalStore.show" to="#modal-container">
       <ReceiveTokens v-if="showModal === 'receive'" />
+      <ChainListModal v-if="showModal === 'chain-list'" />
     </Teleport>
   </div>
 </template>

From 1cc45e1ae6f2ef60cf294f2f49ae666cea912057 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 30 May 2023 12:38:02 +0530
Subject: [PATCH 082/153] Handle base modal

---
 src/components/BaseModal.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/BaseModal.vue b/src/components/BaseModal.vue
index e1d94231..736a5f5d 100644
--- a/src/components/BaseModal.vue
+++ b/src/components/BaseModal.vue
@@ -19,7 +19,7 @@ function handleCollapse() {
 <template>
   <div class="fixed flex justify-center items-center inset-0 z-50 p-3 overlay">
     <div
-      class="card absolute flex flex-col pt-2 w-full rounded-b-none"
+      class="card max-h-[80%] absolute flex flex-col pt-2 w-full rounded-b-none"
       :class="{ collapse: canModalCollapse }"
     >
       <div class="flex justify-center">
@@ -27,7 +27,11 @@ function handleCollapse() {
           <img :src="getImage('collapse-arrow.svg')" />
         </button>
       </div>
-      <div id="modal-container" ref="modalContainer" class="p-4"></div>
+      <div
+        id="modal-container"
+        ref="modalContainer"
+        class="p-4 overflow-y-auto"
+      ></div>
     </div>
   </div>
 </template>

From ed90d30a86d6df409a71626f9ce31636052b6449 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 30 May 2023 15:22:45 +0530
Subject: [PATCH 083/153] Update chainlist modal

---
 src/components/BaseModal.vue      |  2 +-
 src/components/ChainListModal.vue | 95 +++++++++++++++++++------------
 src/components/WalletHeader.vue   | 35 +++++++++++-
 src/pages/loggedInView.vue        |  3 +
 src/services/chainlist.service.ts |  8 ++-
 5 files changed, 103 insertions(+), 40 deletions(-)

diff --git a/src/components/BaseModal.vue b/src/components/BaseModal.vue
index 736a5f5d..05c4f5f4 100644
--- a/src/components/BaseModal.vue
+++ b/src/components/BaseModal.vue
@@ -19,7 +19,7 @@ function handleCollapse() {
 <template>
   <div class="fixed flex justify-center items-center inset-0 z-50 p-3 overlay">
     <div
-      class="card max-h-[80%] absolute flex flex-col pt-2 w-full rounded-b-none"
+      class="card max-h-[90%] absolute flex flex-col pt-2 w-full rounded-b-none"
       :class="{ collapse: canModalCollapse }"
     >
       <div class="flex justify-center">
diff --git a/src/components/ChainListModal.vue b/src/components/ChainListModal.vue
index 028d3e21..8dfefe85 100644
--- a/src/components/ChainListModal.vue
+++ b/src/components/ChainListModal.vue
@@ -1,49 +1,74 @@
 <script setup lang="ts">
-import VueQrious from 'vue-qrious'
+import { ref, watch } from 'vue'
 import { useToast } from 'vue-toastification'
 
-import { useUserStore } from '@/store/user'
-import { getImage } from '@/utils/getImage'
+import { getChainLogoUrl } from '@/services/chainlist.service'
+import { useRpcStore } from '@/store/rpc'
 
-const userStore = useUserStore()
+const emit = defineEmits(['close'])
 const toast = useToast()
+const rpcStore = useRpcStore()
 
-async function copyToClipboard(value: string) {
-  try {
-    await navigator.clipboard.writeText(value)
-    toast.success('Wallet address copied')
-  } catch (err) {
-    toast.error('Failed to copy wallet address')
+const selectedRPCConfig = ref(rpcStore.selectedRPCConfig)
+
+watch(
+  () => selectedRPCConfig.value,
+  () => {
+    console.log('setting selected rpc config')
+    rpcStore.setSelectedRPCConfig(selectedRPCConfig.value)
+    emit('close')
   }
-}
+)
 </script>
 
 <template>
-  <div class="flex flex-col">
+  <div class="flex flex-col gap-5">
     <div class="flex items-center justify-center">
-      <p class="text-xl font-bold">Receive Tokens</p>
+      <p class="text-xl font-bold">Choose Network</p>
+    </div>
+    <div class="flex flex-col gap-4">
+      <div
+        v-for="chain in rpcStore.rpcConfigs"
+        :key="chain.chainId"
+        class="flex items-center gap-2"
+      >
+        <input
+          :id="chain.chainId"
+          v-model="selectedRPCConfig"
+          type="radio"
+          :value="chain"
+          name="chain"
+          class="radio"
+        />
+        <label class="flex items-center gap-2" :for="chain.chainId">
+          <img
+            :src="getChainLogoUrl(Number(chain.chainId))"
+            onerror="this.src = '/chain-logos/blockchain-icon.png'"
+            class="w-xl h-xl"
+          />
+          <span class="text-base">{{ chain.chainName }}</span>
+          <span v-if="chain.chainType === 'testnet'" class="testnet-tag">
+            Testnet
+          </span>
+        </label>
+      </div>
+      <button
+        class="btn-primary uppercase font-bold text-base py-2 mt-4"
+        @click.stop="void 0"
+      >
+        Add network
+      </button>
     </div>
-    <p class="text-xs text-gray-100 mt-5">
-      Scan QR code to copy your address in order to send tokens to this address.
-    </p>
-  </div>
-  <div
-    class="flex justify-center items-center mt-4 p-2 bg-white-100 rounded-sm"
-  >
-    <VueQrious
-      :value="userStore.walletAddress"
-      :size="400"
-      class="w-full h-full"
-    />
-  </div>
-  <div class="flex items-center justify-center gap-1 mt-6 mb-2">
-    <p class="text-sm font-medium">{{ userStore.walletAddressShrinked }}</p>
-    <button
-      class="h-sm w-sm"
-      title="Click to copy wallet address"
-      @click="copyToClipboard(userStore.walletAddress)"
-    >
-      <img :src="getImage('copy.svg')" alt="Copy wallet address" />
-    </button>
   </div>
 </template>
+
+<style scoped>
+.testnet-tag {
+  padding: 1px 2px;
+  font-size: 8px;
+  color: #fe6827;
+  background: #fe682710;
+  border-radius: 2px;
+  border-radius: 10px;
+}
+</style>
diff --git a/src/components/WalletHeader.vue b/src/components/WalletHeader.vue
index db498375..4798f6cf 100644
--- a/src/components/WalletHeader.vue
+++ b/src/components/WalletHeader.vue
@@ -3,8 +3,10 @@ import { ref, type Ref, watch } from 'vue'
 
 import ChainListModal from '@/components/ChainListModal.vue'
 import ReceiveTokens from '@/components/ReceiveTokens.vue'
+import { getChainLogoUrl } from '@/services/chainlist.service'
 import { useAppStore } from '@/store/app'
 import { useModalStore } from '@/store/modal'
+import { useRpcStore } from '@/store/rpc'
 import { getImage } from '@/utils/getImage'
 
 type ModalState = 'receive' | 'chain-list' | false
@@ -13,6 +15,8 @@ const appStore = useAppStore()
 const showModal: Ref<ModalState> = ref(false)
 const modalStore = useModalStore()
 const isChainListExpanded = ref(false)
+const rpcStore = useRpcStore()
+const hasChainUpdated = ref(true)
 
 function openReceiveTokens(open) {
   modalStore.setShowModal(open)
@@ -25,6 +29,12 @@ function openChainList() {
   showModal.value = 'chain-list'
 }
 
+function closeChainListModal() {
+  modalStore.setShowModal(false)
+  isChainListExpanded.value = false
+  showModal.value = false
+}
+
 watch(
   () => modalStore.show,
   (show) => {
@@ -34,6 +44,16 @@ watch(
     }
   }
 )
+
+watch(
+  () => rpcStore.selectedChainId,
+  () => {
+    hasChainUpdated.value = false
+    setTimeout(() => {
+      hasChainUpdated.value = true
+    }, 100)
+  }
+)
 </script>
 
 <template>
@@ -56,8 +76,14 @@ watch(
       </div>
       <div class="flex items-center gap-3">
         <button class="flex items-center" @click.stop="openChainList()">
-          <div class="w-xl h-xl rounded-full">
-            <img :src="`/chain-logos/ethereum-icon.png`" alt="Network Icon" />
+          <div v-if="hasChainUpdated" class="w-xl h-xl rounded-full">
+            <img
+              :src="getChainLogoUrl(Number(rpcStore.selectedChainId))"
+              :alt="rpcStore.selectedRpcConfig?.chainName"
+              :title="rpcStore.selectedRpcConfig?.chainName"
+              onerror="this.src = '/chain-logos/blockchain-icon.png'"
+              class="w-xl h-xl"
+            />
           </div>
           <img
             :src="getImage('arrow-down.svg')"
@@ -72,7 +98,10 @@ watch(
     </header>
     <Teleport v-if="modalStore.show" to="#modal-container">
       <ReceiveTokens v-if="showModal === 'receive'" />
-      <ChainListModal v-if="showModal === 'chain-list'" />
+      <ChainListModal
+        v-if="showModal === 'chain-list'"
+        @close="closeChainListModal"
+      />
     </Teleport>
   </div>
 </template>
diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index 1b13182f..169404bf 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -222,7 +222,10 @@ async function handleLogout() {
   }
 }
 
+let indexi = 0
+
 async function setRpcConfigs() {
+  console.log('setRpcConfigs', ++indexi)
   const { chains } = await getEnabledChainList(appStore.id)
   enabledChainList.value = chains.map((chain) => ({
     chainId: chain.chain_id,
diff --git a/src/services/chainlist.service.ts b/src/services/chainlist.service.ts
index 2f0eecbe..7aef6d4a 100644
--- a/src/services/chainlist.service.ts
+++ b/src/services/chainlist.service.ts
@@ -3,10 +3,16 @@ import axios from 'axios'
 const gatewayUrl = process.env.VUE_APP_WALLET_GATEWAY
 
 const chainListAPI = '/api/v1/chains'
+const chainLogoApi = '/api/v1/chain/logo'
 
 async function getEnabledChainList(appId) {
   const url = new URL(`${chainListAPI}/${appId}/`, gatewayUrl)
   return (await axios.get(url.toString())).data
 }
 
-export { getEnabledChainList }
+function getChainLogoUrl(chainId) {
+  const url = new URL(`${chainLogoApi}/${chainId}/`, gatewayUrl)
+  return url.toString()
+}
+
+export { getEnabledChainList, getChainLogoUrl }

From 27857f68c4ea1089151d3d91e5d53d0adea5bc40 Mon Sep 17 00:00:00 2001
From: karthikdurai <iamkarthiksiddarth@gmail.com>
Date: Tue, 30 May 2023 15:37:21 +0530
Subject: [PATCH 084/153] remove console.log

---
 src/components/SendTransaction.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/SendTransaction.vue b/src/components/SendTransaction.vue
index 905646a2..8e442861 100644
--- a/src/components/SendTransaction.vue
+++ b/src/components/SendTransaction.vue
@@ -71,7 +71,6 @@ onMounted(async () => {
 })
 
 function handleSetGasPrice(value) {
-  console.log('handleSetGasPrice', { value })
   const requestId = props.request.request.id
   customGasPrice.value = value
   emits('gasPriceInput', {

From 378d6d4d25037405260a891f9e02c6f7b8144f38 Mon Sep 17 00:00:00 2001
From: karthikdurai <iamkarthiksiddarth@gmail.com>
Date: Tue, 30 May 2023 15:38:04 +0530
Subject: [PATCH 085/153] show chain name only when chain name is available

---
 src/components/SignMessageCompact.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/SignMessageCompact.vue b/src/components/SignMessageCompact.vue
index 2844d962..0452129b 100644
--- a/src/components/SignMessageCompact.vue
+++ b/src/components/SignMessageCompact.vue
@@ -32,9 +32,9 @@ function getPermissionText(method, request) {
   const { params } = request
   const { chainName } = params[0]
   if (method === 'wallet_addEthereumChain') {
-    return `Adding Chain - ${chainName}`
+    return chainName ? `Adding Chain - ${chainName}` : 'Adding Chain'
   } else if (method === 'wallet_switchEthereumChain') {
-    return `Switch Chain - ${chainName}`
+    return chainName ? `Switch Chain - ${chainName}` : 'Switch Chain'
   } else {
     return methodAndAction[method]
   }

From a0bdb4d53370fb2821990adef2f349473064841f Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 31 May 2023 11:30:36 +0530
Subject: [PATCH 086/153] Disallow user select on buttons and images

---
 public/chain-logos/blockchain-icon.png        | Bin 3670 -> 4576 bytes
 src/App.vue                                   |  20 ++++
 .../images/token-logos/fallback-token.png     | Bin 0 -> 4576 bytes
 src/components/AppFooter.vue                  |   2 +-
 src/components/AssetsView.vue                 |   8 +-
 src/components/GasPrice.vue                   |   6 +-
 src/components/NFTView.vue                    |   9 +-
 src/components/SwipeToAction.vue              |  35 ++++---
 src/components/UserWallet.vue                 |  14 ++-
 src/components/WalletHeader.vue               |  24 +++--
 src/index.css                                 |   2 +-
 src/pages/AddOrEditNFTScreen.vue              |  95 +++++++-----------
 src/pages/ManageNFTScreen.vue                 |  37 +++++--
 13 files changed, 148 insertions(+), 104 deletions(-)
 create mode 100644 src/assets/images/token-logos/fallback-token.png

diff --git a/public/chain-logos/blockchain-icon.png b/public/chain-logos/blockchain-icon.png
index 5d32403e500528737e59bbf9095aa43469c4da1a..4d3a99bf436f54702b5326c2f4e7c0df3f4f5733 100644
GIT binary patch
literal 4576
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
KMNUMnLSTYLucq+;

literal 3670
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

diff --git a/src/App.vue b/src/App.vue
index aebac985..4d35c19c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -186,4 +186,24 @@ body {
 .fade-leave-to {
   opacity: 0;
 }
+
+.Vue-Toastification__toast {
+  min-height: unset !important;
+  padding: 0.5rem 1rem !important;
+  font-family: Onest, sans-serif !important;
+}
+
+.Vue-Toastification__icon {
+  width: 12px !important;
+  margin-right: 8px !important;
+}
+
+.Vue-Toastification__toast-body {
+  font-size: 12px !important;
+  line-height: 1.5 !important;
+}
+
+.Vue-Toastification__progress-bar {
+  height: 2px !important;
+}
 </style>
diff --git a/src/assets/images/token-logos/fallback-token.png b/src/assets/images/token-logos/fallback-token.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d3a99bf436f54702b5326c2f4e7c0df3f4f5733
GIT binary patch
literal 4576
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
KMNUMnLSTYLucq+;

literal 0
HcmV?d00001

diff --git a/src/components/AppFooter.vue b/src/components/AppFooter.vue
index 51cbd606..bff7c3c0 100644
--- a/src/components/AppFooter.vue
+++ b/src/components/AppFooter.vue
@@ -27,7 +27,7 @@ function getIcon(icon: string, pathName: string) {
 
 <template>
   <footer
-    class="flex items-center px-12 py-2 bg-gray-900 border-gray-800 border-t-1 dark:bg-black-400 dark:border-0"
+    class="flex items-center px-12 py-2 bg-gray-900 border-gray-800 border-t-1 dark:bg-black-400 dark:border-0 select-none"
   >
     <nav v-if="userStore.isLoggedIn" class="flex flex-grow justify-between">
       <router-link
diff --git a/src/components/AssetsView.vue b/src/components/AssetsView.vue
index 73913dfd..c64c4f12 100644
--- a/src/components/AssetsView.vue
+++ b/src/components/AssetsView.vue
@@ -43,7 +43,7 @@ function fetchNativeAsset() {
     logo:
       rpcStore.selectedRpcConfig && rpcStore.selectedRpcConfig.favicon
         ? `${rpcStore.selectedRpcConfig.favicon}.png`
-        : 'arcana-fallback-token-logo.svg',
+        : 'fallback-token.png',
   }
 }
 
@@ -57,7 +57,7 @@ async function getAssetsBalance() {
       name: contract.name || contract.symbol,
       symbol: contract.symbol,
       balance: 0,
-      logo: contract.logo || 'arcana-fallback-token-logo.svg',
+      logo: contract.logo || 'fallback-token.png',
       decimals: contract.decimals,
     })
   })
@@ -127,7 +127,7 @@ rpcStore.$subscribe(getAssetsBalance)
           <div class="flex items-center gap-3">
             <img
               :src="getIconAsset(`token-logos/${asset.logo}`)"
-              class="w-[1.25rem] aspect-square rounded-full"
+              class="w-[1.25rem] aspect-square rounded-full select-none"
             />
             <span
               class="font-normal text-base overflow-hidden whitespace-nowrap text-ellipsis w-[12ch]"
@@ -152,7 +152,7 @@ rpcStore.$subscribe(getAssetsBalance)
         <span class="m-auto font-normal text-base">No tokens added</span>
       </div>
       <button
-        class="flex py-1 gap-2 items-center justify-center flex-grow btn-quaternery border-r-0 border-l-0 border-b-0"
+        class="flex py-1 gap-2 items-center justify-center flex-grow btn-quaternery border-r-0 border-l-0 border-b-0 border-t-1"
         @click.stop="handleAddToken"
       >
         <img :src="getImage('plus.svg')" class="h-lg w-lg" />
diff --git a/src/components/GasPrice.vue b/src/components/GasPrice.vue
index 7a77fe7d..a881d6ea 100644
--- a/src/components/GasPrice.vue
+++ b/src/components/GasPrice.vue
@@ -108,7 +108,7 @@ function handleCustomGasPriceInput(value) {
     </div>
     <div class="card flex p-1">
       <div
-        class="p-1 w-full text-center text-base font-normal cursor-pointer rounded-sm hover:bg-black-500 dark:hover:bg-black-300 focus-visible:bg-black-500 dark:focus-visible:bg-black-300"
+        class="p-1 w-full text-center text-base font-normal cursor-pointer rounded-sm hover:bg-black-500 dark:hover:bg-black-300 focus-visible:bg-black-500 dark:focus-visible:bg-black-300 select-none"
         :class="{
           'bg-black-500 dark:bg-black-300 text-white-100':
             selectedGasMethod === 'normal',
@@ -119,7 +119,7 @@ function handleCustomGasPriceInput(value) {
         Normal
       </div>
       <div
-        class="p-1 w-full text-center text-base font-normal cursor-pointer rounded-sm hover:bg-black-500 dark:hover:bg-black-300 focus-visible:bg-black-500 dark:focus-visible:bg-black-300"
+        class="p-1 w-full text-center text-base font-normal cursor-pointer rounded-sm hover:bg-black-500 dark:hover:bg-black-300 focus-visible:bg-black-500 dark:focus-visible:bg-black-300 select-none"
         :class="{
           'cursor-not-allowed opacity-60 pointer-events-none': !hasGasStation,
           'bg-black-500 dark:bg-black-300 text-white-100':
@@ -131,7 +131,7 @@ function handleCustomGasPriceInput(value) {
         Fast
       </div>
       <div
-        class="p-1 w-full text-center text-base font-normal cursor-pointer rounded-sm hover:bg-black-500 dark:hover:bg-black-300 focus-visible:bg-black-500 dark:focus-visible:bg-black-300"
+        class="p-1 w-full text-center text-base font-normal cursor-pointer rounded-sm hover:bg-black-500 dark:hover:bg-black-300 focus-visible:bg-black-500 dark:focus-visible:bg-black-300 select-none"
         :class="{
           'bg-black-500 dark:bg-black-300 text-white-100':
             selectedGasMethod === 'custom',
diff --git a/src/components/NFTView.vue b/src/components/NFTView.vue
index 5c861cca..cbafb5c6 100644
--- a/src/components/NFTView.vue
+++ b/src/components/NFTView.vue
@@ -73,9 +73,9 @@ watch(
     <div class="flex flex-col max-h-96">
       <div
         v-if="loader.show"
-        class="flex justify-center items-center flex-1 flex p-5"
+        class="flex justify-center items-center flex-1 flex p-3 m-1"
       >
-        <p class="m-auto font-semibold text-sm sm:text-xs px-4">
+        <p class="text-sm font-bold">
           {{ loader.message }}
         </p>
       </div>
@@ -112,9 +112,8 @@ watch(
             </div>
           </div>
         </div>
-        <div v-else class="flex justify-between p-5">
-          <span
-            class="color-secondary m-auto font-semibold text-sm sm:text-xs px-4"
+        <div v-else class="flex justify-between">
+          <span class="color-secondary m-auto font-bold text-sm"
             >No NFTs added</span
           >
         </div>
diff --git a/src/components/SwipeToAction.vue b/src/components/SwipeToAction.vue
index 64d87832..fc111e54 100644
--- a/src/components/SwipeToAction.vue
+++ b/src/components/SwipeToAction.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, type Ref } from 'vue'
 
 import { getImage } from '@/utils/getImage'
 
@@ -10,13 +10,17 @@ const props = defineProps<SwipeToActionProps>()
 const emit = defineEmits(['success'])
 const translateUntil = ref('calc(-80%)')
 const isDragging = ref(false)
-const swiperEl = ref(null)
+const swiperEl: Ref<HTMLDivElement | null> = ref(null)
 
 function handleDrag(e) {
   if (isDragging.value) {
-    const swiperX = swiperEl.value.getBoundingClientRect().x
-    const swiperContainer = swiperEl.value.parentElement.getBoundingClientRect()
-    if (e.clientX >= swiperContainer.right || swiperX >= swiperContainer.x) {
+    const swiperX = swiperEl.value?.getBoundingClientRect().x
+    const swiperContainer =
+      swiperEl.value?.parentElement?.getBoundingClientRect()
+    if (
+      (swiperContainer && e.clientX >= swiperContainer.right) ||
+      (swiperX && swiperContainer && swiperX >= swiperContainer.x)
+    ) {
       translateUntil.value = 'calc(0%)'
       emit('success')
       return
@@ -32,10 +36,10 @@ function handleDrag(e) {
 }
 
 function handleDragEnd() {
-  const swiperX = swiperEl.value.getBoundingClientRect().x
+  const swiperX = swiperEl.value?.getBoundingClientRect().x
   const swiperContainerX =
-    swiperEl.value.parentElement.getBoundingClientRect().x
-  if (swiperX < swiperContainerX - 60) {
+    swiperEl.value?.parentElement?.getBoundingClientRect().x
+  if (swiperX && swiperContainerX && swiperX < swiperContainerX - 60) {
     translateUntil.value = 'calc(-80%)'
   } else {
     translateUntil.value = 'calc(0%)'
@@ -45,7 +49,10 @@ function handleDragEnd() {
 }
 
 function handleDragStart(e) {
-  if (e.clientX <= swiperEl.value.getBoundingClientRect().right) {
+  if (
+    swiperEl.value &&
+    e.clientX <= swiperEl.value.getBoundingClientRect().right
+  ) {
     isDragging.value = true
   }
 }
@@ -63,7 +70,7 @@ function handleDragStart(e) {
       @touchmove="handleDrag"
     >
       <div
-        class="flex items-center justify-center text-xs font-normal text-gray-100 p-[10px]"
+        class="flex items-center justify-center text-xs font-normal text-gray-100 p-[10px] select-none"
       >
         {{ props.message || 'Swipe to Continue' }}
       </div>
@@ -72,18 +79,18 @@ function handleDragStart(e) {
         class="absolute btn-primary inset-0 z-10 cursor-pointer transition-all duration-300 ease-in-out flex justify-end"
         :style="{ transform: `translateX(${translateUntil})` }"
       >
-        <div class="flex items-center justify-center w-[20%]">
+        <div class="flex items-center justify-center w-[20%] select-none">
           <img
             :src="getImage('slider-right.svg')"
-            class="opacity-0 animate-1"
+            class="opacity-0 animate-1 select-none"
           />
           <img
             :src="getImage('slider-right.svg')"
-            class="opacity-0 animate-2"
+            class="opacity-0 animate-2 select-none"
           />
           <img
             :src="getImage('slider-right.svg')"
-            class="opacity-0 animate-3"
+            class="opacity-0 animate-3 select-none"
           />
         </div>
       </div>
diff --git a/src/components/UserWallet.vue b/src/components/UserWallet.vue
index 59019251..54ae9da6 100644
--- a/src/components/UserWallet.vue
+++ b/src/components/UserWallet.vue
@@ -183,6 +183,15 @@ watch(
     if (!show) showModal.value = false
   }
 )
+
+async function copyToClipboard(value: string) {
+  try {
+    await navigator.clipboard.writeText(value)
+    toast.success('Wallet address copied')
+  } catch (err) {
+    toast.error('Failed to copy wallet address')
+  }
+}
 </script>
 
 <template>
@@ -191,12 +200,15 @@ watch(
       <div class="flex justify-between items-center">
         <div class="flex gap-1">
           <img
-            src="@/assets/images/address-pic.svg"
+            src="@/assets/images/fallback-logo-dark-mode.png"
             class="w-xl h-xl rounded-full"
           />
           <span class="font-bold text-lg">{{
             userStore.walletAddressShrinked
           }}</span>
+          <button @click.stop="copyToClipboard(userStore.walletAddress)">
+            <img :src="getImage('copy.svg')" class="w-xl h-xl" />
+          </button>
         </div>
         <button class="w-xl h-xl rounded-full" @click.stop="handleRefresh()">
           <img :src="getImage('refresh.svg')" />
diff --git a/src/components/WalletHeader.vue b/src/components/WalletHeader.vue
index 4798f6cf..f64ef87d 100644
--- a/src/components/WalletHeader.vue
+++ b/src/components/WalletHeader.vue
@@ -51,7 +51,7 @@ watch(
     hasChainUpdated.value = false
     setTimeout(() => {
       hasChainUpdated.value = true
-    }, 100)
+    }, 25)
   }
 )
 </script>
@@ -59,19 +59,21 @@ watch(
 <template>
   <div>
     <header class="flex justify-between px-4 py-2">
-      <div class="flex flex-col">
-        <div class="flex items-center gap-2">
-          <img
-            :src="appStore.appLogo?.horizontal"
-            alt="App Logo"
-            class="w-xl h-xl"
-          />
+      <div class="flex gap-2">
+        <img
+          :src="appStore.appLogo?.horizontal"
+          alt="App Logo"
+          class="w-xl h-xl"
+          onerror="this.style.display='none'"
+        />
+        <div class="flex flex-col">
           <span class="font-bold text-lg max-w-20 overflow-hidde">{{
             appStore.name
           }}</span>
-        </div>
-        <div class="flex justify-start">
-          <img :src="getImage('secured-by-arcana.svg')" class="h-3 ml-8" />
+          <img
+            :src="getImage('secured-by-arcana.svg')"
+            class="h-3 select-none"
+          />
         </div>
       </div>
       <div class="flex items-center gap-3">
diff --git a/src/index.css b/src/index.css
index aa684e59..f0568784 100644
--- a/src/index.css
+++ b/src/index.css
@@ -42,7 +42,7 @@
     @apply outline-none
           cursor-pointer disabled:cursor-not-allowed
           transition-all duration-200 ease-in-out
-          disabled:opacity-60;
+          disabled:opacity-60 select-none;
   }
 
   input,
diff --git a/src/pages/AddOrEditNFTScreen.vue b/src/pages/AddOrEditNFTScreen.vue
index bf64fa1c..b3c18a37 100644
--- a/src/pages/AddOrEditNFTScreen.vue
+++ b/src/pages/AddOrEditNFTScreen.vue
@@ -228,18 +228,20 @@ watch(
     >
       <AppLoader :message="loader.message" />
     </div>
-    <div class="p-4 sm:p-2 h-full flex flex-col overflow-auto">
-      <div v-if="canDelete" class="flex justify-between items-start">
-        <h2 class="font-semibold mb-5 add-token__title">Edit NFT</h2>
-        <img
-          :src="getImage('trash-icon')"
-          class="cursor-pointer"
-          @click.stop="handleDeleteNft"
-        />
+    <div class="h-full flex flex-col gap-5">
+      <div class="flex items-center justify-center">
+        <div v-if="canDelete" class="flex justify-between items-start">
+          <span class="text-xl font-bold">Edit NFT</span>
+          <img
+            :src="getImage('trash-icon')"
+            class="cursor-pointer"
+            @click.stop="handleDeleteNft"
+          />
+        </div>
+        <span v-else class="text-xl font-bold">Add NFT</span>
       </div>
-      <h2 v-else class="font-semibold mb-5 add-token__title">Add NFT</h2>
       <form class="flex flex-col flex-grow" @submit.prevent="handleSubmit">
-        <div v-if="rpcStore.isEthereumMainnet && !canEdit">
+        <!-- <div v-if="rpcStore.isEthereumMainnet && !canEdit">
           <div class="flex flex-col gap-1">
             <label for="search-token" class="text-sm font-semibold label"
               >Search Token</label
@@ -250,12 +252,10 @@ watch(
             />
           </div>
           <div class="text-center my-6">Add Custom NFT</div>
-        </div>
+        </div> -->
         <div class="flex flex-col gap-5 flex-grow">
           <div class="flex flex-col gap-1">
-            <label
-              for="token-contract-address"
-              class="text-sm font-semibold label"
+            <label for="token-contract-address" class="text-sm font-medium"
               >Collection Contract Address</label
             >
             <input
@@ -264,78 +264,59 @@ watch(
               v-model.trim="nftContract.address"
               type="text"
               placeholder="Paste the hexadecimal address"
-              class="text-base p-4 input text-ellipsis overflow-hidden whitespace-nowrap cursor-not-allowed"
+              class="input-field focus:input-active cursor-not-allowed"
               required
               disabled
               autocomplete="off"
             />
-            <div
+            <input
               v-else
-              class="p-4 input flex"
-              :class="{
-                'outline-black dark:outline-white outline-1 outline':
-                  showAddressOutline,
-              }"
-            >
-              <input
-                id="token-contract-address"
-                v-model.trim="nftContract.address"
-                type="text"
-                placeholder="Paste the hexadecimal address"
-                class="text-base bg-transparent outline-none text-ellipsis overflow-hidden whitespace-nowrap flex-grow"
-                required
-                autocomplete="off"
-                @focus="showAddressOutline = true"
-                @blur="showAddressOutline = false"
-              />
-            </div>
+              id="token-contract-address"
+              v-model.trim="nftContract.address"
+              type="text"
+              placeholder="Paste the hexadecimal address"
+              class="input-field focus:input-active"
+              required
+              autocomplete="off"
+              @focus="showAddressOutline = true"
+              @blur="showAddressOutline = false"
+            />
           </div>
           <div class="flex flex-col gap-1">
-            <label for="token-symbol" class="text-sm font-semibold label"
+            <label for="collection-name" class="text-sm font-medium"
               >Collection Name</label
             >
             <input
-              id="token-symbol"
+              id="collection-name"
               v-model="nftContract.name"
               type="text"
               placeholder="Provide the name"
-              class="text-base p-4 input cursor-not-allowed"
+              class="input-field focus:input-active cursor-not-allowed"
               required
               autocomplete="off"
               disabled
             />
           </div>
           <div class="flex flex-col gap-1">
-            <label for="token-decimal" class="text-sm font-semibold label"
-              >Token ID</label
-            >
+            <label for="token-id" class="text-sm font-medium">Token ID</label>
             <input
-              id="token-decimal"
+              id="token-id"
               v-model="nftContract.tokenId"
               type="text"
               placeholder="Provide an ID"
-              class="text-base p-4 input"
+              class="input-field focus:input-active"
               min="0"
               step="1"
               required
               autocomplete="off"
             />
           </div>
-          <div class="flex space-x-3 mt-auto">
-            <button
-              type="reset"
-              class="text-sm sm:text-xs rounded-xl text-black border-black border-2 dark:text-white dark:border-white flex-1 font-semibold uppercase"
-              @click.stop="() => router.back()"
-            >
-              Cancel
-            </button>
-            <button
-              type="submit"
-              class="text-sm sm:text-xs rounded-xl text-white dark:bg-white bg-black dark:text-black flex-1 font-semibold uppercase"
-            >
-              Save
-            </button>
-          </div>
+          <button
+            type="submit"
+            class="btn-primary mt-8 text-base font-bold py-2 uppercase"
+          >
+            Save
+          </button>
         </div>
       </form>
     </div>
diff --git a/src/pages/ManageNFTScreen.vue b/src/pages/ManageNFTScreen.vue
index c87f8552..3cd57064 100644
--- a/src/pages/ManageNFTScreen.vue
+++ b/src/pages/ManageNFTScreen.vue
@@ -1,10 +1,12 @@
 <script setup lang="ts">
-import { onBeforeMount, reactive, ref, type Ref } from 'vue'
+import { onBeforeMount, reactive, ref, watch, type Ref } from 'vue'
 import { useRouter } from 'vue-router'
 
 import AppLoader from '@/components/AppLoader.vue'
 import { NFT } from '@/models/NFT'
+import AddOrEditNFTScreen from '@/pages/AddOrEditNFTScreen.vue'
 import { NFTDB } from '@/services/nft.service'
+import { useModalStore } from '@/store/modal'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
 import { getImage } from '@/utils/getImage'
@@ -13,6 +15,8 @@ import { getStorage } from '@/utils/storageWrapper'
 const router = useRouter()
 const userStore = useUserStore()
 const rpcStore = useRpcStore()
+const modalStore = useModalStore()
+const showModal = ref(false)
 
 const loader = reactive({
   show: false,
@@ -28,12 +32,9 @@ onBeforeMount(async () => {
   nfts.value = nftDB.getNFTs(Number(rpcStore.selectedChainId))
 })
 
-function handleClose() {
-  router.back()
-}
-
 function handleAddToken() {
-  router.push({ name: 'AddNft' })
+  modalStore.setShowModal(true)
+  showModal.value = true
 }
 
 function handleEditToken(nft: NFT) {
@@ -48,6 +49,20 @@ function handleEditToken(nft: NFT) {
     })
   }
 }
+
+watch(
+  () => modalStore.show,
+  () => {
+    if (!modalStore.show) showModal.value = false
+  }
+)
+
+watch(
+  () => rpcStore.selectedChainId,
+  () => {
+    nfts.value = nftDB.getNFTs(Number(rpcStore.selectedChainId))
+  }
+)
 </script>
 
 <template>
@@ -57,7 +72,12 @@ function handleEditToken(nft: NFT) {
   <div v-else class="flex-grow mb-5">
     <div class="flex flex-1 flex-col min-h-full">
       <div class="flex flex-col items-center min-h-full flex-grow gap-5">
-        <h1 class="w-full text-center text-lg font-bold">Manage NFTs</h1>
+        <div class="relative flex justify-center items-center w-full">
+          <button class="absolute left-0" @click.stop="router.go(-1)">
+            <img :src="getImage('back-arrow.svg')" class="w-6 h-6" />
+          </button>
+          <span class="text-lg font-bold">Manage NFTs</span>
+        </div>
         <div
           class="card flex flex-col w-full h-full max-h-max text-left flex-grow overflow-hidden"
         >
@@ -103,6 +123,9 @@ function handleEditToken(nft: NFT) {
         </div>
       </div>
     </div>
+    <Teleport v-if="modalStore.show" to="#modal-container">
+      <AddOrEditNFTScreen v-if="showModal" />
+    </Teleport>
   </div>
 </template>
 

From 2491a4a40311dda30bf937daed80c6a7be043cc7 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 31 May 2023 11:31:54 +0530
Subject: [PATCH 087/153] Fix ts errors

---
 src/components/AssetsView.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/AssetsView.vue b/src/components/AssetsView.vue
index c64c4f12..5332427b 100644
--- a/src/components/AssetsView.vue
+++ b/src/components/AssetsView.vue
@@ -34,12 +34,12 @@ function fetchStoredAssetContracts(): AssetContract[] {
 function fetchNativeAsset() {
   return {
     address: 'native',
-    name: rpcStore.nativeCurrency.name,
+    name: rpcStore.nativeCurrency?.name,
     balance: !rpcStore.walletBalance
       ? 0
       : Number(ethers.utils.formatEther(rpcStore.walletBalance)),
-    decimals: rpcStore.nativeCurrency.decimals,
-    symbol: rpcStore.nativeCurrency.symbol,
+    decimals: rpcStore.nativeCurrency?.decimals as number,
+    symbol: rpcStore.nativeCurrency?.symbol as string,
     logo:
       rpcStore.selectedRpcConfig && rpcStore.selectedRpcConfig.favicon
         ? `${rpcStore.selectedRpcConfig.favicon}.png`

From 547d335412ea2297e6bfba6b0c3bc002858132c7 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 31 May 2023 15:29:04 +0530
Subject: [PATCH 088/153] Add assets view

---
 src/assets/images/dark/search.svg  |  3 ++
 src/assets/images/light/search.svg |  3 ++
 src/components/AssetsView.vue      | 22 +++++++-
 src/components/NFTView.vue         |  2 +-
 src/components/SearchToken.vue     | 21 ++++----
 src/pages/AddOrEditNFTScreen.vue   | 36 +++----------
 src/pages/AddTokenScreen.vue       | 83 ++++++++++++++----------------
 src/pages/ManageNFTScreen.vue      | 54 +++++++++++++------
 src/pages/SendTokens.vue           |  2 +-
 src/pages/homeScreen.vue           |  5 ++
 10 files changed, 129 insertions(+), 102 deletions(-)
 create mode 100644 src/assets/images/dark/search.svg
 create mode 100644 src/assets/images/light/search.svg

diff --git a/src/assets/images/dark/search.svg b/src/assets/images/dark/search.svg
new file mode 100644
index 00000000..502abe4c
--- /dev/null
+++ b/src/assets/images/dark/search.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 14L10.0001 10M11.3333 6.66667C11.3333 9.244 9.244 11.3333 6.66667 11.3333C4.08934 11.3333 2 9.244 2 6.66667C2 4.08934 4.08934 2 6.66667 2C9.244 2 11.3333 4.08934 11.3333 6.66667Z" stroke="white" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/search.svg b/src/assets/images/light/search.svg
new file mode 100644
index 00000000..b884abcc
--- /dev/null
+++ b/src/assets/images/light/search.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 14L10.0001 10M11.3333 6.66667C11.3333 9.244 9.244 11.3333 6.66667 11.3333C4.08934 11.3333 2 9.244 2 6.66667C2 4.08934 4.08934 2 6.66667 2C9.244 2 11.3333 4.08934 11.3333 6.66667Z" stroke="#333333" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/AssetsView.vue b/src/components/AssetsView.vue
index 5332427b..0aebcd43 100644
--- a/src/components/AssetsView.vue
+++ b/src/components/AssetsView.vue
@@ -1,9 +1,11 @@
 <script setup lang="ts">
 import { ethers } from 'ethers'
-import { onMounted, reactive, onBeforeUnmount } from 'vue'
+import { onMounted, reactive, onBeforeUnmount, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 
 import type { Asset, AssetContract } from '@/models/Asset'
+import AddTokenScreen from '@/pages/AddTokenScreen.vue'
+import { useModalStore } from '@/store/modal'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
 import { getTokenBalance } from '@/utils/contractUtil'
@@ -16,6 +18,8 @@ const userStore = useUserStore()
 const rpcStore = useRpcStore()
 const router = useRouter()
 const assets: Asset[] = reactive([])
+const modalStore = useModalStore()
+const showModal = ref(false)
 let assetsPolling
 
 function fetchStoredAssetContracts(): AssetContract[] {
@@ -90,7 +94,8 @@ function updateAssetsBalance() {
 }
 
 function handleAddToken() {
-  router.push({ name: 'AddToken' })
+  modalStore.setShowModal(true)
+  showModal.value = true
 }
 
 function isNative(asset: Asset) {
@@ -109,6 +114,16 @@ onBeforeUnmount(() => {
 })
 
 rpcStore.$subscribe(getAssetsBalance)
+
+watch(
+  () => modalStore.show,
+  () => {
+    if (!modalStore.show) {
+      showModal.value = false
+      getAssetsBalance()
+    }
+  }
+)
 </script>
 
 <template>
@@ -159,5 +174,8 @@ rpcStore.$subscribe(getAssetsBalance)
         <span class="text-sm font-normal">New</span>
       </button>
     </div>
+    <Teleport v-if="modalStore.show" to="#modal-container">
+      <AddTokenScreen v-if="showModal" />
+    </Teleport>
   </div>
 </template>
diff --git a/src/components/NFTView.vue b/src/components/NFTView.vue
index cbafb5c6..1db9249d 100644
--- a/src/components/NFTView.vue
+++ b/src/components/NFTView.vue
@@ -124,7 +124,7 @@ watch(
           @click.stop="handleManageNFT"
         >
           <img :src="getImage('settings.svg')" />
-          <span class="assets-view__add-token-text leading-[1]">Manage</span>
+          <span class="text-sm">Manage</span>
         </button>
       </div>
     </div>
diff --git a/src/components/SearchToken.vue b/src/components/SearchToken.vue
index 70e33e2c..d60747b9 100644
--- a/src/components/SearchToken.vue
+++ b/src/components/SearchToken.vue
@@ -10,6 +10,7 @@ import {
 import { ref, computed } from 'vue'
 
 import type { EthAssetContract } from '@/models/Asset'
+import { getImage } from '@/utils/getImage'
 
 type SearchAssetProps = {
   tokens: EthAssetContract[]
@@ -59,26 +60,26 @@ function displayValue() {
 
 <template>
   <Combobox v-slot="{ open }" v-model="selectedToken" nullable>
-    <div class="relative">
+    <div class="relative z-10">
       <div
-        class="relative w-full cursor-default overflow-hidden flex flex-nowrap rounded-[10px] input p-4 outline-none"
+        class="relative w-full cursor-default overflow-hidden flex flex-nowrap input-field focus:input-active px-2"
         :class="{
           'outline-black dark:outline-white outline-1 outline': isFocused,
         }"
       >
-        <img src="@/assets/images/search-icon.svg" />
+        <img :src="getImage('search.svg')" class="w-sm h-sm select-none" />
         <ComboboxInput
-          class="flex-1 border-none px-3 text-base leading-5 bg-transparent text-left justify-between text-black dark:text-white truncate outline-none"
+          class="flex-1 border-none px-2 text-base bg-transparent text-left justify-between truncate"
           placeholder="Enter Token Name or Symbol"
           :display-value="displayValue()"
           @change="query = $event.target.value"
           @focus="isFocused = true"
           @blur="isFocused = false"
         />
-        <ComboboxButton class="h-auto align-middle">
+        <ComboboxButton class="h-auto align-middle select-none">
           <img
-            src="@/assets/images/arrow-gray.svg"
-            class="transition-all will-change-transform delay-300"
+            :src="getImage('arrow-down.svg')"
+            class="w-xl h-xl transition-all will-change-transform duration-200"
             :class="{ '-rotate-180': open }"
           />
         </ComboboxButton>
@@ -90,7 +91,7 @@ function displayValue() {
       >
         <div v-show="open">
           <ComboboxOptions
-            class="absolute max-h-60 w-full debossed-card text-base focus:outline-black dark:focus:outline-white overflow-auto rounded-t-none rounded-r-none mt-1 pt-2"
+            class="absolute max-h-60 w-full card bg-gray-200 text-sm overflow-y-auto rounded-t-none mt-1 pt-2 px-1"
             static
           >
             <ComboboxOption
@@ -101,9 +102,9 @@ function displayValue() {
               :value="token.symbol"
             >
               <li
-                class="relative cursor-pointer select-none p-4 rounded-[10px] flex justify-between hover:bg-zinc-200 dark:hover:bg-zinc-800 text-black dark:text-white"
+                class="relative cursor-pointer select-none p-4 rounded-[10px] flex justify-between hover:bg-white-300 dark:hover:bg-black-300 text-black dark:text-white"
                 :class="{
-                  'bg-zinc-200 dark:bg-zinc-800': active,
+                  'bg-white-100 dark:bg-black-100': active,
                 }"
               >
                 <span
diff --git a/src/pages/AddOrEditNFTScreen.vue b/src/pages/AddOrEditNFTScreen.vue
index b3c18a37..fa4ebbf6 100644
--- a/src/pages/AddOrEditNFTScreen.vue
+++ b/src/pages/AddOrEditNFTScreen.vue
@@ -1,15 +1,15 @@
 <script setup lang="ts">
 import { onBeforeMount, reactive, ref, watch } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import { useToast } from 'vue-toastification'
 
 import AppLoader from '@/components/AppLoader.vue'
-import SearchToken from '@/components/SearchToken.vue'
 import contractMap from '@/contract-map.json'
 import type { EthAssetContract } from '@/models/Asset'
 import { NFT } from '@/models/NFT'
 import { getNFTDetails, modifyIpfsUrl } from '@/services/getNFTDetails.service'
 import { NFTDB } from '@/services/nft.service'
+import { useModalStore } from '@/store/modal'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
 import {
@@ -19,20 +19,19 @@ import {
   checkOwnership,
 } from '@/utils/nftUtils'
 import { getStorage } from '@/utils/storageWrapper'
-import { useImage } from '@/utils/useImage'
 
-const route = useRoute()
 const router = useRouter()
 const toast = useToast()
-const getImage = useImage()
 const storage = getStorage()
 const rpcStore = useRpcStore()
 const userStore = useUserStore()
+const modalStore = useModalStore()
 
 type EditNFTProps = {
   collectionName?: string
   address?: string
   tokenId?: string
+  edit?: boolean
 }
 
 const props = defineProps<EditNFTProps>()
@@ -43,8 +42,6 @@ onBeforeMount(async () => {
   nftDB = await NFTDB.create(storage.local, userStore.walletAddress)
 })
 
-const canEdit = false
-const canDelete = route.name === 'EditNft'
 const showAddressOutline = ref(false)
 
 const ethMainnetNftContracts: EthAssetContract[] = Object.keys(contractMap)
@@ -175,10 +172,10 @@ async function handleSubmit() {
       nftDB.addNFT(nftDetails, Number(rpcStore.selectedChainId))
       toast.success('NFT added')
 
-      router.back()
+      modalStore.setShowModal(false)
     } catch (e) {
       console.error(e)
-      toast.error(e)
+      toast.error(e as string)
     }
   } else {
     toast.error('Invalid token ID')
@@ -230,36 +227,19 @@ watch(
     </div>
     <div class="h-full flex flex-col gap-5">
       <div class="flex items-center justify-center">
-        <div v-if="canDelete" class="flex justify-between items-start">
+        <div v-if="props.edit" class="flex justify-between items-start">
           <span class="text-xl font-bold">Edit NFT</span>
-          <img
-            :src="getImage('trash-icon')"
-            class="cursor-pointer"
-            @click.stop="handleDeleteNft"
-          />
         </div>
         <span v-else class="text-xl font-bold">Add NFT</span>
       </div>
       <form class="flex flex-col flex-grow" @submit.prevent="handleSubmit">
-        <!-- <div v-if="rpcStore.isEthereumMainnet && !canEdit">
-          <div class="flex flex-col gap-1">
-            <label for="search-token" class="text-sm font-semibold label"
-              >Search Token</label
-            >
-            <SearchToken
-              :tokens="ethMainnetNftContracts"
-              @change="handleSearchToken"
-            />
-          </div>
-          <div class="text-center my-6">Add Custom NFT</div>
-        </div> -->
         <div class="flex flex-col gap-5 flex-grow">
           <div class="flex flex-col gap-1">
             <label for="token-contract-address" class="text-sm font-medium"
               >Collection Contract Address</label
             >
             <input
-              v-if="canEdit"
+              v-if="props.edit"
               id="token-contract-address"
               v-model.trim="nftContract.address"
               type="text"
diff --git a/src/pages/AddTokenScreen.vue b/src/pages/AddTokenScreen.vue
index 9d416b08..973465a7 100644
--- a/src/pages/AddTokenScreen.vue
+++ b/src/pages/AddTokenScreen.vue
@@ -1,25 +1,24 @@
 <script setup lang="ts">
-import { reactive, watch } from 'vue'
-import { useRouter } from 'vue-router'
+import { reactive, watch, ref } from 'vue'
 import { useToast } from 'vue-toastification'
 
 import AppLoader from '@/components/AppLoader.vue'
 import SearchToken from '@/components/SearchToken.vue'
 import contractMap from '@/contract-map.json'
 import type { AssetContract, EthAssetContract } from '@/models/Asset'
-import { useAppStore } from '@/store/app'
+import { useModalStore } from '@/store/modal'
 import { useRpcStore } from '@/store/rpc'
 import { useUserStore } from '@/store/user'
 import { getTokenSymbolAndDecimals } from '@/utils/contractUtil'
+import { getImage } from '@/utils/getImage'
 import { getStorage } from '@/utils/storageWrapper'
 
-const router = useRouter()
-const app = useAppStore()
 const storage = getStorage()
 const isDisabled = reactive({
   symbol: false,
   decimals: false,
 })
+const modalStore = useModalStore()
 const ethMainnetTokens: EthAssetContract[] = Object.keys(contractMap)
   .map((address) => ({
     ...contractMap[address],
@@ -33,6 +32,7 @@ const loader = reactive({
   show: false,
   message: 'Saving token...',
 })
+const expandSection = ref(false)
 
 const tokenContract: AssetContract = reactive({
   address: '',
@@ -50,10 +50,6 @@ function handleSearchToken(selectedTokenContract: EthAssetContract) {
   }
 }
 
-function handleCancel() {
-  router.back()
-}
-
 async function addTokenContract() {
   loader.show = true
   const isValidContract = await validateAndPopulateContract()
@@ -84,7 +80,7 @@ async function addTokenContract() {
     )
     loader.show = false
     toast.success('Token Added successfully')
-    router.push({ name: 'home', params: { appId: app.id } })
+    modalStore.setShowModal(false)
   } else {
     loader.show = false
     toast.error('Invalid contract address')
@@ -168,19 +164,19 @@ watch(
 </script>
 
 <template>
-  <div class="wallet__card rounded-[10px] flex flex-1 flex-col">
+  <div class="flex flex-1 flex-col">
     <div
       v-if="loader.show"
       class="fixed inset-0 flex justify-center items-center z-50 opacity-90 backdrop-blur bg-white dark:bg-black"
     >
       <AppLoader :message="loader.message" />
     </div>
-    <div class="p-4 sm:p-2 h-full flex flex-col overflow-auto">
-      <h2 class="font-semibold mb-5 add-token__title">Add a Token</h2>
+    <div class="flex flex-col gap-4">
+      <h2 class="text-xl font-bold text-center">Add a Token</h2>
       <form class="flex flex-col" @submit.prevent="addTokenContract">
         <div v-if="rpcStore.isEthereumMainnet">
           <div class="flex flex-col gap-1">
-            <label for="search-token" class="text-sm font-semibold label"
+            <label for="search-token" class="text-sm font-medium"
               >Search Token</label
             >
             <SearchToken
@@ -188,13 +184,27 @@ watch(
               @change="handleSearchToken"
             />
           </div>
-          <div class="text-center my-6">Add Custom Token</div>
+          <div class="flex justify-center items-center my-4">
+            <button
+              class="flex justify-center items-center"
+              type="button"
+              @click.stop="expandSection = !expandSection"
+            >
+              <span class="text-sm font-normal">Add Custom Token</span>
+              <img
+                :src="getImage('arrow-down.svg')"
+                class="w-xl h-xl transition-all will-change-transform duration-200"
+                :class="{ '-rotate-180': expandSection }"
+              />
+            </button>
+          </div>
         </div>
-        <div class="flex flex-col gap-5">
+        <div
+          v-if="expandSection || !rpcStore.isEthereumMainnet"
+          class="flex flex-col gap-4"
+        >
           <div class="flex flex-col gap-1">
-            <label
-              for="token-contract-address"
-              class="text-sm font-semibold label"
+            <label for="token-contract-address" class="text-sm font-medium"
               >Token Contract Address</label
             >
             <input
@@ -202,13 +212,13 @@ watch(
               v-model.trim="tokenContract.address"
               type="text"
               placeholder="Eg. 0x000000000000"
-              class="text-base p-4 input text-ellipsis overflow-hidden whitespace-nowrap"
+              class="input-field focus:input-active"
               required
               autocomplete="off"
             />
           </div>
           <div class="flex flex-col gap-1">
-            <label for="token-symbol" class="text-sm font-semibold label"
+            <label for="token-symbol" class="text-sm font-medium"
               >Token Symbol</label
             >
             <input
@@ -216,7 +226,7 @@ watch(
               v-model="tokenContract.symbol"
               type="text"
               placeholder="Eg. XAR"
-              class="text-base p-4 input"
+              class="input-field focus:input-active"
               :class="{ 'cursor-not-allowed': isDisabled.symbol }"
               required
               autocomplete="off"
@@ -224,7 +234,7 @@ watch(
             />
           </div>
           <div class="flex flex-col gap-1">
-            <label for="token-decimal" class="text-sm font-semibold label"
+            <label for="token-decimal" class="text-sm font-medium"
               >Token Decimal</label
             >
             <input
@@ -232,7 +242,7 @@ watch(
               v-model="tokenContract.decimals"
               type="number"
               placeholder="0"
-              class="text-base p-4 input"
+              class="input-field focus:input-active"
               :class="{ 'cursor-not-allowed': isDisabled.symbol }"
               min="0"
               step="1"
@@ -241,21 +251,12 @@ watch(
               :disabled="isDisabled.decimals"
             />
           </div>
-          <div class="flex space-x-3">
-            <button
-              type="reset"
-              class="text-sm sm:text-xs rounded-xl text-black border-black border-2 dark:text-white dark:border-white flex-1 font-semibold uppercase"
-              @click.stop="handleCancel"
-            >
-              Cancel
-            </button>
-            <button
-              type="submit"
-              class="text-sm sm:text-xs rounded-xl text-white dark:bg-white bg-black dark:text-black flex-1 font-semibold uppercase"
-            >
-              Save
-            </button>
-          </div>
+          <button
+            type="submit"
+            class="btn-primary uppercase font-bold text-base p-2 mt-5"
+          >
+            Save
+          </button>
         </div>
       </form>
     </div>
@@ -263,10 +264,6 @@ watch(
 </template>
 
 <style scoped>
-.add-token__title {
-  font-size: var(--fs-500);
-}
-
 #search-token::-webkit-calendar-picker-indicator,
 #search-token::-webkit-list-button {
   display: none !important;
diff --git a/src/pages/ManageNFTScreen.vue b/src/pages/ManageNFTScreen.vue
index 3cd57064..6917dede 100644
--- a/src/pages/ManageNFTScreen.vue
+++ b/src/pages/ManageNFTScreen.vue
@@ -17,6 +17,12 @@ const userStore = useUserStore()
 const rpcStore = useRpcStore()
 const modalStore = useModalStore()
 const showModal = ref(false)
+const modalToShow: Ref<'add' | 'edit'> = ref('add')
+const editModalParams = ref({
+  address: '',
+  collectionName: '',
+  tokenId: '',
+})
 
 const loader = reactive({
   show: false,
@@ -35,19 +41,25 @@ onBeforeMount(async () => {
 function handleAddToken() {
   modalStore.setShowModal(true)
   showModal.value = true
+  modalToShow.value = 'add'
+  editModalParams.value = {
+    address: '',
+    collectionName: '',
+    tokenId: '',
+  }
 }
 
 function handleEditToken(nft: NFT) {
-  if (!nft.autodetected) {
-    router.push({
-      name: 'EditNft',
-      params: {
-        address: nft.address,
-        collectionName: nft.collectionName,
-        tokenId: nft.tokenId,
-      },
-    })
+  // if (!nft.autodetected) {
+  modalStore.setShowModal(true)
+  showModal.value = true
+  modalToShow.value = 'edit'
+  editModalParams.value = {
+    address: nft.address,
+    collectionName: nft.collectionName,
+    tokenId: nft.tokenId,
   }
+  // }
 }
 
 watch(
@@ -63,6 +75,12 @@ watch(
     nfts.value = nftDB.getNFTs(Number(rpcStore.selectedChainId))
   }
 )
+
+function truncateNFTTokenId(tokenId: string) {
+  return tokenId.length > 24
+    ? `${tokenId.slice(0, 6)}...${tokenId.slice(-6)}`
+    : tokenId
+}
 </script>
 
 <template>
@@ -95,14 +113,10 @@ watch(
               }"
               @click.stop="handleEditToken(nft)"
             >
-              <span class="overflow-hidden whitespace-nowrap text-ellipsis">
-                {{ nft.collectionName }} ({{ nft.tokenId }})
+              <span class="overflow-hidden whitespace-nowrap">
+                {{ nft.collectionName }} ({{ truncateNFTTokenId(nft.tokenId) }})
               </span>
-              <img
-                v-if="!nft.autodetected"
-                :src="getImage('edit.svg')"
-                class="opacity-0"
-              />
+              <img :src="getImage('edit.svg')" class="opacity-0" />
             </div>
           </div>
           <div v-else class="flex flex-col flex-grow">
@@ -124,7 +138,13 @@ watch(
       </div>
     </div>
     <Teleport v-if="modalStore.show" to="#modal-container">
-      <AddOrEditNFTScreen v-if="showModal" />
+      <AddOrEditNFTScreen
+        v-if="showModal"
+        :edit="modalToShow === 'edit'"
+        :collection-name="editModalParams.collectionName"
+        :address="editModalParams.address"
+        :token-id="editModalParams.tokenId"
+      />
     </Teleport>
   </div>
 </template>
diff --git a/src/pages/SendTokens.vue b/src/pages/SendTokens.vue
index 85ed9019..28976270 100644
--- a/src/pages/SendTokens.vue
+++ b/src/pages/SendTokens.vue
@@ -166,7 +166,7 @@ async function handleSendToken() {
       const payload = {
         to: setHexPrefix(recipientWalletAddress.value),
         value: ethers.utils.parseEther(`${amount.value}`).toHexString(),
-        gasPrice: gasFees,
+        // gasPrice: gasFees,
         from: userStore.walletAddress,
       }
 
diff --git a/src/pages/homeScreen.vue b/src/pages/homeScreen.vue
index fca81f1d..1399f27e 100644
--- a/src/pages/homeScreen.vue
+++ b/src/pages/homeScreen.vue
@@ -42,9 +42,14 @@ onMounted(() => {
 
 onBeforeUnmount(rpcStore.cleanUpBalancePolling)
 
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
+
 async function handleChainChange() {
   showLoader('Fetching Wallet Balance...')
   try {
+    await sleep(100)
     await rpcStore.getWalletBalance()
   } catch (err) {
     console.log({ err })

From a17fe7c2ff7d6f3c0ab1e7b393146777f221116e Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 31 May 2023 16:30:40 +0530
Subject: [PATCH 089/153] Handle send tokens

---
 src/components/AssetsView.vue        | 21 +++++----
 src/components/GasPrice.vue          | 64 ++++++++--------------------
 src/components/SendTokensPreview.vue |  9 +---
 src/pages/SendNft.vue                | 15 ++++---
 src/pages/SendTokens.vue             | 13 ++++--
 src/pages/homeScreen.vue             |  5 +--
 src/utils/sleep.ts                   |  3 ++
 7 files changed, 53 insertions(+), 77 deletions(-)
 create mode 100644 src/utils/sleep.ts

diff --git a/src/components/AssetsView.vue b/src/components/AssetsView.vue
index 0aebcd43..eeba7a5c 100644
--- a/src/components/AssetsView.vue
+++ b/src/components/AssetsView.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { ethers } from 'ethers'
 import { onMounted, reactive, onBeforeUnmount, ref, watch } from 'vue'
-import { useRouter } from 'vue-router'
 
 import type { Asset, AssetContract } from '@/models/Asset'
 import AddTokenScreen from '@/pages/AddTokenScreen.vue'
@@ -11,12 +10,12 @@ import { useUserStore } from '@/store/user'
 import { getTokenBalance } from '@/utils/contractUtil'
 import { formatTokenDecimals, beautifyBalance } from '@/utils/formatTokens'
 import { getImage } from '@/utils/getImage'
+import { sleep } from '@/utils/sleep'
 import { getStorage } from '@/utils/storageWrapper'
 import { getIconAsset } from '@/utils/useImage'
 
 const userStore = useUserStore()
 const rpcStore = useRpcStore()
-const router = useRouter()
 const assets: Asset[] = reactive([])
 const modalStore = useModalStore()
 const showModal = ref(false)
@@ -25,9 +24,10 @@ let assetsPolling
 function fetchStoredAssetContracts(): AssetContract[] {
   const assetContracts = getStorage().local.getItem(
     `${userStore.walletAddress}/${Number(
-      rpcStore.selectedRpcConfig?.chainId
+      rpcStore.selectedRPCConfig?.chainId
     )}/asset-contracts`
   )
+  console.log(assetContracts)
   if (assetContracts) {
     return JSON.parse(assetContracts) as AssetContract[]
   } else {
@@ -52,6 +52,8 @@ function fetchNativeAsset() {
 }
 
 async function getAssetsBalance() {
+  console.log('Calling get Assets balance', rpcStore.selectedRPCConfig)
+  await sleep(100)
   assets.length = 0
   assets.push(fetchNativeAsset())
   const storedAssetContracts = fetchStoredAssetContracts()
@@ -83,6 +85,7 @@ async function getAssetsBalance() {
 
 function updateAssetsBalance() {
   assets.forEach(async (asset) => {
+    console.log('Updating asset balance', asset)
     if (asset.address !== 'native') {
       const balance = await getTokenBalance({
         walletAddress: userStore.walletAddress,
@@ -103,24 +106,24 @@ function isNative(asset: Asset) {
 }
 
 onMounted(async () => {
+  console.log('Assets view mounted')
   await getAssetsBalance()
-  assetsPolling = setInterval(updateAssetsBalance, 4000)
 })
 
 onBeforeUnmount(() => {
-  if (assetsPolling) {
-    clearInterval(assetsPolling)
-  }
+  console.log("Assets view's unmounted")
+  clearInterval(assetsPolling)
 })
 
 rpcStore.$subscribe(getAssetsBalance)
 
 watch(
   () => modalStore.show,
-  () => {
+  async () => {
     if (!modalStore.show) {
       showModal.value = false
-      getAssetsBalance()
+      clearInterval(assetsPolling)
+      await getAssetsBalance()
     }
   }
 )
diff --git a/src/components/GasPrice.vue b/src/components/GasPrice.vue
index a881d6ea..557a8518 100644
--- a/src/components/GasPrice.vue
+++ b/src/components/GasPrice.vue
@@ -1,19 +1,8 @@
 <script setup lang="ts">
-import { type Ref, onMounted, ref, watch } from 'vue'
+import { type Ref, ref, watch } from 'vue'
 
-import type { CurrencySymbol } from '@/services/exchangeRate.service'
-import { getExchangeRate } from '@/services/exchangeRate.service'
 import { GAS_AVAILABLE_CHAIN_IDS } from '@/services/gasPrice.service'
 import { useRpcStore } from '@/store/rpc'
-import {
-  EXCHANGE_RATE_CURRENCY,
-  GAS_FEE_UNIT,
-  GAS_PRICE_SPEED_MAP,
-} from '@/utils/constants'
-import debounce from '@/utils/debounce'
-import { formatValueToUSD } from '@/utils/formatUSD'
-import { convertGweiToEth } from '@/utils/gweiToEth'
-import { useImage } from '@/utils/useImage'
 
 const emits = defineEmits(['gasPriceInput'])
 
@@ -37,61 +26,41 @@ const rpcStore = useRpcStore()
 
 const gasFee = ref(0)
 const transactionTime = ref(null)
-const conversionRate = ref('')
 const isGasPriceFocused = ref(false)
 const selectedGasMethod: Ref<'normal' | 'fast' | 'custom'> = ref('normal')
 
-const getConversionRateDebounced = debounce(getConversionRate)
-
-watch(gasFee, () => {
-  if (rpcStore.currency) getConversionRateDebounced(gasFee.value)
-})
-
-const getImage = useImage()
-const showCustomGasFeeInput = ref(false)
-
 const hasGasStation = GAS_AVAILABLE_CHAIN_IDS.includes(
   Number(rpcStore.selectedChainId)
 )
 
-async function getConversionRate(gasFee) {
-  if (rpcStore.currency === 'XAR') return (conversionRate.value = '0')
-  if (!gasFee) return (conversionRate.value = '0')
-  try {
-    const rate =
-      (await getExchangeRate(
-        rpcStore.currency as CurrencySymbol,
-        EXCHANGE_RATE_CURRENCY
-      )) || 0
-    const gasFeeInEth = convertGweiToEth(gasFee)
-    conversionRate.value = formatValueToUSD(Number(gasFeeInEth) * rate)
-  } catch (err) {
-    console.log(err)
-    conversionRate.value = '0'
+watch(
+  () => selectedGasMethod,
+  () => {
+    handleGasPriceSelect(selectedGasMethod.value)
   }
-}
+)
 
-function handleGasPriceSelect(value = '') {
-  const type = value.toLowerCase()
-  const { wait, price } = GAS_PRICE_SPEED_MAP[type]
-  gasFee.value = Number((props.gasPrices[price] / 10).toFixed(9))
-  transactionTime.value = props.gasPrices[wait]
+function handleGasPriceSelect(gasMethod: 'normal' | 'fast' | 'custom') {
+  if (gasMethod === 'normal' || gasMethod === 'custom') {
+    gasFee.value = Number(props.baseFee)
+  } else if (gasMethod === 'fast') {
+    gasFee.value = Number(props.baseFee) * 3
+  }
   emits('gasPriceInput', gasFee.value)
 }
 
-function handleCustomGasPriceInput(value) {
+function handleCustomGasPriceInput() {
   const amountInputEl = document.querySelector(
     '#custom-gas-fee-amount'
   ) as HTMLInputElement
-  if (!value && value !== 0) {
+  if (!gasFee.value && gasFee.value !== 0) {
     amountInputEl.setCustomValidity('Enter the gas fees to continue.')
-  } else if (value < Number(props.baseFee)) {
+  } else if (gasFee.value < Number(props.baseFee)) {
     amountInputEl.setCustomValidity('Gas fees must not be less than base fees.')
   } else {
     amountInputEl.setCustomValidity('')
+    emits('gasPriceInput', gasFee.value)
   }
-  gasFee.value = value
-  emits('gasPriceInput', gasFee.value)
 }
 </script>
 
@@ -155,6 +124,7 @@ function handleCustomGasPriceInput(value) {
       placeholder="Enter Recipient’s Wallet Address"
       @focus="isGasPriceFocused = true"
       @blur="isGasPriceFocused = false"
+      @input="handleCustomGasPriceInput()"
     />
     <div class="flex justify-end gap-1">
       <span class="text-xs text-gray-100">Base Fee:</span>
diff --git a/src/components/SendTokensPreview.vue b/src/components/SendTokensPreview.vue
index 2b0ffb3b..20289193 100644
--- a/src/components/SendTokensPreview.vue
+++ b/src/components/SendTokensPreview.vue
@@ -18,15 +18,10 @@ const props = defineProps({
 
 const nativeCurrency = rpcStore.nativeCurrency.symbol
 
+console.log(props.previewData)
 const txFees =
   Number(props.previewData.gasFee) * Number(props.previewData.estimatedGas)
-
-const sendAmount =
-  nativeCurrency === props.previewData.selectedToken
-    ? Number(props.previewData.amount)
-    : 0
-
-const totalAmount = sendAmount + txFees
+console.log(txFees)
 
 function truncateAddress(address: string) {
   return `${address.slice(0, 5)}....${address.slice(-5)}`
diff --git a/src/pages/SendNft.vue b/src/pages/SendNft.vue
index 4175040e..ebc098fd 100644
--- a/src/pages/SendNft.vue
+++ b/src/pages/SendNft.vue
@@ -18,7 +18,6 @@ import { useUserStore } from '@/store/user'
 import { getImage } from '@/utils/getImage'
 import { convertGweiToEth } from '@/utils/gweiToEth'
 import { getRequestHandler } from '@/utils/requestHandlerSingleton'
-import { useImage } from '@/utils/useImage'
 
 type SendNftProps = {
   type: NFTContractType
@@ -40,7 +39,6 @@ const showPreview = ref(false)
 const rpcStore = useRpcStore()
 const userStore = useUserStore()
 const activitiesStore = useActivitiesStore()
-const getImageOld = useImage()
 const toast = useToast()
 const isWalletAddressFocused = ref(false)
 const chainId = Number(rpcStore.selectedChainId)
@@ -145,7 +143,7 @@ async function handleSendToken() {
     }
     nft.attributes = props.attributes ? JSON.parse(props.attributes) : []
     await activitiesStore.fetchAndSaveNFTActivityFromHash({
-      chainId: rpcStore.selectedRpcConfig?.chainId,
+      chainId: rpcStore.selectedRpcConfig?.chainId as string,
       txHash,
       nft,
       recipientAddress: setHexPrefix(recipientWalletAddress.value),
@@ -186,11 +184,16 @@ async function handleShowPreview() {
           1
         )
       ).toString()
+      gasFeeInEth.value = ethers.utils
+        .formatEther(ethers.utils.parseUnits(`${gasFeeInGwei.value}`, 'gwei'))
+        .toString()
+      showPreview.value = true
     } catch (e) {
       console.error({ e })
+      toast.error(e as string)
+    } finally {
+      hideLoader()
     }
-    hideLoader()
-    showPreview.value = true
   } else {
     toast.error('Please fill all values')
   }
@@ -228,7 +231,7 @@ async function handleShowPreview() {
       </div>
       <form
         class="flex flex-col flex-grow justify-between gap-5"
-        @submit.prevent="showPreview = true"
+        @submit.prevent="handleShowPreview"
       >
         <div class="flex flex-col gap-3">
           <div class="flex flex-col gap-1">
diff --git a/src/pages/SendTokens.vue b/src/pages/SendTokens.vue
index 28976270..72a3c796 100644
--- a/src/pages/SendTokens.vue
+++ b/src/pages/SendTokens.vue
@@ -249,11 +249,16 @@ async function handleShowPreview() {
           `0x${Number(sendAmount).toString(16)}`
         )
       }
+      gasFeeInEth.value = ethers.utils
+        .formatEther(ethers.utils.parseUnits(`${gasFeeInGwei.value}`, 'gwei'))
+        .toString()
+      showPreview.value = true
     } catch (e) {
+      toast.error(e as string)
       console.error({ e })
+    } finally {
+      hideLoader()
     }
-    hideLoader()
-    showPreview.value = true
   } else {
     toast.error('Please fill all values')
   }
@@ -290,7 +295,7 @@ function handleTokenChange(e) {
     </div>
     <form
       class="flex flex-col flex-grow justify-between mt-8"
-      @submit.prevent="showPreview = true"
+      @submit.prevent="handleShowPreview"
     >
       <div class="flex flex-col gap-7">
         <div class="flex flex-col gap-1">
@@ -322,7 +327,7 @@ function handleTokenChange(e) {
                 autocomplete="off"
                 required
                 type="text"
-                placeholder="0"
+                placeholder="0.1"
                 @focus="isAmountFocused = true"
                 @blur="isAmountFocused = false"
               />
diff --git a/src/pages/homeScreen.vue b/src/pages/homeScreen.vue
index 1399f27e..d4e98ddd 100644
--- a/src/pages/homeScreen.vue
+++ b/src/pages/homeScreen.vue
@@ -6,6 +6,7 @@ import AppLoader from '@/components/AppLoader.vue'
 import AssetsView from '@/components/AssetsView.vue'
 import UserWallet from '@/components/UserWallet.vue'
 import { useRpcStore } from '@/store/rpc'
+import { sleep } from '@/utils/sleep'
 
 const rpcStore = useRpcStore()
 const walletBalance = ref('')
@@ -42,10 +43,6 @@ onMounted(() => {
 
 onBeforeUnmount(rpcStore.cleanUpBalancePolling)
 
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms))
-}
-
 async function handleChainChange() {
   showLoader('Fetching Wallet Balance...')
   try {
diff --git a/src/utils/sleep.ts b/src/utils/sleep.ts
new file mode 100644
index 00000000..c6c732fe
--- /dev/null
+++ b/src/utils/sleep.ts
@@ -0,0 +1,3 @@
+export function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}

From 68856da9767cb255e67270746c4d41268f8aea3e Mon Sep 17 00:00:00 2001
From: mmjee <root@git.maharshi.ninja>
Date: Wed, 31 May 2023 17:26:18 +0530
Subject: [PATCH 090/153] Added Avalanche C-Chain to the blacklist (#336)

---
 src/utils/onrampmoney.ramp.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/onrampmoney.ramp.ts b/src/utils/onrampmoney.ramp.ts
index 253aaba8..26926103 100644
--- a/src/utils/onrampmoney.ramp.ts
+++ b/src/utils/onrampmoney.ramp.ts
@@ -33,7 +33,7 @@ type OnRampMoneyNetworkObject = {
 const COIN_CONFIG = new Map<number, OnRampMoneyCoinObject>()
 const CHAIN_ID_CONFIG = new Map<number, OnRampMoneyNetworkObject>()
 // Chains that onramp.money advertises support for, but doesn’t actually accept
-const CHAIN_ID_BLACKLIST = new Set([80001])
+const CHAIN_ID_BLACKLIST = new Set([80001, 43114])
 
 const API_URL = new URL(
   '/api/v1/onramp-coin-config/',

From e181124fdff9fb7f72e8c884966f7e514db797b3 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 31 May 2023 18:30:56 +0530
Subject: [PATCH 091/153] Update activities screen

---
 src/components/ActivityView.vue | 29 +++++++---------
 src/pages/ActivitiesScreen.vue  | 60 ++++++++++-----------------------
 2 files changed, 30 insertions(+), 59 deletions(-)

diff --git a/src/components/ActivityView.vue b/src/components/ActivityView.vue
index aa7585c2..afd572c8 100644
--- a/src/components/ActivityView.vue
+++ b/src/components/ActivityView.vue
@@ -28,15 +28,11 @@ type ActivityView = Activity & {
 const [explorerUrl] = rpcStore.selectedRpcConfig?.blockExplorerUrls || []
 
 const activities: ComputedRef<ActivityView[]> = computed(() => {
-  const activitiesInStore = activitiesStore.activities(chainId)
+  const activitiesInStore = activitiesStore.activities(chainId as string)
   if (!activitiesInStore) {
     return []
   }
-  return [
-    ...activitiesInStore.filter((activity) =>
-      props.filterOperations.includes(activity.operation)
-    ),
-  ]
+  return [...activitiesInStore]
 })
 
 function getTransactionIcon(operation: TransactionOps | FileOps) {
@@ -120,11 +116,11 @@ function canShowDropdown(activity: Activity) {
             :title="activity.operation"
           />
         </div>
-        <div class="flex flex-col flex-grow gap-2">
+        <div class="flex flex-col flex-grow">
           <div class="flex">
             <span
               v-if="activity.customToken"
-              class="font-bold text-base leading-5"
+              class="font-bold text-base"
               :title="`${activity.operation} ${activity.customToken.symbol}`"
             >
               {{ truncateEnd(activity.operation, 12) }}
@@ -132,7 +128,7 @@ function canShowDropdown(activity: Activity) {
             </span>
             <span
               v-else-if="activity.nft"
-              class="font-bold text-base leading-5"
+              class="font-bold text-base"
               :title="`${activity.operation} NFT`"
             >
               {{ truncateEnd(activity.operation, 12) }}
@@ -140,7 +136,7 @@ function canShowDropdown(activity: Activity) {
             </span>
             <span
               v-else
-              class="font-bold text-base leading-5"
+              class="font-bold text-base"
               :title="activity.operation"
             >
               {{ truncateEnd(activity.operation, 12) }}
@@ -156,22 +152,21 @@ function canShowDropdown(activity: Activity) {
           </div>
           <span
             v-if="activity.transaction && activity.address.to"
-            class="text-xs color-secondary"
+            class="text-sm text-gray-100"
             :title="activity.address.to"
             >To: {{ truncateMid(activity.address.to) }}</span
           >
           <span
             v-if="activity.file"
-            class="text-xs color-secondary"
+            class="text-sm text-gray-100"
             :title="activity.file.did"
             >File DID: {{ truncateMid(activity.file.did) }}</span
           >
-          <div class="flex text-xs color-secondary gap-1 items-center">
+          <div class="flex text-sm text-gray-100 gap-1 items-center">
             <span class="whitespace-nowrap">{{
-              dayjs(activity.date).format('MMM D')
+              dayjs(activity.date).format('MMM D, YYYY H:mm')
             }}</span>
-            <img src="@/assets/images/gray-circle-filled.svg" />
-            <span>Status:</span>
+            <!-- <span>Status:</span>
             <span
               :class="
                 activity.status === 'Success'
@@ -180,7 +175,7 @@ function canShowDropdown(activity: Activity) {
               "
             >
               {{ activity.status }}
-            </span>
+            </span> -->
           </div>
         </div>
         <div v-if="activity.transaction" class="flex flex-col items-end gap-1">
diff --git a/src/pages/ActivitiesScreen.vue b/src/pages/ActivitiesScreen.vue
index 9a7a72e2..b61012f6 100644
--- a/src/pages/ActivitiesScreen.vue
+++ b/src/pages/ActivitiesScreen.vue
@@ -1,15 +1,13 @@
 <script lang="ts" setup>
 import { storeToRefs } from 'pinia'
 import type { Ref } from 'vue'
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, computed, type ComputedRef } from 'vue'
 
 import ActivityView from '@/components/ActivityView.vue'
 import { getExchangeRate } from '@/services/exchangeRate.service'
 import type { CurrencySymbol } from '@/services/exchangeRate.service'
+import { useActivitiesStore, type Activity } from '@/store/activities'
 import { useRpcStore } from '@/store/rpc'
-import { useImage } from '@/utils/useImage'
-
-const getImage = useImage()
 
 const filters = [
   {
@@ -40,15 +38,21 @@ const rpcStore = useRpcStore()
 
 const showFilter = ref(false)
 const selectedFilter = ref(filters[0].value)
+const activitiesStore = useActivitiesStore()
+const chainId = rpcStore.selectedRpcConfig?.chainId
+
+const activities: ComputedRef<Activity[]> = computed(() => {
+  const activitiesInStore = activitiesStore.activities(chainId as string)
+  if (!activitiesInStore) {
+    return []
+  }
+  return [...activitiesInStore]
+})
 
 const exchangeRate: Ref<number | null> = ref(null)
 const { currency } = storeToRefs(rpcStore)
 const EXCHANGE_RATE_CURRENCY: CurrencySymbol = 'USD'
 
-function onFilterSelect(filter) {
-  selectedFilter.value = filter.value
-}
-
 async function getCurrencyExchangeRate() {
   try {
     if (currency.value) {
@@ -66,42 +70,14 @@ async function getCurrencyExchangeRate() {
 </script>
 
 <template>
-  <div
-    class="wallet__card p-4 rounded-[10px] space-y-5 flex flex-col overflow-auto"
-    @click="showFilter = false"
-  >
+  <div class="flex flex-col gap-5" @click="showFilter = false">
     <div class="flex justify-between relative items-center">
-      <h1 class="font-semibold text-xl sm:text-sm">Activities</h1>
-      <div v-if="false" class="flex items-center space-x-1">
-        <p
-          v-if="selectedFilter != 'all'"
-          class="bg-black text-gray-500 text-[10px] sm:text-[8px] p-1 rounded"
-        >
-          {{ filters.find((filter) => filter.value === selectedFilter)?.label }}
-        </p>
-        <button class="h-auto" @click.stop="showFilter = true">
-          <img
-            :src="getImage('filter-icon')"
-            alt="filter"
-            class="p-1 rounded-[10px]"
-          />
-        </button>
-      </div>
-      <div
-        v-if="showFilter"
-        class="flex flex-col absolute right-0 top-2 p-5 sm:p-3 bg-black rounded-[10px]"
-      >
-        <button
-          v-for="filter in filters"
-          :key="filter.value"
-          class="text-left hover:bg-gray-600 p-2 rounded-[10px] sm:text-[12px] h-auto"
-          @click="() => onFilterSelect(filter)"
-        >
-          {{ filter.label }}
-        </button>
-      </div>
+      <h1 class="font-bold text-xl text-center flex-grow">Activities</h1>
     </div>
-    <div class="flex-1">
+    <div class="flex-1 flex flex-col gap-2">
+      <span class="text-xs text-gray-100 font-bold"
+        >Confirmed ({{ activities.length }})</span
+      >
       <ActivityView
         :currency-exchange-rate="exchangeRate"
         :filter-operations="filters_operations_map[selectedFilter]"

From e7f5416133e5d57f16131833d78235b605caec7b Mon Sep 17 00:00:00 2001
From: makylfang <makyl@newfang.io>
Date: Thu, 1 Jun 2023 08:41:40 +0400
Subject: [PATCH 092/153] Updated signin flow for social

---
 src/components/AssetsView.vue        |   6 +-
 src/pages/initPageV2.vue             |  10 +-
 src/pages/loggedInView.vue           |  16 +-
 src/pages/loginRedirect.vue          |  34 ++-
 src/pages/signInV2.vue               | 310 ++++++---------------------
 src/store/rpc.ts                     |   2 +-
 src/store/user.ts                    |   5 +-
 src/utils/getAuthProvider.ts         |   7 +-
 src/utils/redirectUtils.ts           | 141 ++++++++++--
 src/utils/requestHandlerSingleton.ts |  13 +-
 10 files changed, 255 insertions(+), 289 deletions(-)

diff --git a/src/components/AssetsView.vue b/src/components/AssetsView.vue
index 6be110d8..8b764c91 100644
--- a/src/components/AssetsView.vue
+++ b/src/components/AssetsView.vue
@@ -14,7 +14,7 @@ import { getIconAsset } from '@/utils/useImage'
 const userStore = useUserStore()
 const rpcStore = useRpcStore()
 const router = useRouter()
-const assets: Asset[] = reactive([])
+let assets: Asset[] = reactive([])
 let assetsPolling
 
 function fetchStoredAssetContracts(): AssetContract[] {
@@ -45,8 +45,8 @@ function fetchNativeAsset() {
 }
 
 async function getAssetsBalance() {
-  assets.length = 0
-  assets.push(fetchNativeAsset())
+  assets = [fetchNativeAsset()]
+
   const storedAssetContracts = fetchStoredAssetContracts()
   storedAssetContracts.forEach((contract) => {
     assets.push({
diff --git a/src/pages/initPageV2.vue b/src/pages/initPageV2.vue
index 2a91b37b..e7bf22ff 100644
--- a/src/pages/initPageV2.vue
+++ b/src/pages/initPageV2.vue
@@ -11,6 +11,7 @@ import { useUserStore } from '@/store/user'
 import { createInitParentConnection } from '@/utils/createParentConnection'
 import emailScheme from '@/utils/emailScheme'
 import { getAuthProvider } from '@/utils/getAuthProvider'
+import { catchupSigninPage } from '@/utils/redirectUtils'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
 const route = useRoute()
@@ -68,7 +69,10 @@ async function init() {
 
 async function handleSocialLoginRequest(type: SocialLoginType) {
   if (authProvider) {
-    return await user.handleSocialLogin(authProvider, type)
+    const { url, state } = await user.handleSocialLogin(authProvider, type)
+    console.log({ url, state })
+    await catchupSigninPage(state)
+    return url
   }
 }
 
@@ -85,4 +89,6 @@ async function handlePasswordlessLoginRequest(email: string) {
   }
 }
 </script>
-<template><div></div></template>
+<template>
+  <div></div>
+</template>
diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index 6d730176..a3f64229 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -22,6 +22,7 @@ import getValidAppMode from '@/utils/getValidAppMode'
 import { getWalletType } from '@/utils/getwalletType'
 import {
   getRequestHandler,
+  requestHandlerExists,
   setRequestHandler,
 } from '@/utils/requestHandlerSingleton'
 import {
@@ -121,12 +122,14 @@ async function getAccountDetails() {
   await initAccountHandler()
 }
 
-async function initKeeper() {
-  const accountHandler = new AccountHandler(
-    userStore.privateKey,
-    rpcStore.selectedRpcConfig.rpcUrls[0]
-  )
-  setRequestHandler(accountHandler)
+function initKeeper() {
+  if (!requestHandlerExists()) {
+    const accountHandler = new AccountHandler(
+      userStore.privateKey,
+      rpcStore.selectedRpcConfig.rpcUrls[0]
+    )
+    setRequestHandler(accountHandler)
+  }
 }
 
 async function initAccountHandler() {
@@ -245,7 +248,6 @@ async function getRpcConfig() {
       enabledChainList.value[0] // some time, chain list don't have default chain
     rpcStore.setSelectedRPCConfig(rpcConfig)
     rpcStore.setRpcConfig(rpcConfig)
-    await getRequestHandler().setRpcConfig(rpcConfig)
   } catch (err) {
     console.log({ err })
   }
diff --git a/src/pages/loginRedirect.vue b/src/pages/loginRedirect.vue
index 11326bdd..90c6a98a 100644
--- a/src/pages/loginRedirect.vue
+++ b/src/pages/loginRedirect.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { GetInfoOutput } from '@arcana/auth-core'
+import { GetInfoOutput, SocialLoginType } from '@arcana/auth-core'
 import { Core, SecurityQuestionModule } from '@arcana/key-helper'
 import dayjs from 'dayjs'
 import { getUniqueId } from 'json-rpc-engine'
@@ -11,9 +11,11 @@ import type { RedirectParentConnectionApi } from '@/models/Connection'
 import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
 import { getAuthProvider } from '@/utils/getAuthProvider'
 import {
+  getStateFromUrl,
   handlePasswordlessLogin,
   handlePasswordlessLoginV2,
   handleSocialLogin,
+  verifyOpenerPage,
 } from '@/utils/redirectUtils'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
@@ -26,18 +28,35 @@ let channel: BroadcastChannel | null = null
 onMounted(init)
 onUnmounted(cleanup)
 
+const isV3 = (s: string) => {
+  return s.length > 10
+}
+
+const getLoginTypeFromState = (s: string) => {
+  return s.split('-')[0]
+}
 async function init() {
   const storage = getStorage()
   const parentAppUrl = storage.local.getItem('parentAppUrl')
   const loginSrc = storage.local.getItem('loginSrc')
+  const isStandalone =
+    loginSrc === 'rn' || loginSrc === 'flutter' || loginSrc === 'unity'
   // TODO: Fix this V, throw error n stuff
   if (!parentAppUrl) {
     return
   }
   try {
+    const state = getStateFromUrl(route.fullPath)
     const connectionToParent =
       await connectToParent<RedirectParentConnectionApi>({}).promise
-    const authProvider = await getAuthProvider(`${appId}`)
+    if (
+      isV3(state) &&
+      !isStandalone &&
+      getLoginTypeFromState(state) !== SocialLoginType.passwordless
+    ) {
+      await verifyOpenerPage(state)
+    }
+    const authProvider = await getAuthProvider(`${appId}`, !isV3(state))
     if (authProvider.isLoggedIn()) {
       const info = authProvider.getUserInfo()
       const userInfo: GetInfoOutput & { hasMfa?: boolean; pk?: string } = {
@@ -73,7 +92,7 @@ async function init() {
       storage.session.setItem(`userInfo`, JSON.stringify(userInfo))
       storage.session.setItem(`isLoggedIn`, JSON.stringify(true))
       const messageId = getUniqueId()
-      if (info.loginType === 'passwordless') {
+      if (info.loginType === SocialLoginType.passwordless) {
         await handlePasswordlessLoginV2(userInfo, connectionToParent).catch(
           async () => {
             channel = new BroadcastChannel(`${appId}_login_notification`)
@@ -87,11 +106,7 @@ async function init() {
           }
         )
       } else {
-        if (
-          loginSrc === 'rn' ||
-          loginSrc === 'flutter' ||
-          loginSrc === 'unity'
-        ) {
+        if (isStandalone) {
           await connectionToParent.goToWallet()
           return
         }
@@ -107,8 +122,9 @@ async function init() {
       return
     }
   } catch (e) {
+    console.log({ e })
     if (e instanceof Error) {
-      await reportError(e.message, parentAppUrl)
+      // await reportError(e.message, parentAppUrl)
     }
   }
 }
diff --git a/src/pages/signInV2.vue b/src/pages/signInV2.vue
index 83e83dc1..c17257a8 100644
--- a/src/pages/signInV2.vue
+++ b/src/pages/signInV2.vue
@@ -3,17 +3,15 @@ import type { AuthProvider, GetInfoOutput } from '@arcana/auth-core'
 import { SocialLoginType } from '@arcana/auth-core'
 import { Core, SecurityQuestionModule } from '@arcana/key-helper'
 import type { Connection } from 'penpal'
-import { toRefs, onMounted, ref, computed, onUnmounted } from 'vue'
+import { toRefs, onMounted, ref, onUnmounted } from 'vue'
 import type { Ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
-import OauthLogin from '@/components/oauthLogin.vue'
 import type { ParentConnectionApi } from '@/models/Connection'
 import { useAppStore } from '@/store/app'
 import { useUserStore } from '@/store/user'
 import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
 import { createParentConnection } from '@/utils/createParentConnection'
-import emailScheme from '@/utils/emailScheme'
 import { getAuthProvider } from '@/utils/getAuthProvider'
 import { PasswordlessLoginHandler } from '@/utils/PasswordlessLoginHandler'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
@@ -25,32 +23,31 @@ const app = useAppStore()
 const availableLogins: Ref<SocialLoginType[]> = ref([])
 const isLoading: Ref<boolean> = ref(false)
 let parentConnection: Connection<ParentConnectionApi> | null = null
-let channel: BroadcastChannel | null = null
 initStorage()
 
-const userEmailInput = ref('')
-const passwordlessForm = ref(null)
-const isEmailFocused = ref(false)
-
-const disableSendLinkBtn = computed(() => {
-  return userEmailInput.value.length === 0
-})
-
-const LOGINS_FETCHING_ERROR_TEXT = `No logins configured. If you are the app admin, please configure login
-providers on the developer dashboard.`
-
 const {
   params: {
     value: { appId },
   },
 } = toRefs(route)
 
+type SocialLogins = Exclude<SocialLoginType, SocialLoginType.passwordless>
 let passwordlessLoginHandler: PasswordlessLoginHandler | null
 
-const initPasswordlessLogin = (email: string) => {
+const initPasswordlessLogin = async (email: string) => {
   if (passwordlessLoginHandler) {
     passwordlessLoginHandler.cancel()
   }
+  const provider = await getAuthProvider(appId as string)
+  const resp = await provider.loginWithOtp(email, {
+    withUI: false,
+  })
+  // if (resp && resp['success']) {
+
+  // } else if (resp && resp['error']) {
+
+  // }
+
   passwordlessLoginHandler = new PasswordlessLoginHandler(email)
   const params = passwordlessLoginHandler.params()
   passwordlessLoginHandler.start().then(({ privateKey, email, hasMfa, pk }) => {
@@ -69,10 +66,21 @@ const initPasswordlessLogin = (email: string) => {
   })
   return params
 }
+let currentLogin = ''
+
+const initSocialLogin = async (type: SocialLogins): Promise<string> => {
+  const val = await authProvider?.loginWithSocial(type)
+  if (val) {
+    currentLogin = val.state
+    return val.url
+  }
+  throw new Error("Couldn't get login url")
+}
 
 const penpalMethods = {
   isLoggedIn: () => user.isLoggedIn,
   initPasswordlessLogin: (email: string) => initPasswordlessLogin(email),
+  initSocialLogin: (type: SocialLogins) => initSocialLogin(type),
   isLoginAvailable: (kind: SocialLoginType) =>
     availableLogins.value.includes(kind),
   getPublicKey: handleGetPublicKey,
@@ -81,9 +89,6 @@ const penpalMethods = {
 
 const cleanup = () => {
   parentConnection?.destroy()
-  if (channel) {
-    channel.close()
-  }
   window.removeEventListener('message', windowEventHandler)
 }
 
@@ -133,37 +138,56 @@ async function storeUserInfoAndRedirect(
   router.push({ name: 'home' })
 }
 
-const channelEventHandler = (ev: MessageEvent) => {
-  if (ev.data?.status === 'LOGIN_INFO') {
-    channel?.postMessage({
-      status: 'LOGIN_INFO_ACK',
-      messageId: ev.data.messageId,
-    })
-    storeUserInfoAndRedirect(ev.data.info)
-  }
-}
-
 const windowEventHandler = (
   ev: MessageEvent<{
     status: string
     messageId: number
     info: GetInfoOutput & { hasMfa?: boolean }
+    state?: string
   }>
 ) => {
   const storage = getStorage()
+  console.log({ ev: ev.data })
   // eslint-disable-next-line no-undef
   if (ev.origin !== process.env.VUE_APP_WALLET_DOMAIN) {
     return
   }
-  if (ev.data?.status === 'LOGIN_INFO') {
-    ev.source?.postMessage(
-      { status: 'LOGIN_INFO_ACK', messageId: ev.data.messageId },
-      { targetOrigin: ev.origin }
-    )
-    storeUserInfoAndRedirect(ev.data.info)
-    if (ev.data.info.hasMfa) {
-      user.hasMfa = true
-      storage.local.setItem(`${ev.data.info.userInfo.id}-has-mfa`, '1')
+  switch (ev.data?.status) {
+    case 'LOGIN_INFO': {
+      ev.source?.postMessage(
+        { status: 'LOGIN_INFO_ACK', messageId: ev.data.messageId },
+        { targetOrigin: ev.origin }
+      )
+      storeUserInfoAndRedirect(ev.data.info)
+      if (ev.data.info.hasMfa) {
+        user.hasMfa = true
+        storage.local.setItem(`${ev.data.info.userInfo.id}-has-mfa`, '1')
+      }
+      break
+    }
+    case 'LOGIN_VERIFY': {
+      console.log({ currentLogin, state: ev.data?.state })
+      ev.source?.postMessage(
+        {
+          status: 'LOGIN_VERIFY_ACK',
+          verified: currentLogin === ev.data?.state,
+        }, // maybe send public key here
+        { targetOrigin: ev.origin }
+      )
+      break
+    }
+    case 'LOGIN_INIT': {
+      console.log({ currentLogin, state: ev.data?.state })
+      if (ev.data.state) {
+        currentLogin = ev.data.state
+      }
+      ev.source?.postMessage(
+        {
+          status: 'LOGIN_INIT_ACK',
+        }, // maybe send public key here
+        { targetOrigin: ev.origin }
+      )
+      break
     }
   }
 }
@@ -172,9 +196,6 @@ async function init() {
   isLoading.value = true
   try {
     const storage = getStorage()
-    // channel listener
-    channel = new BroadcastChannel(`${appId}_login_notification`)
-    channel.addEventListener('message', channelEventHandler)
 
     // window listener
     window.addEventListener('message', windowEventHandler)
@@ -228,217 +249,12 @@ async function init() {
   }
 }
 
-async function handleSocialLoginRequest(kind: SocialLoginType) {
-  const c = await parentConnection?.promise
-  c?.triggerSocialLogin(kind)
-}
-
 async function handleGetPublicKey(id, verifier) {
   const authProvider = await getAuthProvider(app.id)
   return await authProvider.getPublicKey({ id, verifier })
 }
-
-async function handlePasswordlessLoginRequest(email: string) {
-  const isEmailValid = await emailScheme.isValid(email)
-  if (isEmailValid) {
-    const c = await parentConnection?.promise
-    c?.triggerPasswordlessLogin(email)
-    return
-  }
-}
-
-async function handleSubmit() {
-  handlePasswordlessLoginRequest(userEmailInput.value)
-}
-
-function onEnterPress() {
-  if (passwordlessForm.value.email.checkValidity()) handleSubmit()
-}
 </script>
 
 <template>
-  <div v-if="isLoading" class="signin__loader flex-1">
-    <p>Loading...</p>
-  </div>
-  <div v-else class="flex items-center">
-    <div class="wallet__card rounded-[10px] flex flex-col mb-[10px]">
-      <div class="signin__container">
-        <div class="signin__body flow-container">
-          <div class="signin__title-desc flow-element">
-            <h1 class="signin__title">Welcome!</h1>
-            <p class="signin__desc">
-              You will receive a login link in your email for a password-less
-              sign-in.
-            </p>
-          </div>
-          <form
-            ref="passwordlessForm"
-            class="signin__input-container flow-element"
-            @submit.prevent="handleSubmit"
-          >
-            <label class="signin__input-label">Email</label>
-            <input
-              v-model="userEmailInput"
-              name="email"
-              type="email"
-              class="signin__input-field py-4"
-              placeholder="someone@example.com"
-              required
-              :class="{
-                'outline-black dark:outline-white outline-1 outline':
-                  isEmailFocused,
-              }"
-              @keyup.enter="onEnterPress"
-              @focus="isEmailFocused = true"
-              @blur="isEmailFocused = false"
-            />
-            <input
-              type="submit"
-              value="Send Link"
-              class="signin__button"
-              :class="{ 'signin__button--disabled': disableSendLinkBtn }"
-              :disabled="disableSendLinkBtn"
-            />
-          </form>
-        </div>
-        <div class="signin__footer">
-          <div>
-            <OauthLogin
-              v-if="availableLogins.length"
-              :available-logins="availableLogins"
-              @oauth-click="(type) => handleSocialLoginRequest(type)"
-            />
-            <p v-else class="signin__footer-text-error">
-              {{ LOGINS_FETCHING_ERROR_TEXT }}
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+  <div></div>
 </template>
-
-<style scoped>
-.signin__container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  height: 100%;
-  padding: var(--p-500) var(--p-400);
-}
-
-.signin__loader {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-}
-
-.signin__container > *:not(:first-child) {
-  margin-top: 40px;
-}
-
-.signin__body {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  justify-content: space-between;
-}
-
-.signin__footer {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  height: 25px;
-}
-
-.signin__footer-text-loading {
-  font-size: var(--fs-300);
-}
-
-.signin__footer-text-error {
-  font-size: var(--fs-250);
-  text-align: center;
-}
-
-.signin__title-desc {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-around;
-}
-
-.signin__title {
-  font-size: var(--fs-500);
-  font-weight: 600;
-  text-align: center;
-}
-
-.signin__desc {
-  font-size: var(--fs-350);
-  font-weight: 400;
-  text-align: center;
-}
-
-.signin__input-container {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  width: 100%;
-}
-
-.signin__input-label {
-  margin-left: 15px;
-  font-size: var(--fs-300);
-  font-weight: 400;
-}
-
-.signin__input-field {
-  padding: var(--p-400);
-  font-size: var(--fs-350);
-  font-weight: 400;
-  color: var(--fg-color);
-  background: var(--debossed-box-color);
-  border: none;
-  border-radius: 10px;
-  box-shadow: var(--debossed-shadow);
-}
-
-.signin__button {
-  width: 100%;
-  height: 2.25rem;
-  font-size: var(--fs-350);
-  font-weight: 600;
-  color: var(--filled-button-fg-color);
-  text-transform: uppercase;
-  background: var(--filled-button-bg-color);
-  border: none;
-  border-radius: 10px;
-}
-
-.signin__button:hover {
-  transition: all 0.5s;
-  transform: scale(1.05, 1.15);
-}
-
-.signin__button--disabled {
-  cursor: not-allowed;
-  background: var(--button-bg-disabled);
-  transform: none;
-}
-
-.signin__button--disabled:hover {
-  transform: none;
-}
-
-@media (max-width: 235px) {
-  .signin__container > *:not(:first-child) {
-    margin-top: 30px;
-  }
-
-  .signin__button {
-    height: 1.75rem;
-  }
-}
-</style>
diff --git a/src/store/rpc.ts b/src/store/rpc.ts
index 99653537..00edbe22 100644
--- a/src/store/rpc.ts
+++ b/src/store/rpc.ts
@@ -29,7 +29,7 @@ export const useRpcStore = defineStore('rpcStore', {
       selectedRPCConfig: null,
       selectedChainId: null,
 
-      walletBalance: '',
+      walletBalance: '0',
       walletBalanceChainId: '',
       walletBalancePollingCleanupID: null,
       walletBalancePollingIntervalID: null,
diff --git a/src/store/user.ts b/src/store/user.ts
index 7b53bf70..4f3a5db1 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -41,8 +41,9 @@ export const useUserStore = defineStore('user', {
     async handleSocialLogin(
       authProvider: AuthProvider,
       loginType: LoginType
-    ): Promise<void | string> {
-      return await authProvider.loginWithSocial(loginType)
+    ): Promise<{ url: string; state: string }> {
+      const { url, state } = await authProvider.loginWithSocial(loginType)
+      return { url, state }
     },
     async handlePasswordlessLogin(
       authProvider: AuthProvider,
diff --git a/src/utils/getAuthProvider.ts b/src/utils/getAuthProvider.ts
index 1124f23c..ac85c696 100644
--- a/src/utils/getAuthProvider.ts
+++ b/src/utils/getAuthProvider.ts
@@ -8,7 +8,10 @@ const AUTH_NETWORK = process.env
 
 let authProvider: AuthProvider | null = null
 
-export async function getAuthProvider(appId: string): Promise<AuthProvider> {
+export async function getAuthProvider(
+  appId: string,
+  shouldVerifyState = true
+): Promise<AuthProvider> {
   if (!authProvider) {
     authProvider = await AuthProvider.init({
       appId: appId,
@@ -17,7 +20,9 @@ export async function getAuthProvider(appId: string): Promise<AuthProvider> {
       flow: 'redirect',
       autoRedirect: false,
       debug: true,
+      shouldVerifyState,
     })
   }
+  // authProvider.shouldVerifyState = shouldVerifyState
   return authProvider
 }
diff --git a/src/utils/redirectUtils.ts b/src/utils/redirectUtils.ts
index 9c5f5ac4..fb3c58d1 100644
--- a/src/utils/redirectUtils.ts
+++ b/src/utils/redirectUtils.ts
@@ -13,6 +13,10 @@ const SOCIAL_TIMEOUT = 5000 // 5s timeout
 const PASSWORDLESS_TIMEOUT = 1500 // 1.5s timeout
 
 const LOGIN_INFO = 'LOGIN_INFO'
+const LOGIN_VERIFY = 'LOGIN_VERIFY'
+const LOGIN_VERIFY_ACK = 'LOGIN_VERIFY_ACK'
+const LOGIN_INIT = 'LOGIN_INIT'
+const LOGIN_INIT_ACK = 'LOGIN_INIT_ACK'
 const LOGIN_INFO_ACK = 'LOGIN_INFO_ACK'
 const MFA_SETUP = 'MFA_SETUP'
 const MFA_SETUP_ACK = 'MFA_SETUP_ACK'
@@ -43,6 +47,95 @@ function contactUsingBroadcastChannel(
   })
 }
 
+function catchupSigninPage(state: string) {
+  return new Promise((resolve, reject) => {
+    setTimeout(() => {
+      return reject('request timed out')
+    }, SOCIAL_TIMEOUT)
+
+    const listener = (
+      ev: MessageEvent<{ status: string; verified: boolean }>
+    ) => {
+      console.log({ ev: ev.data })
+      if (ev.origin !== process.env.VUE_APP_WALLET_DOMAIN) {
+        return
+      }
+
+      if (ev.data?.status === LOGIN_INIT_ACK) {
+        window.removeEventListener('message', listener)
+        return resolve('ok')
+      }
+    }
+    try {
+      const frameLength = window.parent.opener.frames.length
+      window.addEventListener('message', listener)
+      for (let i = 0; i < frameLength; i++) {
+        try {
+          window.parent.opener.frames[i].postMessage(
+            {
+              status: LOGIN_INIT,
+              state,
+            },
+            process.env.VUE_APP_WALLET_DOMAIN
+          )
+        } catch (e) {
+          // Intentionally ignoring errors
+          continue
+        }
+      }
+    } catch (e) {
+      reject(new Error('Could not contact parent page, login did not succeed'))
+    }
+  })
+}
+
+function verifyOpenerPage(state: string) {
+  return new Promise((resolve, reject) => {
+    setTimeout(() => {
+      return reject('request timed out')
+    }, SOCIAL_TIMEOUT)
+
+    const listener = (
+      ev: MessageEvent<{ status: string; verified: boolean }>
+    ) => {
+      console.log({ ev: ev.data })
+      if (ev.origin !== process.env.VUE_APP_WALLET_DOMAIN) {
+        return
+      }
+
+      if (ev.data?.status === LOGIN_VERIFY_ACK) {
+        if (ev.data.verified) {
+          window.removeEventListener('message', listener)
+          return resolve('ok')
+        } else {
+          window.removeEventListener('message', listener)
+          return reject('could not verify parent')
+        }
+      }
+    }
+    try {
+      const frameLength = window.parent.opener.frames.length
+      window.addEventListener('message', listener)
+      for (let i = 0; i < frameLength; i++) {
+        try {
+          window.parent.opener.frames[i].postMessage(
+            {
+              status: LOGIN_VERIFY,
+              state,
+            },
+            process.env.VUE_APP_WALLET_DOMAIN
+          )
+        } catch (e) {
+          // Intentionally ignoring errors
+          continue
+        }
+      }
+    } catch (e) {
+      reject(new Error('Could not contact parent page, login did not succeed'))
+    }
+  })
+}
+
 function contactParentPage(
   info: GetInfoOutput,
   messageId: number,
@@ -52,23 +145,21 @@ function contactParentPage(
     setTimeout(() => {
       return reject('request timed out')
     }, SOCIAL_TIMEOUT)
+    const listener = (
+      ev: MessageEvent<{ status: string; messageId: number }>
+    ) => {
+      if (ev.origin !== process.env.VUE_APP_WALLET_DOMAIN) {
+        return
+      }
+
+      if (ACK.includes(ev.data?.status) && ev.data?.messageId == messageId) {
+        window.removeEventListener('message', listener)
+        return resolve('ok')
+      }
+    }
     try {
       const frameLength = window.parent.opener.frames.length
-      window.addEventListener(
-        'message',
-        (ev: MessageEvent<{ status: string; messageId: number }>) => {
-          if (ev.origin !== process.env.VUE_APP_WALLET_DOMAIN) {
-            return
-          }
-
-          if (
-            ACK.includes(ev.data?.status) &&
-            ev.data?.messageId == messageId
-          ) {
-            return resolve('ok')
-          }
-        }
-      )
+      window.addEventListener('message', listener)
       for (let i = 0; i < frameLength; i++) {
         try {
           window.parent.opener.frames[i].postMessage(
@@ -150,11 +241,31 @@ async function handlePasswordlessLogin(
     connection.redirect(url.toString())
   }
 }
+
+const getStateFromUrl = (u: string) => {
+  let val = ''
+  console.log({ u })
+  const url = new URL(decodeURIComponent(u), process.env.VUE_APP_WALLET_DOMAIN)
+  console.log({ url })
+  const queryParams = url.searchParams
+  const hashParams = new URLSearchParams(url.hash.substring(1))
+  const key = 'state'
+  val = hashParams.get(key) ?? ''
+  if (!val) {
+    val = queryParams.get(key) ?? ''
+  }
+
+  console.log({ val })
+  return val
+}
 export {
   handlePasswordlessLogin,
   handlePasswordlessLoginV2,
   handleSocialLogin,
+  catchupSigninPage,
   contactParentPage,
+  getStateFromUrl,
+  verifyOpenerPage,
   MFA_SETUP,
   LOGIN_INFO,
   MFA_SETUP_ACK,
diff --git a/src/utils/requestHandlerSingleton.ts b/src/utils/requestHandlerSingleton.ts
index b9bfd547..97b12fef 100644
--- a/src/utils/requestHandlerSingleton.ts
+++ b/src/utils/requestHandlerSingleton.ts
@@ -1,7 +1,11 @@
 import { AccountHandler } from '@/utils/accountHandler'
 import { RequestHandler } from '@/utils/requestHandler'
 
-let requestHandler: RequestHandler | null
+let requestHandler: RequestHandler | null = null
+
+const requestHandlerExists = () => {
+  return requestHandler != null
+}
 
 const setRequestHandler = (accountHandler: AccountHandler) => {
   if (!requestHandler) {
@@ -25,4 +29,9 @@ const deleteRequestHandler = () => {
   requestHandler = null
 }
 
-export { setRequestHandler, getRequestHandler, deleteRequestHandler }
+export {
+  requestHandlerExists,
+  setRequestHandler,
+  getRequestHandler,
+  deleteRequestHandler,
+}

From 0f868f9c10f479d9168bd6343a5829d102911d24 Mon Sep 17 00:00:00 2001
From: makylfang <makyl@newfang.io>
Date: Thu, 1 Jun 2023 09:05:06 +0400
Subject: [PATCH 093/153] Removed isV3 check from redirect

---
 src/pages/loginRedirect.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/loginRedirect.vue b/src/pages/loginRedirect.vue
index 90c6a98a..60a9413a 100644
--- a/src/pages/loginRedirect.vue
+++ b/src/pages/loginRedirect.vue
@@ -50,7 +50,6 @@ async function init() {
     const connectionToParent =
       await connectToParent<RedirectParentConnectionApi>({}).promise
     if (
-      isV3(state) &&
       !isStandalone &&
       getLoginTypeFromState(state) !== SocialLoginType.passwordless
     ) {

From 5a1dcb5f597aac1a5baf295f552e08c8c3025acd Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 1 Jun 2023 17:22:51 +0530
Subject: [PATCH 094/153] Fix activities

---
 src/components/ActivityView.vue | 73 ++++++++++++++-------------------
 src/services/nft.service.ts     |  2 +
 2 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/src/components/ActivityView.vue b/src/components/ActivityView.vue
index afd572c8..b05192cb 100644
--- a/src/components/ActivityView.vue
+++ b/src/components/ActivityView.vue
@@ -106,11 +106,21 @@ function canShowDropdown(activity: Activity) {
     <li
       v-for="activity in activities"
       :key="activity.transaction?.hash || activity.file?.did"
-      class="flex flex-col gap-5"
+      class="flex flex-col gap-2"
     >
       <div class="flex">
         <div class="mr-3">
+          <div
+            v-if="activity.nft?.imageUrl"
+            class="rounded-sm w-xxxl h-xxxl overflow-hidden mt-1"
+          >
+            <img
+              :src="activity.nft.imageUrl"
+              class="object-contain object-center"
+            />
+          </div>
           <img
+            v-else
             :src="getTransactionIcon(activity.operation)"
             class="invert dark:invert-0"
             :title="activity.operation"
@@ -181,7 +191,7 @@ function canShowDropdown(activity: Activity) {
         <div v-if="activity.transaction" class="flex flex-col items-end gap-1">
           <span
             v-if="activity.customToken"
-            class="font-bold text-base leading-5 text-right whitespace-nowrap overflow-hidden text-ellipsis max-w-[6ch]"
+            class="font-bold text-base leading-5 text-right whitespace-nowrap overflow-hidden text-ellipsis max-w-[10rem]"
             :class="
               activity.operation === 'Receive'
                 ? 'color-state-green'
@@ -193,7 +203,7 @@ function canShowDropdown(activity: Activity) {
           >
           <span
             v-else
-            class="font-bold text-base leading-5 text-right whitespace-nowrap overflow-hidden text-ellipsis max-w-[6ch]"
+            class="font-bold text-base leading-5 text-right whitespace-nowrap overflow-hidden text-ellipsis max-w-[10rem]"
             :class="
               activity.operation === 'Receive'
                 ? 'color-state-green'
@@ -217,17 +227,8 @@ function canShowDropdown(activity: Activity) {
       </div>
       <div
         v-if="canShowDropdown(activity) && activity.isExpanded"
-        class="flex flex-col"
+        class="flex flex-col card p-4"
       >
-        <hr
-          class="border-solid border-0 border-t-[1px] tab-view-border-color"
-          :class="{
-            'mb-5':
-              activity.file?.recipient ||
-              activity.file?.ruleHash ||
-              activity.transaction,
-          }"
-        />
         <div v-if="activity.file?.recipient">
           <div class="flex flex-col gap-[5px]">
             <span class="font-montserrat color-secondary text-xs font-semibold"
@@ -255,7 +256,7 @@ function canShowDropdown(activity: Activity) {
           </div>
         </div>
         <div v-else-if="activity.transaction">
-          <div class="flex flex-col gap-5">
+          <div class="flex flex-col gap-4">
             <div v-if="activity.nft" class="flex justify-center items-center">
               <img
                 :src="activity.nft.imageUrl"
@@ -264,13 +265,10 @@ function canShowDropdown(activity: Activity) {
               />
             </div>
             <div class="flex justify-between">
-              <div class="flex flex-col gap-[5px]">
+              <div class="flex flex-col gap-1">
+                <span class="text-sm text-gray-100">From</span>
                 <span
-                  class="font-montserrat color-secondary text-xs font-semibold"
-                  >From</span
-                >
-                <span
-                  class="text-base font-normal leading-5"
+                  class="text-base font-bold"
                   :title="activity.address.from"
                 >
                   {{ truncateMid(activity.address.from) }}
@@ -280,25 +278,16 @@ function canShowDropdown(activity: Activity) {
                 v-if="activity.address.to"
                 src="@/assets/images/arrow-right.svg"
               />
-              <div v-if="activity.address.to" class="flex flex-col gap-[5px]">
-                <span
-                  class="font-montserrat color-secondary text-xs font-semibold"
-                  >To</span
-                >
-                <span
-                  class="text-base font-normal leading-5"
-                  :title="activity.address.to"
-                >
+              <div v-if="activity.address.to" class="flex flex-col gap-1">
+                <span class="text-sm text-gray-100">To</span>
+                <span class="text-base font-bold" :title="activity.address.to">
                   {{ truncateMid(activity.address.to) }}
                 </span>
               </div>
             </div>
-            <div v-if="!activity.nft" class="flex flex-col gap-4">
-              <span
-                class="font-montserrat color-secondary text-xs font-semibold"
-                >Transaction Details</span
-              >
-              <div class="flex flex-col gap-5 text-base font-normal leading-5">
+            <div v-if="!activity.nft" class="flex flex-col gap-2">
+              <span class="text-sm text-gray-100">Transaction Details</span>
+              <div class="flex flex-col gap-2 text-base">
                 <div class="flex justify-between">
                   <span>Nonce</span>
                   <span>{{ activity.transaction.nonce }}</span>
@@ -306,7 +295,7 @@ function canShowDropdown(activity: Activity) {
                 <div class="flex justify-between">
                   <span>Amount</span>
                   <span
-                    class="font-bold whitespace-nowrap overflow-hidden text-ellipsis max-w-[8ch]"
+                    class="font-bold whitespace-nowrap overflow-hidden text-ellipsis max-w-[10rem]"
                     :title="`${ethers.utils.formatEther(
                       activity.transaction.amount
                     )} ${rpcStore.currency}`"
@@ -325,7 +314,7 @@ function canShowDropdown(activity: Activity) {
                 <div class="flex justify-between">
                   <span>Gas Price</span>
                   <span
-                    class="whitespace-nowrap overflow-hidden text-ellipsis max-w-[8ch]"
+                    class="whitespace-nowrap overflow-hidden text-ellipsis max-w-[10rem]"
                     :title="`${getAmount(
                       activity.transaction.gasPrice,
                       true
@@ -337,12 +326,10 @@ function canShowDropdown(activity: Activity) {
                   >
                 </div>
               </div>
-              <div
-                class="flex justify-between py-4 border-solid border-x-0 border-y-[1px] tab-view-border-color text-base font-bold leading-5"
-              >
+              <div class="flex justify-between mt-4 font-bold text-base">
                 <span>Total:</span>
                 <span
-                  class="whitespace-nowrap overflow-hidden text-ellipsis max-w-[8ch]"
+                  class="whitespace-nowrap overflow-hidden text-ellipsis max-w-[10rem]"
                   :class="
                     activity.operation === 'Receive'
                       ? 'color-state-green'
@@ -360,7 +347,7 @@ function canShowDropdown(activity: Activity) {
         </div>
         <div
           v-if="explorerUrl && activity.txHash"
-          class="flex justify-center my-5"
+          class="flex justify-center mt-4"
         >
           <a
             :href="`${explorerUrl}/tx/${activity.txHash}`"
@@ -377,7 +364,7 @@ function canShowDropdown(activity: Activity) {
       </div>
     </li>
   </ul>
-  <div v-else class="flex justify-center text-center">
+  <div v-else class="flex justify-center text-center text-sm text-gray-100">
     You have no transactions
   </div>
 </template>
diff --git a/src/services/nft.service.ts b/src/services/nft.service.ts
index 1a0bf7a1..0edcd59c 100644
--- a/src/services/nft.service.ts
+++ b/src/services/nft.service.ts
@@ -46,6 +46,8 @@ const ANKR_BLOCKCHAIN_TO_CHAIN_ID = new Map([
   ['syscoin', 57],
 ])
 
+console.log(process.env.VUE_APP_ANKR_PREMIUM_API_URL)
+
 class NFTDB {
   private readonly storage: StorageWrapper
   private readonly walletAddress: string

From 5273049328a2354f7592f07ae91a9d53395bb9a1 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 1 Jun 2023 19:24:17 +0530
Subject: [PATCH 095/153] Update requests screen

---
 src/App.vue                                | 11 ++-
 src/components/AssetsView.vue              |  5 --
 src/components/ChainListModal.vue          |  1 -
 src/components/SendTokensPreview.vue       |  2 -
 src/components/SendTransaction.vue         | 57 +++++++---------
 src/components/SendTransactionCompact.vue  | 57 ++++++++--------
 src/components/SignMessage.vue             | 43 ++++++------
 src/components/SignMessageCompact.vue      | 38 +++++++----
 src/components/VJsonViewer.vue             | 79 +++++++++++++++++++---
 src/components/signMessageAdvancedInfo.vue | 29 ++------
 src/pages/RequestsScreen.vue               | 26 +++----
 src/pages/loggedInView.vue                 |  3 -
 src/services/nft.service.ts                |  2 -
 src/store/app.ts                           |  8 ++-
 14 files changed, 195 insertions(+), 166 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 4d35c19c..60aca533 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -69,6 +69,10 @@ watch(showRequestPage, (newValue) => {
   }
 })
 
+watch(requestStore.pendingRequests, () => {
+  setIframeStyle()
+})
+
 const showFooter = computed(() => {
   return (
     (!['requests', 'MFARequired', 'MFARestore', 'SendTokens'].includes(
@@ -97,9 +101,14 @@ function onClickOfHeader() {
           <img v-else :src="getImage('collapse-arrow.svg')" />
         </button>
       </div>
-      <WalletHeader />
+      <WalletHeader v-if="route.name !== 'requests'" />
       <div class="flex-grow wallet__container m-1 p-3">
         <RouterView class="flex-grow" />
+        <img
+          v-if="route.name === 'requests'"
+          :src="getImage('secured-by-arcana.svg')"
+          class="h-3 select-none mt-5"
+        />
         <BaseModal v-if="modal.show" />
       </div>
       <WalletFooter v-if="showFooter" />
diff --git a/src/components/AssetsView.vue b/src/components/AssetsView.vue
index eeba7a5c..6ed533e2 100644
--- a/src/components/AssetsView.vue
+++ b/src/components/AssetsView.vue
@@ -27,7 +27,6 @@ function fetchStoredAssetContracts(): AssetContract[] {
       rpcStore.selectedRPCConfig?.chainId
     )}/asset-contracts`
   )
-  console.log(assetContracts)
   if (assetContracts) {
     return JSON.parse(assetContracts) as AssetContract[]
   } else {
@@ -52,7 +51,6 @@ function fetchNativeAsset() {
 }
 
 async function getAssetsBalance() {
-  console.log('Calling get Assets balance', rpcStore.selectedRPCConfig)
   await sleep(100)
   assets.length = 0
   assets.push(fetchNativeAsset())
@@ -85,7 +83,6 @@ async function getAssetsBalance() {
 
 function updateAssetsBalance() {
   assets.forEach(async (asset) => {
-    console.log('Updating asset balance', asset)
     if (asset.address !== 'native') {
       const balance = await getTokenBalance({
         walletAddress: userStore.walletAddress,
@@ -106,12 +103,10 @@ function isNative(asset: Asset) {
 }
 
 onMounted(async () => {
-  console.log('Assets view mounted')
   await getAssetsBalance()
 })
 
 onBeforeUnmount(() => {
-  console.log("Assets view's unmounted")
   clearInterval(assetsPolling)
 })
 
diff --git a/src/components/ChainListModal.vue b/src/components/ChainListModal.vue
index 8dfefe85..b2fd6ff7 100644
--- a/src/components/ChainListModal.vue
+++ b/src/components/ChainListModal.vue
@@ -14,7 +14,6 @@ const selectedRPCConfig = ref(rpcStore.selectedRPCConfig)
 watch(
   () => selectedRPCConfig.value,
   () => {
-    console.log('setting selected rpc config')
     rpcStore.setSelectedRPCConfig(selectedRPCConfig.value)
     emit('close')
   }
diff --git a/src/components/SendTokensPreview.vue b/src/components/SendTokensPreview.vue
index 20289193..85d32f35 100644
--- a/src/components/SendTokensPreview.vue
+++ b/src/components/SendTokensPreview.vue
@@ -18,10 +18,8 @@ const props = defineProps({
 
 const nativeCurrency = rpcStore.nativeCurrency.symbol
 
-console.log(props.previewData)
 const txFees =
   Number(props.previewData.gasFee) * Number(props.previewData.estimatedGas)
-console.log(txFees)
 
 function truncateAddress(address: string) {
   return `${address.slice(0, 5)}....${address.slice(-5)}`
diff --git a/src/components/SendTransaction.vue b/src/components/SendTransaction.vue
index 8e442861..6df2010d 100644
--- a/src/components/SendTransaction.vue
+++ b/src/components/SendTransaction.vue
@@ -92,48 +92,37 @@ function handleSetGasPrice(value) {
     @approve="emits('approve')"
     @reject="emits('reject')"
   />
-  <div v-else class="flex flex-1 flex-col space-y-4 sm:space-y-3">
+  <div v-else class="card p-4 flex flex-1 flex-col gap-4">
     <div class="flex flex-col space-y-2">
-      <div class="flex justify-between">
-        <p class="text-xl sm:text-sm font-semibold">Send Transaction</p>
-      </div>
-      <p class="text-xs text-zinc-400">
-        {{ appStore.name }} requests your permission to send this transaction to
-        the {{ rpcStore.selectedRpcConfig?.chainName }}. Please specify gas
-        while submitting the transaction.
-      </p>
-    </div>
-    <div class="space-y-1">
-      <p class="text-xs text-zinc-400">Network</p>
-      <p class="text-base sm:text-sm flex gap-2">
-        <!-- <img
-          :src="getImage(rpcStore.selectedRpcConfig.favicon)"
-          class="w-6 h-6"
-        /> -->
-        {{ rpcStore.selectedRpcConfig?.chainName }}
-      </p>
-    </div>
-    <div class="space-y-1">
-      <label
-        class="text-xs text-zinc-400 font-semibold"
-        for="recipientWalletAddress"
-      >
-        Origin
-      </label>
-      <p
-        class="max-w-full truncate text-base sm:text-sm text-zinc-400 rounded-lg p-3 sm:p-1 bg-gradient"
-      >
-        {{ request.request.params[0].from }}
+      <p class="text-lg text-center font-bold flex-grow">Send Transaction</p>
+      <p class="text-xs text-gray-100 text-center">
+        The application “{{ appStore.name }}” is requesting your permission to
+        send this transaction to {{ rpcStore.selectedRpcConfig?.chainName }}. Do
+        you approve the transaction?
       </p>
     </div>
+    <SignMessageAdvancedInfo
+      :info="advancedInfo(request.request.method, request.request.params[0])"
+    />
     <GasPrice
       :gas-price="customGasPrice"
       :gas-prices="gasPrices"
       :base-fee="baseFee"
       @gas-price-input="handleSetGasPrice"
     />
-    <SignMessageAdvancedInfo
-      :info="advancedInfo(request.request.method, request.request.params[0])"
-    />
+    <div class="mt-auto flex gap-2">
+      <button
+        class="btn-secondary p-2 uppercase w-full text-sm font-bold"
+        @click="emits('reject')"
+      >
+        Reject
+      </button>
+      <button
+        class="btn-primary p-2 uppercase w-full text-sm font-bold"
+        @click="emits('approve')"
+      >
+        Approve
+      </button>
+    </div>
   </div>
 </template>
diff --git a/src/components/SendTransactionCompact.vue b/src/components/SendTransactionCompact.vue
index 476d1e2b..78f127ac 100644
--- a/src/components/SendTransactionCompact.vue
+++ b/src/components/SendTransactionCompact.vue
@@ -37,7 +37,7 @@ async function setHeight() {
     ?.promise
   await parentConnectionInstance?.setIframeStyle({
     ...appStore.iframeStyle(),
-    height: '275px',
+    height: '300px',
   })
 }
 
@@ -49,38 +49,41 @@ function getGasPriceInfo() {
 </script>
 
 <template>
-  <div
-    class="flex flex-1 flex-col h-full space-y-2 rounded-b-xl justify-between"
-  >
-    <div class="flex items-baseline">
-      <h1 class="flex-1 m-0 font-semibold text-base sm:text-sm capitalize">
-        Send Transaction
-      </h1>
-      <DateTime :datetime="request.receivedTime" />
+  <div class="card p-4 flex flex-col h-full gap-4 justify-between">
+    <div class="flex flex-col gap-2">
+      <div class="flex items-center justify-center">
+        <h1 class="m-0 font-bold text-lg capitalize">Send Transaction</h1>
+      </div>
+      <p class="text-xs text-gray-100 text-center">
+        The application “{{ appStore.name }}” is requesting your permission to
+        send this transaction to {{ rpcStore.selectedRpcConfig?.chainName }}. Do
+        you approve the transaction?
+      </p>
     </div>
-    <p class="text-xs text-zinc-400">
-      {{ appStore.name }} requests your permission to send this transaction to
-      the {{ rpcStore.selectedRpcConfig?.chainName }}. Please specify gas while
-      submitting the transaction.
-    </p>
     <div class="flex-1">
-      <div class="flex flex-col justify-between">
-        <div class="space-x-1 flex items-baseline">
-          <span class="text-xs text-zinc-400">Gas Fees</span>
-          <div class="space-x-1">
-            <span class="sm:text-xs">{{ gasFee }}</span>
-            <span class="text-xs">{{ GAS_FEE_UNIT }}</span>
+      <div class="flex justify-center">
+        <div class="flex justify-center gap-2 items-baseline">
+          <span class="text-sm text-gray-100">Gas Fees</span>
+          <div class="flex gap-1 items-baseline">
+            <span class="text-lg font-bold">{{ gasFee }}</span>
+            <span class="text-sm">{{ GAS_FEE_UNIT }}</span>
           </div>
         </div>
-        <div class="space-x-1">
-          <span class="text-xs text-zinc-400">Transaction Time:</span>
-          <span class="text-xs"> ~{{ transactionTime }} mins </span>
-        </div>
       </div>
     </div>
-    <div class="flex justify-end space-x-2 text-sm">
-      <button class="uppercase" @click="emits('reject')">Reject</button>
-      <button class="uppercase" @click="emits('approve')">Approve</button>
+    <div class="flex gap-2 text-sm font-bold">
+      <button
+        class="uppercase w-full btn-secondary p-2"
+        @click="emits('reject')"
+      >
+        Reject
+      </button>
+      <button
+        class="uppercase w-full btn-primary p-2"
+        @click="emits('approve')"
+      >
+        Approve
+      </button>
     </div>
   </div>
 </template>
diff --git a/src/components/SignMessage.vue b/src/components/SignMessage.vue
index 428f8c8e..086d71ca 100644
--- a/src/components/SignMessage.vue
+++ b/src/components/SignMessage.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { storeToRefs } from 'pinia'
 
-import DateTime from '@/components/DateTime.vue'
 import SignMessageAdvancedInfo from '@/components/signMessageAdvancedInfo.vue'
 import SignMessageCompact from '@/components/SignMessageCompact.vue'
 import type { Request } from '@/models/Connection'
@@ -47,34 +46,32 @@ function getTitle(requestMethod: string) {
     @approve="emits('approve')"
     @reject="emits('reject')"
   />
-  <div v-else class="flex flex-1 flex-col space-y-4 sm:space-y-3">
-    <div class="flex items-baseline">
-      <h1 class="flex-1 m-0 font-semibold text-xl sm:text-sm capitalize">
+  <div v-else class="card flex flex-1 flex-col gap-4 p-4">
+    <div class="flex flex-col">
+      <h1 class="flex-1 m-0 font-bold text-lg text-center capitalize">
         {{ getTitle(methodAndAction[request.request.method]) }}
       </h1>
-      <DateTime :datetime="request.receivedTime" />
-    </div>
-    <p class="font-normal text-sm sm:text-xs">
-      {{ appStore.name }} requests your permission to perform the following
-      action:
-    </p>
-    <div>
-      <p class="text-sm sm:text-xs text-zinc-400 font-semibold">Network</p>
-      <p class="text-base sm:text-sm flex gap-2">
-        <!-- <img
-          :src="getImage(rpcStore.selectedRpcConfig.favicon)"
-          class="w-6 h-6"
-        /> -->
-        {{ selectedRpcConfig.chainName }}
+      <p class="text-xs text-gray-100 text-center">
+        {{ appStore.name }} requests your permission for
+        {{ methodAndAction[request.request.method] }}
       </p>
     </div>
-    <p
-      class="flex items-center justify-center h-[80px] text-base sm:text-xs font-semibold text-center rounded-[10px] bg-gradient"
-    >
-      {{ methodAndAction[request.request.method] }}
-    </p>
     <SignMessageAdvancedInfo
       :info="advancedInfo(request.request.method, request.request.params)"
     />
+    <div class="mt-auto flex gap-2">
+      <button
+        class="btn-secondary p-2 uppercase w-full text-sm font-bold"
+        @click="emits('reject')"
+      >
+        Reject
+      </button>
+      <button
+        class="btn-primary p-2 uppercase w-full text-sm font-bold"
+        @click="emits('approve')"
+      >
+        Approve
+      </button>
+    </div>
   </div>
 </template>
diff --git a/src/components/SignMessageCompact.vue b/src/components/SignMessageCompact.vue
index 2844d962..453599c7 100644
--- a/src/components/SignMessageCompact.vue
+++ b/src/components/SignMessageCompact.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import DateTime from '@/components/DateTime.vue'
 import type { Request } from '@/models/Connection'
 import { useAppStore } from '@/store/app'
 import { methodAndAction } from '@/utils/method'
@@ -42,20 +41,31 @@ function getPermissionText(method, request) {
 </script>
 
 <template>
-  <div class="flex flex-1 flex-col space-y-2 rounded-b-xl">
-    <div class="flex items-baseline">
-      <h1 class="flex-1 m-0 font-semibold text-base sm:text-sm capitalize">
-        {{ getTitle(methodAndAction[request.request.method]) }}
-      </h1>
-      <DateTime :datetime="request.receivedTime" />
+  <div class="card p-4 flex flex-col gap-8">
+    <div class="flex flex-col gap-1">
+      <div class="flex items-center justify-center">
+        <h1 class="m-0 font-bold text-lg capitalize">
+          {{ getTitle(methodAndAction[request.request.method]) }}
+        </h1>
+      </div>
+      <p class="text-sm text-center">
+        {{ appStore.name }} requests your permission for
+        {{ getPermissionText(request.request.method, request.request) }}
+      </p>
     </div>
-    <p class="font-normal text-sm sm:text-xs">
-      {{ appStore.name }} requests your permission for
-      {{ getPermissionText(request.request.method, request.request) }}
-    </p>
-    <div class="flex justify-end space-x-2 text-sm">
-      <button class="uppercase" @click="emits('reject')">Reject</button>
-      <button class="uppercase" @click="emits('approve')">Approve</button>
+    <div class="flex justify-end gap-4 text-sm font-bold">
+      <button
+        class="uppercase btn-secondary w-full p-2"
+        @click="emits('reject')"
+      >
+        Reject
+      </button>
+      <button
+        class="uppercase btn-primary w-full p-2"
+        @click="emits('approve')"
+      >
+        Approve
+      </button>
     </div>
   </div>
 </template>
diff --git a/src/components/VJsonViewer.vue b/src/components/VJsonViewer.vue
index 35ef7461..4cead32b 100644
--- a/src/components/VJsonViewer.vue
+++ b/src/components/VJsonViewer.vue
@@ -1,24 +1,77 @@
 <script setup lang="ts">
+import { computed } from 'vue'
+
 type ViewerProps = {
   value: string | JSON
 }
 
-defineProps<ViewerProps>()
+const props = defineProps<ViewerProps>()
+
+const jsonValue = computed(() => {
+  if (typeof props.value === 'string') {
+    return JSON.parse(props.value)
+  }
+  if (props.value instanceof Array) {
+    return props.value[0]
+  }
+  return props.value
+})
+
+const propKeys = Object.keys(jsonValue.value)
+
+function isArray(value: any) {
+  if (value instanceof Array) {
+    return true
+  }
+  return false
+}
+
+function hasObject(value: any) {
+  if (typeof value === 'object') {
+    return true
+  }
+  return false
+}
+
+function isString(value: any) {
+  if (typeof value === 'string') {
+    return true
+  }
+  return false
+}
 </script>
 
 <template>
-  <json-viewer
-    :value="value"
-    :expand-depth="3"
-    theme="json-viewer"
-  ></json-viewer>
+  <div class="flex flex-col">
+    <div v-for="propKey in propKeys" :key="propKey" class="json-viewer">
+      <span class="jv-key">{{ propKey }}:</span>
+      <div v-if="isArray(jsonValue[propKey])" class="flex flex-col">
+        <div
+          v-for="val in jsonValue[propKey]"
+          :key="JSON.stringify(val)"
+          class="ml-4"
+        >
+          <span v-if="isString(val)" class="jv-push">"{{ val }}"</span>
+          <VJsonViewer v-else :value="val" />
+        </div>
+      </div>
+      <div v-else-if="hasObject(jsonValue[propKey])">
+        <div class="ml-4">
+          <VJsonViewer :value="jsonValue[propKey]" />
+        </div>
+      </div>
+      <span v-else class="jv-string jv-push ml-1">{{
+        isString(jsonValue[propKey])
+          ? `"${jsonValue[propKey]}"`
+          : jsonValue[propKey]
+      }}</span>
+    </div>
+  </div>
 </template>
 
 <style>
 .json-viewer {
-  font-size: var(--fs-300);
-  font-weight: 400;
-  background: transparent;
+  font-size: 10px;
 }
 
 .jv-code {
@@ -26,11 +79,15 @@ defineProps<ViewerProps>()
 }
 
 .jv-key {
-  color: var(--fg-color);
+  color: #05c168;
 }
 
 .jv-push {
-  color: var(--fg-color);
+  color: #3e9aff;
+}
+
+.jv-gap {
+  margin-left: 4px;
 }
 
 .jv-string {
diff --git a/src/components/signMessageAdvancedInfo.vue b/src/components/signMessageAdvancedInfo.vue
index c8adaff9..8ccd6336 100644
--- a/src/components/signMessageAdvancedInfo.vue
+++ b/src/components/signMessageAdvancedInfo.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import VJsonViewer from '@/components/VJsonViewer.vue'
 
-defineProps({
+const props = defineProps({
   info: {
     type: Object,
     required: true,
@@ -10,28 +10,9 @@ defineProps({
 </script>
 
 <template>
-  <div class="sign__message-advanced-info debossed-card">
-    <div class="sign__message-advanced-info-container">
-      <VJsonViewer :value="info"></VJsonViewer>
-    </div>
+  <div
+    class="bg-black-100 p-4 break-word rounded-md overflow-hidden break-words"
+  >
+    <VJsonViewer :value="info"></VJsonViewer>
   </div>
 </template>
-
-<style scoped>
-.sign__message-advanced-info {
-  max-height: 300px;
-  padding: var(--p-500) var(--p-400);
-  overflow: auto;
-}
-
-.sign__message-advanced-info-label {
-  margin: 0;
-  margin-bottom: 5px;
-  font-size: var(--fs-300);
-  font-weight: 600;
-}
-
-.sign__message-advanced-info-container {
-  margin-bottom: 10px;
-}
-</style>
diff --git a/src/pages/RequestsScreen.vue b/src/pages/RequestsScreen.vue
index 245d47e7..53f62609 100644
--- a/src/pages/RequestsScreen.vue
+++ b/src/pages/RequestsScreen.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { toRefs } from 'vue'
+import { toRefs, watch } from 'vue'
 import { useToast } from 'vue-toastification'
 import Popper from 'vue3-popper'
 
@@ -7,6 +7,7 @@ import ChargeInfo from '@/components/ChargeInfo.vue'
 import SendTransaction from '@/components/SendTransaction.vue'
 import SignMessage from '@/components/SignMessage.vue'
 import SignMessageNoRequests from '@/components/signMessageNoRequests.vue'
+import { router } from '@/routes'
 import { useAppStore } from '@/store/app'
 import { useRequestStore } from '@/store/request'
 import { useRpcStore } from '@/store/rpc'
@@ -49,6 +50,12 @@ const isSendTransactionRequest = (requestId) => {
 function handleGasPriceInput({ value, requestId }) {
   requestStore.setGasFee(value, requestId)
 }
+
+watch(areRequestsPendingForApproval, () => {
+  if (!areRequestsPendingForApproval.value) {
+    router.push({ name: 'home' })
+  }
+})
 </script>
 
 <template>
@@ -93,23 +100,6 @@ function handleGasPriceInput({ value, requestId }) {
         </div>
       </div>
     </div>
-    <div
-      v-if="pendingRequest && !appStore.compactMode"
-      class="sign__message-button-container flex justify-around -m-4 mt-0 p-4"
-    >
-      <button
-        class="sign__message-button-reject uppercase"
-        @click="onRejectClick(pendingRequest.request.id)"
-      >
-        Reject
-      </button>
-      <button
-        class="sign__message-button-approve uppercase"
-        @click="onApproveClick(pendingRequest.request.id)"
-      >
-        Approve
-      </button>
-    </div>
   </div>
   <SignMessageNoRequests v-else />
 </template>
diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index 169404bf..1b13182f 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -222,10 +222,7 @@ async function handleLogout() {
   }
 }
 
-let indexi = 0
-
 async function setRpcConfigs() {
-  console.log('setRpcConfigs', ++indexi)
   const { chains } = await getEnabledChainList(appStore.id)
   enabledChainList.value = chains.map((chain) => ({
     chainId: chain.chain_id,
diff --git a/src/services/nft.service.ts b/src/services/nft.service.ts
index 0edcd59c..1a0bf7a1 100644
--- a/src/services/nft.service.ts
+++ b/src/services/nft.service.ts
@@ -46,8 +46,6 @@ const ANKR_BLOCKCHAIN_TO_CHAIN_ID = new Map([
   ['syscoin', 57],
 ])
 
-console.log(process.env.VUE_APP_ANKR_PREMIUM_API_URL)
-
 class NFTDB {
   private readonly storage: StorageWrapper
   private readonly walletAddress: string
diff --git a/src/store/app.ts b/src/store/app.ts
index f68fb0be..a8e98508 100644
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -3,6 +3,7 @@ import { defineStore } from 'pinia'
 
 import type { SDKVersion } from '@/models/Connection'
 import type { Theme } from '@/models/Theme'
+import { useRequestStore } from '@/store/request'
 import { isMobileViewport } from '@/utils/isMobileViewport'
 
 type WalletPosition = 'right' | 'left'
@@ -46,12 +47,17 @@ export const useAppStore = defineStore('app', {
       compactMode,
     }) => {
       return function getCompatibleStyles() {
+        const requestStore = useRequestStore()
         const mobileViewport = isMobileViewport()
         const style: Partial<CSSStyleDeclaration> = {}
+
         style.height = showWallet
           ? expandWallet
             ? compactMode
-              ? '200px'
+              ? requestStore.pendingRequest?.request.method ===
+                'eth_sendTransaction'
+                ? '300px'
+                : '260px'
               : '80vh'
             : '20px'
           : '0'

From 692729be837a810ee650bfb0a08adcb1eaa50cc0 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 1 Jun 2023 19:44:41 +0530
Subject: [PATCH 096/153] Show message if string

---
 src/components/SendTransaction.vue |  9 ++++--
 src/components/SignMessage.vue     |  9 ++++--
 src/components/VJsonViewer.vue     | 51 ++++++++++++++++++------------
 3 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/src/components/SendTransaction.vue b/src/components/SendTransaction.vue
index 6df2010d..02fdd010 100644
--- a/src/components/SendTransaction.vue
+++ b/src/components/SendTransaction.vue
@@ -101,9 +101,12 @@ function handleSetGasPrice(value) {
         you approve the transaction?
       </p>
     </div>
-    <SignMessageAdvancedInfo
-      :info="advancedInfo(request.request.method, request.request.params[0])"
-    />
+    <div class="flex flex-col gap-1">
+      <div class="text-sm">Message</div>
+      <SignMessageAdvancedInfo
+        :info="advancedInfo(request.request.method, request.request.params[0])"
+      />
+    </div>
     <GasPrice
       :gas-price="customGasPrice"
       :gas-prices="gasPrices"
diff --git a/src/components/SignMessage.vue b/src/components/SignMessage.vue
index 086d71ca..7200aa20 100644
--- a/src/components/SignMessage.vue
+++ b/src/components/SignMessage.vue
@@ -56,9 +56,12 @@ function getTitle(requestMethod: string) {
         {{ methodAndAction[request.request.method] }}
       </p>
     </div>
-    <SignMessageAdvancedInfo
-      :info="advancedInfo(request.request.method, request.request.params)"
-    />
+    <div class="flex flex-col gap-1">
+      <div class="text-sm">Message</div>
+      <SignMessageAdvancedInfo
+        :info="advancedInfo(request.request.method, request.request.params)"
+      />
+    </div>
     <div class="mt-auto flex gap-2">
       <button
         class="btn-secondary p-2 uppercase w-full text-sm font-bold"
diff --git a/src/components/VJsonViewer.vue b/src/components/VJsonViewer.vue
index 4cead32b..2b375101 100644
--- a/src/components/VJsonViewer.vue
+++ b/src/components/VJsonViewer.vue
@@ -7,9 +7,15 @@ type ViewerProps = {
 
 const props = defineProps<ViewerProps>()
 
+console.log(props)
+
 const jsonValue = computed(() => {
   if (typeof props.value === 'string') {
-    return JSON.parse(props.value)
+    try {
+      return JSON.parse(props.value)
+    } catch (e) {
+      return props.value
+    }
   }
   if (props.value instanceof Array) {
     return props.value[0]
@@ -43,28 +49,33 @@ function isString(value: any) {
 
 <template>
   <div class="flex flex-col">
-    <div v-for="propKey in propKeys" :key="propKey" class="json-viewer">
-      <span class="jv-key">{{ propKey }}:</span>
-      <div v-if="isArray(jsonValue[propKey])" class="flex flex-col">
-        <div
-          v-for="val in jsonValue[propKey]"
-          :key="JSON.stringify(val)"
-          class="ml-4"
-        >
-          <span v-if="isString(val)" class="jv-push">"{{ val }}"</span>
-          <VJsonViewer v-else :value="val" />
+    <div v-if="isString(jsonValue)" class="jv-push json-viewer">
+      {{ jsonValue }}
+    </div>
+    <div v-else class="flex flex-col">
+      <div v-for="propKey in propKeys" :key="propKey" class="json-viewer">
+        <span class="jv-key">{{ propKey }}:</span>
+        <div v-if="isArray(jsonValue[propKey])" class="flex flex-col">
+          <div
+            v-for="val in jsonValue[propKey]"
+            :key="JSON.stringify(val)"
+            class="ml-4"
+          >
+            <span v-if="isString(val)" class="jv-push">"{{ val }}"</span>
+            <VJsonViewer v-else :value="val" />
+          </div>
         </div>
-      </div>
-      <div v-else-if="hasObject(jsonValue[propKey])">
-        <div class="ml-4">
-          <VJsonViewer :value="jsonValue[propKey]" />
+        <div v-else-if="hasObject(jsonValue[propKey])">
+          <div class="ml-4">
+            <VJsonViewer :value="jsonValue[propKey]" />
+          </div>
         </div>
+        <span v-else class="jv-string jv-push ml-1">{{
+          isString(jsonValue[propKey])
+            ? `"${jsonValue[propKey]}"`
+            : jsonValue[propKey]
+        }}</span>
       </div>
-      <span v-else class="jv-string jv-push ml-1">{{
-        isString(jsonValue[propKey])
-          ? `"${jsonValue[propKey]}"`
-          : jsonValue[propKey]
-      }}</span>
     </div>
   </div>
 </template>

From e6a43f9f46c0706d5513809775bd3033fa46093c Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 1 Jun 2023 19:59:16 +0530
Subject: [PATCH 097/153] Hide collapse in widget mode

---
 src/App.vue | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 60aca533..81f6b03b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -87,6 +87,17 @@ function onClickOfHeader() {
   if (app.compactMode) app.compactMode = false
   else app.expandWallet = false
 }
+
+function canShowCollapseButton() {
+  if (
+    app.validAppMode === AppMode.Widget &&
+    !app.compactMode &&
+    requestStore.areRequestsPendingForApproval
+  ) {
+    return false
+  }
+  return true
+}
 </script>
 
 <template>
@@ -96,7 +107,11 @@ function onClickOfHeader() {
       class="flex flex-col h-full bg-white-300 dark:bg-black-300 overflow-hidden"
     >
       <div class="flex justify-center mt-2 mb-2">
-        <button class="flex flex-grow justify-center" @click="onClickOfHeader">
+        <button
+          v-if="canShowCollapseButton()"
+          class="flex flex-grow justify-center"
+          @click="onClickOfHeader"
+        >
           <img v-if="compactMode" :src="getImage('expand-arrow.svg')" />
           <img v-else :src="getImage('collapse-arrow.svg')" />
         </button>

From 8f4c1a916d8da12c1982d142c11b9fe697ba6347 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 1 Jun 2023 20:01:18 +0530
Subject: [PATCH 098/153] Add z-index to wallet button so error message doesn't
 show on top

---
 src/App.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 81f6b03b..3412968f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -130,7 +130,8 @@ function canShowCollapseButton() {
     </div>
     <div
       v-show="showWalletButton"
-      class="h-full bg-white-300 dark:bg-black-300"
+      class="relative h-full bg-white-300 dark:bg-black-300"
+      style="z-index: 999999999"
     >
       <WalletButton />
     </div>

From ce067969c3e01fc58e9f50eade79cb98ecd95fd1 Mon Sep 17 00:00:00 2001
From: mmjee <root@git.maharshi.ninja>
Date: Fri, 2 Jun 2023 17:14:15 +0530
Subject: [PATCH 099/153] Wallet UI changes (direct token-based authentication)
 (#333)

* A new method to authenticate directly via provided tokens

* Move functions to signInV2

* store userinfo and redirect after successful login

* remove firebase from available login types

* filter out firebase while fetching

* Fixes

---------

Co-authored-by: karthikdurai <iamkarthiksiddarth@gmail.com>
---
 package-lock.json               | 30 +++++++++--------
 src/pages/backCompat/signIn.vue |  4 ++-
 src/pages/initPageV2.vue        |  2 +-
 src/pages/signInV2.vue          | 57 ++++++++++++++++++++++++++++++++-
 src/store/user.ts               |  1 +
 5 files changed, 78 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ff8f5fef..2a9d271e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "@arcana/auth": "^0.1.3",
-        "@arcana/auth-core": "^1.0.0-beta.6",
+        "@arcana/auth-core": "^1.0.0-beta.7",
         "@arcana/key-helper": "^1.0.0-beta.7",
         "@ethereumjs/tx": "^3.4.0",
         "@fontsource/montserrat": "^4.5.14",
@@ -122,9 +122,9 @@
       }
     },
     "node_modules/@arcana/auth-core": {
-      "version": "1.0.0-beta.6",
-      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.6.tgz",
-      "integrity": "sha512-EOkq0Iot+F8LeJ4UvAaQ3Wsc1Wry1UO4MP9mPEAaSYphv4pSyl21UWsPcVf17WVUTol5KPPRvjU9OXKyxiwRLQ==",
+      "version": "1.0.0-beta.7",
+      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.7.tgz",
+      "integrity": "sha512-+W0izQ/onZnsnffe1W/7nBfyiIrSDNP8bkJ/9WhgBM0EJh00KNJ4MT9aSf4v7Y5KEsJRFF6mPrENjItf2i7mVA==",
       "dependencies": {
         "@arcana/keystore": "^1.0.0",
         "@stablelib/base64": "^1.0.1",
@@ -6018,9 +6018,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001378",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001378.tgz",
-      "integrity": "sha512-JVQnfoO7FK7WvU4ZkBRbPjaot4+YqxogSDosHv0Hv5mWpUESmN+UubMU6L/hGz8QlQ2aY5U0vR6MOs6j/CXpNA==",
+      "version": "1.0.30001492",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001492.tgz",
+      "integrity": "sha512-2efF8SAZwgAX1FJr87KWhvuJxnGJKOnctQa8xLOskAXNXq8oiuqgl6u1kk3fFpsp3GgvzlRjiK1sl63hNtFADw==",
       "dev": true,
       "funding": [
         {
@@ -6030,6 +6030,10 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ]
     },
@@ -18925,9 +18929,9 @@
       }
     },
     "@arcana/auth-core": {
-      "version": "1.0.0-beta.6",
-      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.6.tgz",
-      "integrity": "sha512-EOkq0Iot+F8LeJ4UvAaQ3Wsc1Wry1UO4MP9mPEAaSYphv4pSyl21UWsPcVf17WVUTol5KPPRvjU9OXKyxiwRLQ==",
+      "version": "1.0.0-beta.7",
+      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.7.tgz",
+      "integrity": "sha512-+W0izQ/onZnsnffe1W/7nBfyiIrSDNP8bkJ/9WhgBM0EJh00KNJ4MT9aSf4v7Y5KEsJRFF6mPrENjItf2i7mVA==",
       "requires": {
         "@arcana/keystore": "^1.0.0",
         "@stablelib/base64": "^1.0.1",
@@ -23239,9 +23243,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001378",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001378.tgz",
-      "integrity": "sha512-JVQnfoO7FK7WvU4ZkBRbPjaot4+YqxogSDosHv0Hv5mWpUESmN+UubMU6L/hGz8QlQ2aY5U0vR6MOs6j/CXpNA==",
+      "version": "1.0.30001492",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001492.tgz",
+      "integrity": "sha512-2efF8SAZwgAX1FJr87KWhvuJxnGJKOnctQa8xLOskAXNXq8oiuqgl6u1kk3fFpsp3GgvzlRjiK1sl63hNtFADw==",
       "dev": true
     },
     "case-sensitive-paths-webpack-plugin": {
diff --git a/src/pages/backCompat/signIn.vue b/src/pages/backCompat/signIn.vue
index f149e3ef..8918100d 100644
--- a/src/pages/backCompat/signIn.vue
+++ b/src/pages/backCompat/signIn.vue
@@ -70,7 +70,9 @@ onUnmounted(cleanup)
 let authProvider: AuthProvider | null = null
 
 async function fetchAvailableLogins(authProvider: AuthProvider) {
-  return await authProvider.getAvailableLogins()
+  return (await authProvider.getAvailableLogins()).filter(
+    (item) => item !== 'firebase'
+  )
 }
 
 function storeUserInfoAndRedirect(userInfo: GetInfoOutput) {
diff --git a/src/pages/initPageV2.vue b/src/pages/initPageV2.vue
index 2a91b37b..7f81a6e4 100644
--- a/src/pages/initPageV2.vue
+++ b/src/pages/initPageV2.vue
@@ -52,7 +52,7 @@ async function init() {
     const parentConnectionInstance = await parentConnection.promise
 
     if (user.isLoggedIn) {
-      parentConnectionInstance.error(
+      await parentConnectionInstance.error(
         'User is already logged in! Redirecting back to app in 3'
       )
     } else {
diff --git a/src/pages/signInV2.vue b/src/pages/signInV2.vue
index 83e83dc1..77a20957 100644
--- a/src/pages/signInV2.vue
+++ b/src/pages/signInV2.vue
@@ -39,6 +39,10 @@ const disableSendLinkBtn = computed(() => {
 const LOGINS_FETCHING_ERROR_TEXT = `No logins configured. If you are the app admin, please configure login
 providers on the developer dashboard.`
 
+enum BearerAuthentication {
+  firebase = 'firebase',
+}
+
 const {
   params: {
     value: { appId },
@@ -77,6 +81,7 @@ const penpalMethods = {
     availableLogins.value.includes(kind),
   getPublicKey: handleGetPublicKey,
   getAvailableLogins: () => [...availableLogins.value],
+  triggerBearerLogin: handleBearerLoginRequest,
 }
 
 const cleanup = () => {
@@ -94,7 +99,11 @@ onUnmounted(cleanup)
 let authProvider: AuthProvider | null = null
 
 async function fetchAvailableLogins(authProvider: AuthProvider) {
-  return await authProvider.getAvailableLogins()
+  return (await authProvider.getAvailableLogins()).filter(
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    (item) => item !== 'firebase'
+  )
 }
 
 async function storeUserInfoAndRedirect(
@@ -251,6 +260,52 @@ async function handleSubmit() {
   handlePasswordlessLoginRequest(userEmailInput.value)
 }
 
+async function handleBearerLoginRequest(
+  type: BearerAuthentication,
+  _data: unknown
+) {
+  // Intentionally doing this to get the KeyReconstructor out of Auth SDK (which we shouldn't expose to external users)
+  // but would be OK to use internally
+  const ap = await getAuthProvider(app.id)
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  await ap.initKeyReconstructor()
+  const kr = // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    ap.keyReconstructor
+
+  switch (type) {
+    case BearerAuthentication.firebase: {
+      const data = _data as {
+        uid: string
+        token: string
+      }
+
+      const info = await kr.getPrivateKey({
+        verifier: BearerAuthentication.firebase,
+        id: data.uid,
+        idToken: data.token,
+      })
+
+      // TODO
+      const userInfo = {
+        loginType: 'firebase',
+        hasMfa: false,
+        privateKey: info.privateKey,
+        pk: info.privateKey,
+        userInfo: {
+          id: data.uid,
+        },
+      }
+      await storeUserInfoAndRedirect(userInfo)
+
+      return true
+    }
+    default:
+      return false
+  }
+}
+
 function onEnterPress() {
   if (passwordlessForm.value.email.checkValidity()) handleSubmit()
 }
diff --git a/src/store/user.ts b/src/store/user.ts
index ed5e2b8b..39de3ed6 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -44,6 +44,7 @@ export const useUserStore = defineStore('user', {
     ): Promise<void | string> {
       return await authProvider.loginWithSocial(loginType)
     },
+
     async handlePasswordlessLogin(
       authProvider: AuthProvider,
       email: string,

From a51778f8ed8a225a8dbfd923cc51da22aee58cc0 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 2 Jun 2023 21:37:03 +0530
Subject: [PATCH 100/153] Update error message and increase toast message
 height

---
 src/App.vue                    | 6 +++---
 src/utils/constants.ts         | 2 +-
 src/utils/requestManagement.ts | 8 ++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index c4855042..5c3f53eb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -220,17 +220,17 @@ body {
 
 .Vue-Toastification__toast {
   min-height: unset !important;
-  padding: 0.5rem 1rem !important;
+  padding: 1rem !important;
   font-family: Onest, sans-serif !important;
 }
 
 .Vue-Toastification__icon {
-  width: 12px !important;
+  width: 14px !important;
   margin-right: 8px !important;
 }
 
 .Vue-Toastification__toast-body {
-  font-size: 12px !important;
+  font-size: 14px !important;
   line-height: 1.5 !important;
 }
 
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index 899c422a..81f7ef71 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -15,7 +15,7 @@ const GAS_PRICE_SPEED_MAP = {
   standard: { wait: 'avgWait', price: 'average' },
   fast: { wait: 'fastWait', price: 'fast' },
 }
-const TOAST_TIME_OUT = 2500
+const TOAST_TIME_OUT = 5000
 
 export {
   DOCS_URL,
diff --git a/src/utils/requestManagement.ts b/src/utils/requestManagement.ts
index 63525565..11d4ceed 100644
--- a/src/utils/requestManagement.ts
+++ b/src/utils/requestManagement.ts
@@ -308,9 +308,13 @@ async function processRequest({ request, isPermissionGranted }, keeper) {
       try {
         const response = await keeper.request(request)
         await keeper.reply(request.method, response)
+        console.log(response)
         if (response.error) {
-          if (response.error.data?.originalError?.code) {
-            await showToast('error', response.error.data.originalError.code)
+          if (response.error.data?.originalError) {
+            await showToast(
+              'error',
+              response.error.data.originalError.error.message
+            )
           } else {
             await showToast('error', response.error)
           }

From be470124cc6ec9725458ab960b93fe1881fa5ac9 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 2 Jun 2023 21:41:00 +0530
Subject: [PATCH 101/153] Error fallback

---
 src/utils/requestManagement.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/utils/requestManagement.ts b/src/utils/requestManagement.ts
index 11d4ceed..499d0ac8 100644
--- a/src/utils/requestManagement.ts
+++ b/src/utils/requestManagement.ts
@@ -313,7 +313,9 @@ async function processRequest({ request, isPermissionGranted }, keeper) {
           if (response.error.data?.originalError) {
             await showToast(
               'error',
-              response.error.data.originalError.error.message
+              response.error.data.originalError?.error?.message ||
+                response.error.data.originalError?.code ||
+                'Something went wrong. Please try again'
             )
           } else {
             await showToast('error', response.error)

From 4018895a8278000b6f13afac24db2aa52271b4fe Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 2 Jun 2023 22:53:28 +0530
Subject: [PATCH 102/153] Animate on notifications

---
 src/App.vue      | 51 +++++++++++++++++++++++++++++++++++++++++++++---
 src/store/app.ts |  2 +-
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 5c3f53eb..049e8ec3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -136,10 +136,24 @@ function canShowCollapseButton() {
     </div>
     <div
       v-show="showWalletButton"
-      class="relative h-full bg-white-300 dark:bg-black-300"
-      style="z-index: 999999999"
+      class="relative h-[50vh] mt-[50vh] bg-white-300 rounded-t-sm dark:bg-black-300"
+      style="z-index: 999"
+      :class="{
+        'notification-animation': requestStore.areRequestsPendingForApproval,
+      }"
     >
-      <WalletButton />
+      <WalletButton class="relative z-1" />
+      <span
+        v-if="requestStore.areRequestsPendingForApproval"
+        class="absolute -top-[15vh] right-[20vh] flex h-3 w-3"
+      >
+        <span
+          class="animate-ping absolute inline-flex h-full w-full rounded-full bg-red-300 opacity-75 duration-[4s]"
+        ></span>
+        <span
+          class="relative inline-flex rounded-full h-3 w-3 bg-red-600"
+        ></span>
+      </span>
     </div>
   </div>
   <div v-else class="flex flex-col h-full bg-white-300 dark:bg-black-300">
@@ -237,4 +251,35 @@ body {
 .Vue-Toastification__progress-bar {
   height: 2px !important;
 }
+
+.notification-animation {
+  animation: notification 2s infinite;
+}
+
+@keyframes notification {
+  0% {
+    height: 50vh;
+    margin-top: 50vh;
+  }
+
+  20% {
+    height: 85vh;
+    margin-top: 15vh;
+  }
+
+  30% {
+    height: 50vh;
+    margin-top: 50vh;
+  }
+
+  40% {
+    height: 85vh;
+    margin-top: 15vh;
+  }
+
+  100% {
+    height: 50vh;
+    margin-top: 50vh;
+  }
+}
 </style>
diff --git a/src/store/app.ts b/src/store/app.ts
index a8e98508..e6b4ee6d 100644
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -59,7 +59,7 @@ export const useAppStore = defineStore('app', {
                 ? '300px'
                 : '260px'
               : '80vh'
-            : '20px'
+            : '40px'
           : '0'
         style.width = showWallet
           ? expandWallet

From ee13baf5f6503d523a8c75fa561438efc38ad22a Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 2 Jun 2023 23:37:16 +0530
Subject: [PATCH 103/153] Fix send tokens

---
 src/components/SendNftPreview.vue    |  2 +-
 src/components/SendTokensPreview.vue |  2 +-
 src/components/SwipeToAction.vue     | 20 +++++++++++++++++---
 src/pages/SendNft.vue                | 10 +++++-----
 src/pages/SendTokens.vue             | 11 ++++++-----
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/components/SendNftPreview.vue b/src/components/SendNftPreview.vue
index 182686c8..c1c6472d 100644
--- a/src/components/SendNftPreview.vue
+++ b/src/components/SendNftPreview.vue
@@ -80,6 +80,6 @@ function truncateAddress(address: string) {
         </div>
       </div>
     </div>
-    <SwipeToAction message="Swipe to Transfer" @success="emits('submit')" />
+    <SwipeToAction @approve="emits('submit')" @reject="emits('close')" />
   </div>
 </template>
diff --git a/src/components/SendTokensPreview.vue b/src/components/SendTokensPreview.vue
index 85d32f35..e6f8ee9a 100644
--- a/src/components/SendTokensPreview.vue
+++ b/src/components/SendTokensPreview.vue
@@ -68,6 +68,6 @@ function truncateAddress(address: string) {
         </div>
       </div>
     </div>
-    <SwipeToAction message="Swipe to Transfer" @success="emits('submit')" />
+    <SwipeToAction @approve="emits('submit')" @reject="emits('close')" />
   </div>
 </template>
diff --git a/src/components/SwipeToAction.vue b/src/components/SwipeToAction.vue
index fc111e54..9d2af2d9 100644
--- a/src/components/SwipeToAction.vue
+++ b/src/components/SwipeToAction.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
 import { ref, type Ref } from 'vue'
 
-import { getImage } from '@/utils/getImage'
+// import { getImage } from '@/utils/getImage'
 
 type SwipeToActionProps = {
   message?: string
 }
 const props = defineProps<SwipeToActionProps>()
-const emit = defineEmits(['success'])
+const emit = defineEmits(['success', 'approve', 'reject'])
 const translateUntil = ref('calc(-80%)')
 const isDragging = ref(false)
 const swiperEl: Ref<HTMLDivElement | null> = ref(null)
@@ -59,7 +59,7 @@ function handleDragStart(e) {
 </script>
 
 <template>
-  <div class="bg-white-400 dark:bg-gray-300 rounded-sm p-[2px]">
+  <!-- <div class="bg-white-400 dark:bg-gray-300 rounded-sm p-[2px]">
     <div
       class="relative rounded-sm overflow-hidden"
       @touchstart="handleDragStart"
@@ -95,6 +95,20 @@ function handleDragStart(e) {
         </div>
       </div>
     </div>
+  </div> -->
+  <div class="flex gap-2 items-center">
+    <button
+      class="btn-secondary w-full uppercase p-2 text-sm font-bold"
+      @click="emit('reject')"
+    >
+      Reject
+    </button>
+    <button
+      class="btn-primary w-full uppercase p-2 text-sm font-bold"
+      @click="emit('approve')"
+    >
+      Approve
+    </button>
   </div>
 </template>
 
diff --git a/src/pages/SendNft.vue b/src/pages/SendNft.vue
index ebc098fd..2ed2882c 100644
--- a/src/pages/SendNft.vue
+++ b/src/pages/SendNft.vue
@@ -148,7 +148,7 @@ async function handleSendToken() {
       nft,
       recipientAddress: setHexPrefix(recipientWalletAddress.value),
     })
-    router.back()
+    router.push({ name: 'Nfts' })
     toast.success('Tokens sent Successfully')
   } catch (err: any) {
     if (err && err.reason) {
@@ -184,14 +184,14 @@ async function handleShowPreview() {
           1
         )
       ).toString()
+    } catch (e) {
+      console.error({ e })
+      toast.error('Cannot estimate gas fee. Please try again later.')
+    } finally {
       gasFeeInEth.value = ethers.utils
         .formatEther(ethers.utils.parseUnits(`${gasFeeInGwei.value}`, 'gwei'))
         .toString()
       showPreview.value = true
-    } catch (e) {
-      console.error({ e })
-      toast.error(e as string)
-    } finally {
       hideLoader()
     }
   } else {
diff --git a/src/pages/SendTokens.vue b/src/pages/SendTokens.vue
index 72a3c796..9190d7bd 100644
--- a/src/pages/SendTokens.vue
+++ b/src/pages/SendTokens.vue
@@ -166,7 +166,7 @@ async function handleSendToken() {
       const payload = {
         to: setHexPrefix(recipientWalletAddress.value),
         value: ethers.utils.parseEther(`${amount.value}`).toHexString(),
-        // gasPrice: gasFees,
+        gasPrice: gasFees,
         from: userStore.walletAddress,
       }
 
@@ -205,6 +205,7 @@ async function handleSendToken() {
       })
     }
     clearForm()
+    router.push({ name: 'home' })
     toast.success('Tokens sent Successfully')
   } catch (err: any) {
     if (err && err.reason) {
@@ -249,14 +250,14 @@ async function handleShowPreview() {
           `0x${Number(sendAmount).toString(16)}`
         )
       }
+    } catch (e) {
+      toast.error('Cannot estimate gas fee. Please try again later.')
+      console.error({ e })
+    } finally {
       gasFeeInEth.value = ethers.utils
         .formatEther(ethers.utils.parseUnits(`${gasFeeInGwei.value}`, 'gwei'))
         .toString()
       showPreview.value = true
-    } catch (e) {
-      toast.error(e as string)
-      console.error({ e })
-    } finally {
       hideLoader()
     }
   } else {

From ef4118540809451e6640e000232f81e7159ebd4d Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 2 Jun 2023 23:57:44 +0530
Subject: [PATCH 104/153] Update modal close state

---
 src/components/BaseModal.vue |  7 +++++--
 src/components/BuyTokens.vue | 16 ++++------------
 src/store/rpc.ts             |  2 +-
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/components/BaseModal.vue b/src/components/BaseModal.vue
index 05c4f5f4..7500d38c 100644
--- a/src/components/BaseModal.vue
+++ b/src/components/BaseModal.vue
@@ -17,9 +17,11 @@ function handleCollapse() {
 </script>
 
 <template>
-  <div class="fixed flex justify-center items-center inset-0 z-50 p-3 overlay">
+  <div
+    class="fixed flex justify-center items-center inset-0 z-50 p-3 overlay isolate"
+  >
     <div
-      class="card max-h-[90%] absolute flex flex-col pt-2 w-full rounded-b-none"
+      class="card max-h-[90%] absolute flex flex-col pt-2 w-full rounded-b-none z-20"
       :class="{ collapse: canModalCollapse }"
     >
       <div class="flex justify-center">
@@ -33,6 +35,7 @@ function handleCollapse() {
         class="p-4 overflow-y-auto"
       ></div>
     </div>
+    <div class="absolute inset-0 z-10" @click="handleCollapse"></div>
   </div>
 </template>
 
diff --git a/src/components/BuyTokens.vue b/src/components/BuyTokens.vue
index cf772fcf..887a7306 100644
--- a/src/components/BuyTokens.vue
+++ b/src/components/BuyTokens.vue
@@ -4,7 +4,6 @@ import { ref, type Ref } from 'vue'
 import AppLoader from '@/components/AppLoader.vue'
 import { openOnRampMoneyHostedUI } from '@/utils/onrampmoney.ramp'
 import { openTransak } from '@/utils/transak'
-import { useImage } from '@/utils/useImage'
 
 type BuyTokenProps = {
   transakNetwork?: string
@@ -14,7 +13,6 @@ type BuyTokenProps = {
 const props = defineProps<BuyTokenProps>()
 
 const emit = defineEmits(['close'])
-const getImage = useImage()
 const selectedProvider: Ref<'transak' | 'ramp' | 'onramp.money' | ''> = ref('')
 const isLoading = ref(false)
 const showStatusModal: Ref<'success' | 'failed' | 'cancelled' | ''> = ref('')
@@ -75,23 +73,17 @@ function handleDone() {
     <AppLoader v-if="isLoading" message="Processing..." />
     <div
       v-else-if="showStatusModal"
-      class="overflow-auto flex flex-col gap-8 justify-between p-1 pt-5"
+      class="overflow-auto flex flex-col gap-4 justify-between p-2"
     >
       <img src="@/assets/images/success.svg" class="h-16 w-16 self-center" />
-      <div class="flex flex-col gap-3">
-        <div class="modal-title font-semibold text-center">
+      <div class="flex flex-col gap-2">
+        <div class="text-base font-bold text-center">
           {{ statusText.title }}
         </div>
-        <div class="modal-description text-center">
+        <div class="text-sm text-gray-100 text-center">
           {{ statusText.message }}
         </div>
       </div>
-      <button
-        class="text-sm sm:text-xs rounded-xl text-white dark:bg-white bg-black dark:text-black h-9 sm:h-8 uppercase"
-        @click.stop="handleDone"
-      >
-        Close
-      </button>
     </div>
     <div v-else class="flex flex-col p-1">
       <div class="flex flex-col gap-3">
diff --git a/src/store/rpc.ts b/src/store/rpc.ts
index 00edbe22..bda4b8c1 100644
--- a/src/store/rpc.ts
+++ b/src/store/rpc.ts
@@ -85,7 +85,7 @@ export const useRpcStore = defineStore('rpcStore', {
     },
     isEthereumMainnet() {
       const selectedRpcConfig: RpcConfigWallet | null = this.selectedRpcConfig
-      return selectedRpcConfig?.chainId === `1`
+      return Number(selectedRpcConfig?.chainId) === 1
     },
   },
   actions: {

From 56157becda96a2fb3948ad99965582a736440522 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Sat, 3 Jun 2023 00:23:41 +0530
Subject: [PATCH 105/153] Add title to buttons

---
 src/components/AddNetwork.vue                 | 62 ++++++++++---------
 src/components/ChainListModal.vue             |  7 ++-
 src/components/ExportKeyModal.vue             |  1 +
 src/components/PinBasedRecoveryModal.vue      |  2 +-
 .../SecurityQuestionRecoveryModal.vue         |  2 +-
 src/components/SendNftPreview.vue             |  6 +-
 src/components/SendTokensPreview.vue          |  6 +-
 src/components/UserWallet.vue                 | 51 +++++++++------
 src/components/WalletHeader.vue               |  7 ++-
 src/components/oauthLogin.vue                 |  4 +-
 src/pages/ManageNFTScreen.vue                 |  6 +-
 src/pages/NftDetailsScreen.vue                |  5 +-
 src/pages/SendNft.vue                         |  6 +-
 src/pages/SendTokens.vue                      |  6 +-
 src/pages/homeScreen.vue                      |  6 +-
 15 files changed, 111 insertions(+), 66 deletions(-)

diff --git a/src/components/AddNetwork.vue b/src/components/AddNetwork.vue
index 4d522e38..b5d455cb 100644
--- a/src/components/AddNetwork.vue
+++ b/src/components/AddNetwork.vue
@@ -4,12 +4,11 @@ import { ref } from 'vue'
 import { useToast } from 'vue-toastification'
 
 import { useRpcStore } from '@/store/rpc'
-import { useImage } from '@/utils/useImage'
+import { getImage } from '@/utils/getImage'
 
 const emit = defineEmits(['close'])
 
 const rpcStore = useRpcStore()
-const getImage = useImage()
 const toast = useToast()
 
 const rpcConfig = ref({
@@ -84,16 +83,20 @@ async function handleSubmit() {
 </script>
 
 <template>
-  <div class="space-y-3">
-    <div class="flex justify-between">
-      <p class="text-xl sm:text-sm font-semibold">Add a Network</p>
-      <button class="h-auto" @click="emit('close')">
-        <img :src="getImage('close-icon')" alt="close form" />
+  <div class="flex flex-col gap-4">
+    <div class="relative flex justify-center items-center">
+      <button
+        class="absolute left-0"
+        title="Click to go back"
+        @click.stop="emit('close')"
+      >
+        <img :src="getImage('back-arrow.svg')" class="w-6 h-6" />
       </button>
+      <span class="text-lg font-bold">Add Network</span>
     </div>
-    <form class="space-y-3 sm:space-y-2" @submit.prevent="handleSubmit">
-      <div class="space-y-1">
-        <label class="text-xs text-zinc-400" for="networkName">
+    <form class="flex flex-col gap-2" @submit.prevent="handleSubmit">
+      <div class="flex flex-col gap-1">
+        <label class="text-sm font-medium" for="recipientWalletAddress">
           Network Name
         </label>
         <input
@@ -101,23 +104,23 @@ async function handleSubmit() {
           v-model="rpcConfig.networkName"
           required
           type="text"
-          class="text-base sm:text-sm bg-gradient w-full p-2 sm:p-1 rounded-lg border-none outline-none"
+          class="input-field focus:input-active"
           placeholder="e.g. Ethereum"
         />
       </div>
-      <div class="space-y-1">
-        <label class="text-xs text-zinc-400" for="rpcUrl"> RPC URL </label>
+      <div class="flex flex-col gap-1">
+        <label class="text-sm font-medium" for="rpcUrl"> RPC URL </label>
         <input
           id="rpcUrl"
           v-model="rpcConfig.rpcUrl"
           required
           type="text"
-          class="text-base sm:text-sm bg-gradient w-full p-2 sm:p-1 rounded-lg border-none outline-none"
-          placeholder="e.g. https://cloudflare-eth.com/"
+          class="input-field focus:input-active"
+          placeholder="e.g. https://rpc.ankr.com/eth"
         />
       </div>
-      <div class="space-y-1">
-        <label class="text-xs text-zinc-400" for="currencySymbol">
+      <div class="flex flex-col gap-1">
+        <label class="text-sm font-medium" for="currencySymbol">
           Currency Symbol
         </label>
         <input
@@ -125,37 +128,36 @@ async function handleSubmit() {
           v-model="rpcConfig.currencySymbol"
           required
           type="text"
-          class="text-base sm:text-sm bg-gradient w-full p-2 sm:p-1 rounded-lg border-none outline-none"
+          class="input-field focus:input-active"
           placeholder="e.g. ETH"
         />
       </div>
-      <div class="space-y-1">
-        <label class="text-xs text-zinc-400" for="chainId"> Chain ID </label>
+      <div class="flex flex-col gap-1">
+        <label class="text-sm font-medium" for="chainId"> Chain ID </label>
         <input
           id="chainId"
           v-model="rpcConfig.chainId"
           required
           type="text"
-          class="text-base sm:text-sm bg-gradient w-full p-2 sm:p-1 rounded-lg border-none outline-none"
-          placeholder="e.g. 1"
+          class="input-field focus:input-active"
+          placeholder="e.g. 0x1"
         />
       </div>
-      <div class="space-y-1">
-        <label class="text-xs text-zinc-400" for="explorerUrl">
+      <div class="flex flex-col gap-1">
+        <label class="text-sm font-medium" for="explorerUrl">
           Explorer URL (Optional)
         </label>
         <input
           id="explorerUrl"
           v-model="rpcConfig.explorerUrl"
+          required
           type="text"
-          class="text-base sm:text-sm bg-gradient w-full p-2 sm:p-1 rounded-lg border-none outline-none"
-          placeholder="e.g. https://etherscan.io/"
+          class="input-field focus:input-active"
+          placeholder="e.g. https://etherscan.io"
         />
       </div>
-      <div class="flex justify-center">
-        <button
-          class="text-sm sm:text-xs rounded-xl text-white dark:bg-white bg-black dark:text-black w-36 h-9 sm:w-20 sm:h-8"
-        >
+      <div class="flex mt-5">
+        <button class="btn-primary w-full p-2 uppercase font-bold text-sm">
           Save
         </button>
       </div>
diff --git a/src/components/ChainListModal.vue b/src/components/ChainListModal.vue
index b2fd6ff7..18791008 100644
--- a/src/components/ChainListModal.vue
+++ b/src/components/ChainListModal.vue
@@ -2,6 +2,7 @@
 import { ref, watch } from 'vue'
 import { useToast } from 'vue-toastification'
 
+import AddNetwork from '@/components/AddNetwork.vue'
 import { getChainLogoUrl } from '@/services/chainlist.service'
 import { useRpcStore } from '@/store/rpc'
 
@@ -10,6 +11,7 @@ const toast = useToast()
 const rpcStore = useRpcStore()
 
 const selectedRPCConfig = ref(rpcStore.selectedRPCConfig)
+const showAddNetworkModal = ref(false)
 
 watch(
   () => selectedRPCConfig.value,
@@ -21,7 +23,8 @@ watch(
 </script>
 
 <template>
-  <div class="flex flex-col gap-5">
+  <AddNetwork v-if="showAddNetworkModal" @close="showAddNetworkModal = false" />
+  <div v-else class="flex flex-col gap-5">
     <div class="flex items-center justify-center">
       <p class="text-xl font-bold">Choose Network</p>
     </div>
@@ -53,7 +56,7 @@ watch(
       </div>
       <button
         class="btn-primary uppercase font-bold text-base py-2 mt-4"
-        @click.stop="void 0"
+        @click.stop="showAddNetworkModal = true"
       >
         Add network
       </button>
diff --git a/src/components/ExportKeyModal.vue b/src/components/ExportKeyModal.vue
index fe575037..a4dca76d 100644
--- a/src/components/ExportKeyModal.vue
+++ b/src/components/ExportKeyModal.vue
@@ -24,6 +24,7 @@ const emit = defineEmits(['copy', 'download', 'close'])
         <label class="font-bold text-sm">Private Key</label>
         <button
           class="btn-tertiary flex gap-1 items-center"
+          :title="showPK ? 'Click to hide' : 'Click to reveal'"
           @click="showPK = !showPK"
         >
           <img
diff --git a/src/components/PinBasedRecoveryModal.vue b/src/components/PinBasedRecoveryModal.vue
index b6af5957..af739cd8 100644
--- a/src/components/PinBasedRecoveryModal.vue
+++ b/src/components/PinBasedRecoveryModal.vue
@@ -21,7 +21,7 @@ function handleProceed() {
 <template>
   <div class="px-4 py-2">
     <div class="flex gap-2 items-center mb-5">
-      <button @click.stop="emit('back')">
+      <button title="Click to go back" @click.stop="emit('back')">
         <img
           src="@/assets/images/arrow-white.svg"
           class="-rotate-90 invert dark:invert-0"
diff --git a/src/components/SecurityQuestionRecoveryModal.vue b/src/components/SecurityQuestionRecoveryModal.vue
index 9afabb8d..fd5a515e 100644
--- a/src/components/SecurityQuestionRecoveryModal.vue
+++ b/src/components/SecurityQuestionRecoveryModal.vue
@@ -82,7 +82,7 @@ function handleProceed() {
 <template>
   <div class="px-4 py-2">
     <div class="flex gap-2 items-center mb-5">
-      <button @click.stop="emit('back')">
+      <button title="Click to go back" @click.stop="emit('back')">
         <img
           src="@/assets/images/arrow-white.svg"
           class="-rotate-90 invert dark:invert-0"
diff --git a/src/components/SendNftPreview.vue b/src/components/SendNftPreview.vue
index c1c6472d..9778ec61 100644
--- a/src/components/SendNftPreview.vue
+++ b/src/components/SendNftPreview.vue
@@ -37,7 +37,11 @@ function truncateAddress(address: string) {
   <div class="flex flex-col flex-grow justify-between">
     <div class="flex flex-col flex-grow gap-7">
       <div class="relative flex justify-center items-center">
-        <button class="absolute left-0" @click.stop="emits('close')">
+        <button
+          class="absolute left-0"
+          title="Click to go back"
+          @click.stop="emits('close')"
+        >
           <img :src="getImage('back-arrow.svg')" class="w-6 h-6" />
         </button>
         <span class="text-lg font-bold">Confirm Transfer</span>
diff --git a/src/components/SendTokensPreview.vue b/src/components/SendTokensPreview.vue
index e6f8ee9a..23e8b6f2 100644
--- a/src/components/SendTokensPreview.vue
+++ b/src/components/SendTokensPreview.vue
@@ -30,7 +30,11 @@ function truncateAddress(address: string) {
   <div class="flex flex-col justify-between">
     <div class="flex flex-col gap-7">
       <div class="relative flex justify-center items-center">
-        <button class="absolute left-0" @click.stop="emits('close')">
+        <button
+          class="absolute left-0"
+          title="Click to go back"
+          @click.stop="emits('close')"
+        >
           <img :src="getImage('back-arrow.svg')" class="w-6 h-6" />
         </button>
         <span class="text-lg font-bold">Confirm Transfer</span>
diff --git a/src/components/UserWallet.vue b/src/components/UserWallet.vue
index 6d2fdee4..47a85472 100644
--- a/src/components/UserWallet.vue
+++ b/src/components/UserWallet.vue
@@ -23,6 +23,7 @@ import { getTransakSupportedNetworks } from '@/utils/transak'
 type UserWalletProps = {
   walletBalance?: string
   page: 'home' | 'nft'
+  refreshIconAnimating: boolean
 }
 
 const props = defineProps<UserWalletProps>()
@@ -199,33 +200,43 @@ async function copyToClipboard(value: string) {
           <span class="font-bold text-lg">{{
             userStore.walletAddressShrinked
           }}</span>
-          <button @click.stop="copyToClipboard(userStore.walletAddress)">
+          <button
+            title="Click to copy wallet address"
+            @click.stop="copyToClipboard(userStore.walletAddress)"
+          >
             <img :src="getImage('copy.svg')" class="w-xl h-xl" />
           </button>
         </div>
-        <button class="w-xl h-xl rounded-full" @click.stop="handleRefresh()">
-          <img :src="getImage('refresh.svg')" />
-        </button>
       </div>
       <div class="mt-4 flex flex-col">
         <span class="font-normal text-sm text-gray-100">Total Balance:</span>
-        <div>
-          <span class="font-bold text-xxl">{{
-            props.walletBalance?.split('.')[0]
-          }}</span>
-          <span
-            v-if="hasWalletBalanceAfterDecimals()"
-            class="font-bold text-xxl"
-            >.</span
-          >
-          <span
-            v-if="hasWalletBalanceAfterDecimals()"
-            class="font-bold text-base"
-            >{{ props.walletBalance?.split('.')[1] }}</span
-          >
-          <span v-if="currency" class="font-bold text-base ml-1">
-            {{ currency }}</span
+        <div class="flex items-center gap-4">
+          <div>
+            <span class="font-bold text-xxl">{{
+              props.walletBalance?.split('.')[0]
+            }}</span>
+            <span
+              v-if="hasWalletBalanceAfterDecimals()"
+              class="font-bold text-xxl"
+              >.</span
+            >
+            <span
+              v-if="hasWalletBalanceAfterDecimals()"
+              class="font-bold text-base"
+              >{{ props.walletBalance?.split('.')[1] }}</span
+            >
+            <span v-if="currency" class="font-bold text-base ml-1">
+              {{ currency }}</span
+            >
+          </div>
+
+          <button
+            class="w-lg h-lg rounded-full"
+            title="Click to refresh the balance"
+            @click.stop="handleRefresh()"
           >
+            <img :src="getImage('refresh.svg')" />
+          </button>
         </div>
       </div>
       <div class="mt-6 flex gap-3">
diff --git a/src/components/WalletHeader.vue b/src/components/WalletHeader.vue
index f64ef87d..9c4cd4ca 100644
--- a/src/components/WalletHeader.vue
+++ b/src/components/WalletHeader.vue
@@ -91,9 +91,14 @@ watch(
             :src="getImage('arrow-down.svg')"
             class="transition-all duration-200 ease-in-out"
             :class="{ '-rotate-180': isChainListExpanded }"
+            title="Click to expand"
           />
         </button>
-        <button class="w-xl h-xl" @click.stop="openReceiveTokens(true)">
+        <button
+          class="w-xl h-xl"
+          title="Click to show the QR Code"
+          @click.stop="openReceiveTokens(true)"
+        >
           <img :src="getImage('qr-code.svg')" alt="Wallet Icon" />
         </button>
       </div>
diff --git a/src/components/oauthLogin.vue b/src/components/oauthLogin.vue
index 82eea71a..07f1883e 100644
--- a/src/components/oauthLogin.vue
+++ b/src/components/oauthLogin.vue
@@ -29,9 +29,7 @@ const emits = defineEmits(['oauthClick'])
         v-for="oauth in oauthLoginList"
         :key="oauth.value"
         @click="emits('oauthClick', oauth.value)"
-      >
-        <img class="wallet__signin-oauth-icon" :src="oauth.iconPath" />
-      </button>
+      ></button>
     </div>
   </div>
 </template>
diff --git a/src/pages/ManageNFTScreen.vue b/src/pages/ManageNFTScreen.vue
index 6917dede..c83cae1c 100644
--- a/src/pages/ManageNFTScreen.vue
+++ b/src/pages/ManageNFTScreen.vue
@@ -91,7 +91,11 @@ function truncateNFTTokenId(tokenId: string) {
     <div class="flex flex-1 flex-col min-h-full">
       <div class="flex flex-col items-center min-h-full flex-grow gap-5">
         <div class="relative flex justify-center items-center w-full">
-          <button class="absolute left-0" @click.stop="router.go(-1)">
+          <button
+            class="absolute left-0"
+            title="Click to go back"
+            @click.stop="router.go(-1)"
+          >
             <img :src="getImage('back-arrow.svg')" class="w-6 h-6" />
           </button>
           <span class="text-lg font-bold">Manage NFTs</span>
diff --git a/src/pages/NftDetailsScreen.vue b/src/pages/NftDetailsScreen.vue
index 272d236f..3ef06634 100644
--- a/src/pages/NftDetailsScreen.vue
+++ b/src/pages/NftDetailsScreen.vue
@@ -96,7 +96,10 @@ function handleClose() {
                 {{ props.name }}
               </div>
               <div class="flex gap-1">
-                <button @click.stop="openNftModal">
+                <button
+                  title="Click to transfer this NFT"
+                  @click.stop="openNftModal"
+                >
                   <img :src="getImage('send.svg')" />
                 </button>
               </div>
diff --git a/src/pages/SendNft.vue b/src/pages/SendNft.vue
index 2ed2882c..132d6bab 100644
--- a/src/pages/SendNft.vue
+++ b/src/pages/SendNft.vue
@@ -221,7 +221,11 @@ async function handleShowPreview() {
     />
     <div v-else class="flex flex-col flex-grow justify-between gap-5">
       <div class="relative flex justify-center items-center">
-        <button class="absolute left-0" @click.stop="router.go(-1)">
+        <button
+          class="absolute left-0"
+          title="Click to go back"
+          @click.stop="router.go(-1)"
+        >
           <img :src="getImage('back-arrow.svg')" class="w-6 h-6" />
         </button>
         <span class="text-lg font-bold">Send Token</span>
diff --git a/src/pages/SendTokens.vue b/src/pages/SendTokens.vue
index 9190d7bd..3b9ef8db 100644
--- a/src/pages/SendTokens.vue
+++ b/src/pages/SendTokens.vue
@@ -289,7 +289,11 @@ function handleTokenChange(e) {
   />
   <div v-else class="flex flex-col justify-between">
     <div class="relative flex justify-center items-center">
-      <button class="absolute left-0" @click.stop="router.go(-1)">
+      <button
+        class="absolute left-0"
+        title="Click to go back"
+        @click.stop="router.go(-1)"
+      >
         <img :src="getImage('back-arrow.svg')" class="w-6 h-6" />
       </button>
       <span class="text-lg font-bold">Send Token</span>
diff --git a/src/pages/homeScreen.vue b/src/pages/homeScreen.vue
index d4e98ddd..2d851d16 100644
--- a/src/pages/homeScreen.vue
+++ b/src/pages/homeScreen.vue
@@ -9,6 +9,7 @@ import { useRpcStore } from '@/store/rpc'
 import { sleep } from '@/utils/sleep'
 
 const rpcStore = useRpcStore()
+const refreshIconAnimating = ref(false)
 const walletBalance = ref('')
 if (rpcStore.walletBalance) {
   walletBalance.value = ethers.utils.formatEther(rpcStore.walletBalance)
@@ -56,13 +57,13 @@ async function handleChainChange() {
 }
 
 async function handleRefresh() {
-  showLoader('Refreshing wallet balance...')
+  refreshIconAnimating.value = true
   try {
     await rpcStore.getWalletBalance()
   } catch (err) {
     console.log({ err })
   } finally {
-    hideLoader()
+    refreshIconAnimating.value = false
   }
 }
 
@@ -90,6 +91,7 @@ watch(
     <UserWallet
       page="home"
       :wallet-balance="walletBalance"
+      :refresh-icon-animating="refreshIconAnimating"
       @refresh="handleRefresh"
     />
     <div class="my-6">

From cb7d0d73cdbc6d0ff0596c5f3b3da2a4359b771a Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Sat, 3 Jun 2023 00:33:03 +0530
Subject: [PATCH 106/153] Update balance asynchronously on refresh

---
 src/components/AssetsView.vue | 15 ++++++++++++++-
 src/components/UserWallet.vue |  6 +++++-
 src/pages/homeScreen.vue      |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/components/AssetsView.vue b/src/components/AssetsView.vue
index 6ed533e2..825e8af1 100644
--- a/src/components/AssetsView.vue
+++ b/src/components/AssetsView.vue
@@ -21,6 +21,12 @@ const modalStore = useModalStore()
 const showModal = ref(false)
 let assetsPolling
 
+type AssetProps = {
+  refresh: boolean
+}
+
+const props = defineProps<AssetProps>()
+
 function fetchStoredAssetContracts(): AssetContract[] {
   const assetContracts = getStorage().local.getItem(
     `${userStore.walletAddress}/${Number(
@@ -122,6 +128,13 @@ watch(
     }
   }
 )
+
+watch(
+  () => props.refresh,
+  async () => {
+    await getAssetsBalance()
+  }
+)
 </script>
 
 <template>
@@ -149,7 +162,7 @@ watch(
             >
           </div>
           <div
-            class="gap-1 font-normal text-base leading-none text-right overflow-hidden whitespace-nowrap text-ellipsis"
+            class="gap-1 font-normal text-base leading-none text-right overflow-hidden whitespace-nowrap text-ellipsis transition-all duration-200"
             :title="`${
               isNative(asset)
                 ? ethers.utils.formatEther(rpcStore.walletBalance)
diff --git a/src/components/UserWallet.vue b/src/components/UserWallet.vue
index 47a85472..dd0fa5bf 100644
--- a/src/components/UserWallet.vue
+++ b/src/components/UserWallet.vue
@@ -211,7 +211,10 @@ async function copyToClipboard(value: string) {
       <div class="mt-4 flex flex-col">
         <span class="font-normal text-sm text-gray-100">Total Balance:</span>
         <div class="flex items-center gap-4">
-          <div>
+          <div
+            class="transition-all duration-200"
+            :class="{ 'blur-sm': props.refreshIconAnimating }"
+          >
             <span class="font-bold text-xxl">{{
               props.walletBalance?.split('.')[0]
             }}</span>
@@ -232,6 +235,7 @@ async function copyToClipboard(value: string) {
 
           <button
             class="w-lg h-lg rounded-full"
+            :class="{ 'animate-spin': refreshIconAnimating }"
             title="Click to refresh the balance"
             @click.stop="handleRefresh()"
           >
diff --git a/src/pages/homeScreen.vue b/src/pages/homeScreen.vue
index 2d851d16..02581f11 100644
--- a/src/pages/homeScreen.vue
+++ b/src/pages/homeScreen.vue
@@ -95,7 +95,7 @@ watch(
       @refresh="handleRefresh"
     />
     <div class="my-6">
-      <AssetsView />
+      <AssetsView :refresh="refreshIconAnimating" />
     </div>
   </div>
 </template>

From cfc9b97ba15010a4307791ac096ff24a4cec5704 Mon Sep 17 00:00:00 2001
From: makylfang <makyl@newfang.io>
Date: Sat, 3 Jun 2023 13:44:02 +0400
Subject: [PATCH 107/153] Updated auth core version, added backcompat for older
 auth sdk, added standalone hooks

---
 package-lock.json                     | 59 +++++++++++++++---
 package.json                          |  2 +-
 src/App.vue                           | 12 +++-
 src/components/ActivityView.vue       | 15 +++++
 src/models/Connection.ts              |  4 +-
 src/pages/initPageV2.vue              | 22 ++++---
 src/pages/loginRedirect.vue           | 45 +++++---------
 src/pages/signInV2.vue                | 66 +++++++++++++++-----
 src/store/app.ts                      |  5 ++
 src/utils/PasswordlessLoginHandler.ts |  2 +-
 src/utils/getAuthProvider.ts          |  2 +-
 src/utils/hash.ts                     | 13 ++++
 src/utils/redirectUtils.ts            | 86 +++++++++++++++++++++------
 src/utils/requestManagement.ts        |  9 ++-
 14 files changed, 255 insertions(+), 87 deletions(-)
 create mode 100644 src/utils/hash.ts

diff --git a/package-lock.json b/package-lock.json
index ff8f5fef..8e6eb934 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "@arcana/auth": "^0.1.3",
-        "@arcana/auth-core": "^1.0.0-beta.6",
+        "@arcana/auth-core": "^1.0.0-beta.8",
         "@arcana/key-helper": "^1.0.0-beta.7",
         "@ethereumjs/tx": "^3.4.0",
         "@fontsource/montserrat": "^4.5.14",
@@ -82,6 +82,51 @@
         "typescript": "~4.5.5"
       }
     },
+    "../auth-core": {
+      "name": "@arcana/auth-core",
+      "version": "1.0.0-beta.8",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "@arcana/keystore": "^1.0.0",
+        "@stablelib/base64": "^1.0.1",
+        "ethers": "^5.5.1"
+      },
+      "devDependencies": {
+        "@babel/core": "^7.15.0",
+        "@babel/preset-env": "^7.15.0",
+        "@babel/preset-typescript": "^7.15.0",
+        "@peculiar/webcrypto": "^1.1.7",
+        "@types/jest": "^27.0.1",
+        "@typescript-eslint/eslint-plugin": "^4.29.2",
+        "@typescript-eslint/parser": "^4.29.2",
+        "assert": "^2.0.0",
+        "babel-jest": "^27.0.6",
+        "buffer": "^6.0.3",
+        "crypto-browserify": "^3.12.0",
+        "esbuild": "^0.14.10",
+        "esbuild-plugin-alias": "^0.2.1",
+        "eslint": "^7.32.0",
+        "eslint-config-airbnb-base": "^14.2.1",
+        "eslint-plugin-import": "^2.24.0",
+        "eslint-plugin-tsdoc": "^0.2.16",
+        "husky": "^7.0.2",
+        "jest": "^27.0.6",
+        "jest-environment-jsdom": "^27.2.4",
+        "jest-fetch-mock": "^3.0.3",
+        "node-stdlib-browser": "^1.2.0",
+        "prettier": "^2.6.1",
+        "process": "^0.11.10",
+        "rimraf": "^3.0.2",
+        "stream-browserify": "^3.0.0",
+        "ts-loader": "^9.2.6",
+        "typedoc": "^0.22.15",
+        "typedoc-plugin-extras": "^2.2.3",
+        "typedoc-plugin-markdown": "^3.12.1",
+        "typescript": "^4.4.4",
+        "util": "^0.12.4"
+      }
+    },
     "node_modules/@achrinza/node-ipc": {
       "version": "9.2.5",
       "resolved": "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz",
@@ -122,9 +167,9 @@
       }
     },
     "node_modules/@arcana/auth-core": {
-      "version": "1.0.0-beta.6",
-      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.6.tgz",
-      "integrity": "sha512-EOkq0Iot+F8LeJ4UvAaQ3Wsc1Wry1UO4MP9mPEAaSYphv4pSyl21UWsPcVf17WVUTol5KPPRvjU9OXKyxiwRLQ==",
+      "version": "1.0.0-beta.8",
+      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.8.tgz",
+      "integrity": "sha512-A7pgnBydII2c4EFjNcyzIjT1bsqWEgo6kxFm77BIQiNNBkPfPAq2DN70YzDoTtn0sEDYHZvj1hJn5bs6KKAtLA==",
       "dependencies": {
         "@arcana/keystore": "^1.0.0",
         "@stablelib/base64": "^1.0.1",
@@ -18925,9 +18970,9 @@
       }
     },
     "@arcana/auth-core": {
-      "version": "1.0.0-beta.6",
-      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.6.tgz",
-      "integrity": "sha512-EOkq0Iot+F8LeJ4UvAaQ3Wsc1Wry1UO4MP9mPEAaSYphv4pSyl21UWsPcVf17WVUTol5KPPRvjU9OXKyxiwRLQ==",
+      "version": "1.0.0-beta.8",
+      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.8.tgz",
+      "integrity": "sha512-A7pgnBydII2c4EFjNcyzIjT1bsqWEgo6kxFm77BIQiNNBkPfPAq2DN70YzDoTtn0sEDYHZvj1hJn5bs6KKAtLA==",
       "requires": {
         "@arcana/keystore": "^1.0.0",
         "@stablelib/base64": "^1.0.1",
diff --git a/package.json b/package.json
index 7ca01ba8..a118c8d9 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@arcana/auth": "^0.1.3",
-    "@arcana/auth-core": "^1.0.0-beta.7",
+    "@arcana/auth-core": "^1.0.0-beta.8",
     "@arcana/key-helper": "^1.0.0-beta.7",
     "@ethereumjs/tx": "^3.4.0",
     "@fontsource/montserrat": "^4.5.14",
diff --git a/src/App.vue b/src/App.vue
index c4855042..e7804f90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -89,9 +89,15 @@ const showFooter = computed(() => {
   )
 })
 
-function onClickOfHeader() {
-  if (app.compactMode) app.compactMode = false
-  else app.expandWallet = false
+async function onClickOfHeader() {
+  const c = await parentConnectionStore.parentConnection?.promise
+  if (app.compactMode) {
+    app.compactMode = false
+  } else {
+    app.standaloneMode == 1 || app.standaloneMode == 2
+      ? c?.uiEvent('wallet_close', null)
+      : (app.expandWallet = false)
+  }
 }
 
 function canShowCollapseButton() {
diff --git a/src/components/ActivityView.vue b/src/components/ActivityView.vue
index b05192cb..7f2b7dcc 100644
--- a/src/components/ActivityView.vue
+++ b/src/components/ActivityView.vue
@@ -5,6 +5,8 @@ import { computed, ComputedRef } from 'vue'
 
 import { useActivitiesStore } from '@/store/activities'
 import type { Activity, TransactionOps, FileOps } from '@/store/activities'
+import { useAppStore } from '@/store/app'
+import { useParentConnectionStore } from '@/store/parentConnection'
 import { useRpcStore } from '@/store/rpc'
 import { beautifyBalance } from '@/utils/formatTokenDecimals'
 import { truncateEnd, truncateMid } from '@/utils/stringUtils'
@@ -15,6 +17,7 @@ type ActivityViewProps = {
   filterOperations: string[]
 }
 
+const app = useAppStore()
 const props = defineProps<ActivityViewProps>()
 
 const activitiesStore = useActivitiesStore()
@@ -25,6 +28,17 @@ type ActivityView = Activity & {
   isExpanded?: boolean
 }
 
+const parentConnectionStore = useParentConnectionStore()
+const handleExplorerClick = async (e: PointerEvent) => {
+  if (app.standaloneMode == 2) {
+    const c = await parentConnectionStore.parentConnection?.promise
+    if (e.target instanceof HTMLAnchorElement) {
+      c?.uiEvent('open_url', { url: e.target?.href })
+      e.preventDefault()
+    }
+  }
+}
+
 const [explorerUrl] = rpcStore.selectedRpcConfig?.blockExplorerUrls || []
 
 const activities: ComputedRef<ActivityView[]> = computed(() => {
@@ -353,6 +367,7 @@ function canShowDropdown(activity: Activity) {
             :href="`${explorerUrl}/tx/${activity.txHash}`"
             class="flex font-montserrat font-medium text-xs"
             target="_blank"
+            @click="handleExplorerClick"
           >
             View on Explorer
             <img
diff --git a/src/models/Connection.ts b/src/models/Connection.ts
index ba2ce5af..aeecb48c 100644
--- a/src/models/Connection.ts
+++ b/src/models/Connection.ts
@@ -52,7 +52,7 @@ type RedirectParentConnectionApi = {
   redirect(url: string | null): Promise<void>
   replyTo(parentAppUrl?: string | null): Promise<void>
   goToWallet(): Promise<void>
-  error(errorMessage: string, parentAppUrl: string): Promise<void>
+  error(errorMessage: string): Promise<void>
 }
 
 type ParentConnectionApi = {
@@ -65,6 +65,7 @@ type ParentConnectionApi = {
   sendPendingRequestCount(count: number): void
   getParentUrl(): string
   onEvent(event: string, params?: ProviderEvent): void
+  uiEvent(event: string, val: any): void
   getAppMode(): Promise<AppMode>
   triggerSocialLogin(type: SocialLoginType): void
   triggerPasswordlessLogin(email: string): void
@@ -77,6 +78,7 @@ type InitParentConnectionApi = {
   getLoginSource(): string
   getPasswordlessParams(): { sessionId: string; setToken: string }
   error(e: string): void
+  uiEvent(event: string, val: any): void
   setIframeStyle(styles: Partial<CSSStyleDeclaration>): void
 }
 
diff --git a/src/pages/initPageV2.vue b/src/pages/initPageV2.vue
index e7bf22ff..c5aa037a 100644
--- a/src/pages/initPageV2.vue
+++ b/src/pages/initPageV2.vue
@@ -11,7 +11,10 @@ import { useUserStore } from '@/store/user'
 import { createInitParentConnection } from '@/utils/createParentConnection'
 import emailScheme from '@/utils/emailScheme'
 import { getAuthProvider } from '@/utils/getAuthProvider'
-import { catchupSigninPage } from '@/utils/redirectUtils'
+import {
+  catchupSigninPage,
+  fetchPasswordlessResponseFromSignIn,
+} from '@/utils/redirectUtils'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
 const route = useRoute()
@@ -40,6 +43,7 @@ onUnmounted(() => {
 
 let authProvider: AuthProvider | null = null
 
+let loginSrc = ''
 async function init() {
   initStorage()
   isLoading.value = true
@@ -58,7 +62,7 @@ async function init() {
       )
     } else {
       const parentAppUrl = await parentConnectionInstance.getParentUrl()
-      const loginSrc = await parentConnectionInstance.getLoginSource()
+      loginSrc = await parentConnectionInstance.getLoginSource()
       getStorage().local.setItem('parentAppUrl', parentAppUrl)
       getStorage().local.setItem('loginSrc', loginSrc)
     }
@@ -70,8 +74,9 @@ async function init() {
 async function handleSocialLoginRequest(type: SocialLoginType) {
   if (authProvider) {
     const { url, state } = await user.handleSocialLogin(authProvider, type)
-    console.log({ url, state })
-    await catchupSigninPage(state)
+    if (!['rn', 'flutter', 'unity'].includes(loginSrc)) {
+      await catchupSigninPage(state)
+    }
     return url
   }
 }
@@ -81,11 +86,10 @@ async function handlePasswordlessLoginRequest(email: string) {
   if (isEmailValid) {
     const connection = await parentConnection?.promise
     const params = await connection?.getPasswordlessParams()
-    getStorage().local.setItem('CURRENT_LOGIN_INFO', JSON.stringify(params))
-    const authProvider = await getAuthProvider(app.id)
-    return await user.handlePasswordlessLogin(authProvider, email, {
-      withUI: true,
-    })
+    if (!params) {
+      throw new Error('No params found')
+    }
+    return await fetchPasswordlessResponseFromSignIn(params)
   }
 }
 </script>
diff --git a/src/pages/loginRedirect.vue b/src/pages/loginRedirect.vue
index 60a9413a..b9bf57cb 100644
--- a/src/pages/loginRedirect.vue
+++ b/src/pages/loginRedirect.vue
@@ -28,23 +28,14 @@ let channel: BroadcastChannel | null = null
 onMounted(init)
 onUnmounted(cleanup)
 
-const isV3 = (s: string) => {
-  return s.length > 10
-}
-
 const getLoginTypeFromState = (s: string) => {
   return s.split('-')[0]
 }
 async function init() {
   const storage = getStorage()
-  const parentAppUrl = storage.local.getItem('parentAppUrl')
   const loginSrc = storage.local.getItem('loginSrc')
   const isStandalone =
     loginSrc === 'rn' || loginSrc === 'flutter' || loginSrc === 'unity'
-  // TODO: Fix this V, throw error n stuff
-  if (!parentAppUrl) {
-    return
-  }
   try {
     const state = getStateFromUrl(route.fullPath)
     const connectionToParent =
@@ -55,7 +46,7 @@ async function init() {
     ) {
       await verifyOpenerPage(state)
     }
-    const authProvider = await getAuthProvider(`${appId}`, !isV3(state))
+    const authProvider = await getAuthProvider(`${appId}`)
     if (authProvider.isLoggedIn()) {
       const info = authProvider.getUserInfo()
       const userInfo: GetInfoOutput & { hasMfa?: boolean; pk?: string } = {
@@ -92,32 +83,26 @@ async function init() {
       storage.session.setItem(`isLoggedIn`, JSON.stringify(true))
       const messageId = getUniqueId()
       if (info.loginType === SocialLoginType.passwordless) {
-        await handlePasswordlessLoginV2(userInfo, connectionToParent).catch(
-          async () => {
-            channel = new BroadcastChannel(`${appId}_login_notification`)
-            await handlePasswordlessLogin(
-              userInfo,
-              messageId,
-              parentAppUrl,
-              connectionToParent,
-              channel
-            )
+        await handlePasswordlessLoginV2(
+          userInfo,
+          state,
+          connectionToParent
+        ).catch(async (e) => {
+          if (e instanceof Error) {
+            reportError(e.message)
+            return
           }
-        )
+          reportError(e)
+        })
       } else {
         if (isStandalone) {
           await connectionToParent.goToWallet()
           return
         }
-        await handleSocialLogin(
-          userInfo,
-          messageId,
-          parentAppUrl,
-          connectionToParent
-        )
+        await handleSocialLogin(userInfo, messageId, connectionToParent)
       }
     } else {
-      await reportError('Could not login, please try again', parentAppUrl)
+      await reportError('Could not login, please try again')
       return
     }
   } catch (e) {
@@ -133,11 +118,11 @@ function cleanup() {
     channel.close()
   }
 }
-async function reportError(errorMessage: string, parentUrl: string) {
+async function reportError(errorMessage: string) {
   const connectionToParent = await connectToParent<RedirectParentConnectionApi>(
     {}
   ).promise
-  await connectionToParent.error(errorMessage, parentUrl)
+  await connectionToParent.error(errorMessage)
   return
 }
 </script>
diff --git a/src/pages/signInV2.vue b/src/pages/signInV2.vue
index c17257a8..28cd544f 100644
--- a/src/pages/signInV2.vue
+++ b/src/pages/signInV2.vue
@@ -13,6 +13,7 @@ import { useUserStore } from '@/store/user'
 import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
 import { createParentConnection } from '@/utils/createParentConnection'
 import { getAuthProvider } from '@/utils/getAuthProvider'
+import { decodeJSON } from '@/utils/hash'
 import { PasswordlessLoginHandler } from '@/utils/PasswordlessLoginHandler'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
@@ -29,27 +30,54 @@ const {
   params: {
     value: { appId },
   },
+  hash,
 } = toRefs(route)
 
 type SocialLogins = Exclude<SocialLoginType, SocialLoginType.passwordless>
 let passwordlessLoginHandler: PasswordlessLoginHandler | null
 
+const parseHashAndSetSettings = () => {
+  if (hash.value) {
+    const settings = decodeJSON(hash.value.substring(1))
+    if (settings.standaloneMode) {
+      app.setStandalone(settings.standaloneMode)
+    }
+    if (settings.theme) {
+      app.setTheme(settings.theme)
+    }
+    if (settings.position) {
+      app.setWalletPosition(settings.position)
+    }
+  }
+}
+
+const LoginState = {
+  passwordless: {
+    success: false,
+    error: '',
+  },
+  social: '',
+}
+
 const initPasswordlessLogin = async (email: string) => {
   if (passwordlessLoginHandler) {
     passwordlessLoginHandler.cancel()
   }
   const provider = await getAuthProvider(appId as string)
-  const resp = await provider.loginWithOtp(email, {
-    withUI: false,
-  })
-  // if (resp && resp['success']) {
-
-  // } else if (resp && resp['error']) {
-
-  // }
 
   passwordlessLoginHandler = new PasswordlessLoginHandler(email)
   const params = passwordlessLoginHandler.params()
+  const state = `passwordless-${params.sessionId}-${params.setToken}`
+  const response = await provider.loginWithPasswordlessStart({
+    email,
+    kind: 'link',
+    state,
+  })
+  LoginState.passwordless.success = response.success
+  if (!response.success) {
+    LoginState.passwordless.error = response.error ?? "Couldn't start login"
+    throw new Error(response.error)
+  }
   passwordlessLoginHandler.start().then(({ privateKey, email, hasMfa, pk }) => {
     storeUserInfoAndRedirect({
       loginType: SocialLoginType.passwordless,
@@ -66,12 +94,11 @@ const initPasswordlessLogin = async (email: string) => {
   })
   return params
 }
-let currentLogin = ''
 
 const initSocialLogin = async (type: SocialLogins): Promise<string> => {
   const val = await authProvider?.loginWithSocial(type)
   if (val) {
-    currentLogin = val.state
+    LoginState.social = val.state
     return val.url
   }
   throw new Error("Couldn't get login url")
@@ -166,20 +193,18 @@ const windowEventHandler = (
       break
     }
     case 'LOGIN_VERIFY': {
-      console.log({ currentLogin, state: ev.data?.state })
       ev.source?.postMessage(
         {
           status: 'LOGIN_VERIFY_ACK',
-          verified: currentLogin === ev.data?.state,
+          verified: LoginState.social === ev.data?.state,
         }, // maybe send public key here
         { targetOrigin: ev.origin }
       )
       break
     }
     case 'LOGIN_INIT': {
-      console.log({ currentLogin, state: ev.data?.state })
       if (ev.data.state) {
-        currentLogin = ev.data.state
+        LoginState.social = ev.data.state
       }
       ev.source?.postMessage(
         {
@@ -189,6 +214,17 @@ const windowEventHandler = (
       )
       break
     }
+    case 'LOGIN_PWDL_INQ': {
+      ev.source?.postMessage(
+        {
+          status: 'LOGIN_PWDL_INQ_RES',
+          error: LoginState.passwordless.error,
+          success: LoginState.passwordless.success,
+        }, // maybe send public key here
+        { targetOrigin: ev.origin }
+      )
+      break
+    }
   }
 }
 
@@ -197,6 +233,8 @@ async function init() {
   try {
     const storage = getStorage()
 
+    parseHashAndSetSettings()
+
     // window listener
     window.addEventListener('message', windowEventHandler)
     app.setAppId(`${appId}`)
diff --git a/src/store/app.ts b/src/store/app.ts
index a8e98508..770874a9 100644
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -17,6 +17,7 @@ type AppState = {
   id: string
   name: string
   theme: Theme
+  standaloneMode: 0 | 1 | 2
   parentAppUrl: string | null
   validAppMode: AppMode
   showWallet: boolean
@@ -34,6 +35,7 @@ export const useAppStore = defineStore('app', {
       theme: 'light',
       parentAppUrl: null,
       showWallet: false,
+      standaloneMode: 0,
       expandWallet: true,
       walletPosition: 'right',
       compactMode: false,
@@ -96,6 +98,9 @@ export const useAppStore = defineStore('app', {
     setName(name: string): void {
       this.name = name
     },
+    setStandalone(mode: 0 | 1 | 2): void {
+      this.standaloneMode = mode
+    },
     setParentUrl(url: string): void {
       this.parentAppUrl = url
     },
diff --git a/src/utils/PasswordlessLoginHandler.ts b/src/utils/PasswordlessLoginHandler.ts
index f526ed76..aa5f8a01 100644
--- a/src/utils/PasswordlessLoginHandler.ts
+++ b/src/utils/PasswordlessLoginHandler.ts
@@ -15,7 +15,7 @@ class PasswordlessLoginHandler {
     address: string
   }
   constructor(private email: string) {
-    this.sessionId = uuid()
+    this.sessionId = '_' + Math.random().toString(36).substring(2, 11)
     this.key = getRandomPrivateKey()
     this.timer = undefined
   }
diff --git a/src/utils/getAuthProvider.ts b/src/utils/getAuthProvider.ts
index ac85c696..9230c4c1 100644
--- a/src/utils/getAuthProvider.ts
+++ b/src/utils/getAuthProvider.ts
@@ -10,7 +10,7 @@ let authProvider: AuthProvider | null = null
 
 export async function getAuthProvider(
   appId: string,
-  shouldVerifyState = true
+  shouldVerifyState = false
 ): Promise<AuthProvider> {
   if (!authProvider) {
     authProvider = await AuthProvider.init({
diff --git a/src/utils/hash.ts b/src/utils/hash.ts
new file mode 100644
index 00000000..3990b965
--- /dev/null
+++ b/src/utils/hash.ts
@@ -0,0 +1,13 @@
+function atobUTF8(str: string) {
+  return decodeURIComponent(
+    Array.from(window.atob(str), byteToPercent).join('')
+  )
+}
+
+function byteToPercent(b: string) {
+  return `%${`00${b.charCodeAt(0).toString(16)}`.slice(-2)}`
+}
+
+export function decodeJSON(queryString: string) {
+  return JSON.parse(atobUTF8(queryString))
+}
diff --git a/src/utils/redirectUtils.ts b/src/utils/redirectUtils.ts
index fb3c58d1..f1081e4d 100644
--- a/src/utils/redirectUtils.ts
+++ b/src/utils/redirectUtils.ts
@@ -13,11 +13,13 @@ const SOCIAL_TIMEOUT = 5000 // 5s timeout
 const PASSWORDLESS_TIMEOUT = 1500 // 1.5s timeout
 
 const LOGIN_INFO = 'LOGIN_INFO'
+const LOGIN_INFO_ACK = 'LOGIN_INFO_ACK'
 const LOGIN_VERIFY = 'LOGIN_VERIFY'
 const LOGIN_VERIFY_ACK = 'LOGIN_VERIFY_ACK'
 const LOGIN_INIT = 'LOGIN_INIT'
 const LOGIN_INIT_ACK = 'LOGIN_INIT_ACK'
-const LOGIN_INFO_ACK = 'LOGIN_INFO_ACK'
+const LOGIN_PWDL_INQ = 'LOGIN_PWDL_INQ'
+const LOGIN_PWDL_INQ_RES = 'LOGIN_PWDL_INQ_RES'
 const MFA_SETUP = 'MFA_SETUP'
 const MFA_SETUP_ACK = 'MFA_SETUP_ACK'
 const ACK = [LOGIN_INFO_ACK, MFA_SETUP_ACK]
@@ -47,6 +49,64 @@ function contactUsingBroadcastChannel(
   })
 }
 
+function fetchPasswordlessResponseFromSignIn({
+  sessionId,
+  setToken,
+}: {
+  sessionId: string
+  setToken: string
+}) {
+  return new Promise((resolve, reject) => {
+    const state = `passwordless-${sessionId}-${setToken}`
+    setTimeout(() => {
+      return reject('request timed out')
+    }, SOCIAL_TIMEOUT)
+
+    const listener = (
+      ev: MessageEvent<{
+        status: string
+        error: string | null
+        success: boolean
+      }>
+    ) => {
+      console.log({ ev: ev.data })
+      if (ev.origin !== process.env.VUE_APP_WALLET_DOMAIN) {
+        return
+      }
+
+      if (ev.data?.status === LOGIN_PWDL_INQ_RES) {
+        window.removeEventListener('message', listener)
+        const { error = null, success = false } = ev.data
+        if (success) {
+          return resolve('ok')
+        } else {
+          return reject(error)
+        }
+      }
+    }
+    try {
+      const frameLength = window.parent.opener.frames.length
+      window.addEventListener('message', listener)
+      for (let i = 0; i < frameLength; i++) {
+        try {
+          window.parent.opener.frames[i].postMessage(
+            {
+              status: LOGIN_PWDL_INQ,
+              state,
+            },
+            process.env.VUE_APP_WALLET_DOMAIN
+          )
+        } catch (e) {
+          // Intentionally ignoring errors
+          continue
+        }
+      }
+    } catch (e) {
+      reject(new Error('Could not contact parent page, login did not succeed'))
+    }
+  })
+}
+
 function catchupSigninPage(state: string) {
   return new Promise((resolve, reject) => {
     setTimeout(() => {
@@ -183,18 +243,11 @@ function contactParentPage(
 
 async function handlePasswordlessLoginV2(
   info: GetInfoOutput & { hasMfa?: boolean; pk?: string },
+  state: string,
   connection: AsyncMethodReturns<RedirectParentConnectionApi>
 ) {
-  const storage = getStorage()
-  const params = storage.local.getItem('CURRENT_LOGIN_INFO')
-  if (!params) {
-    console.log('params not found in local storage')
-    throw new Error('No passwordless login init')
-  }
-  storage.local.removeItem('CURRENT_LOGIN_INFO')
-  const data = JSON.parse(params)
-
-  const publicKey = await getCredentialKey(data.sessionId)
+  const [, sessionId, setToken] = state.split('-')
+  const publicKey = await getCredentialKey(sessionId)
   const dataToEncrypt = {
     privateKey: info.privateKey,
     pk: info.pk,
@@ -203,25 +256,21 @@ async function handlePasswordlessLoginV2(
   if (info.hasMfa) {
     ciphertext = `${ciphertext}:has-mfa`
   }
-  await setCredential(data.setToken, data.sessionId, ciphertext)
+  await setCredential(setToken, sessionId, ciphertext)
   connection.replyTo()
 }
 
 async function handleSocialLogin(
   info: GetInfoOutput,
   messageId: number,
-  parentAppUrl: string,
   connection: AsyncMethodReturns<RedirectParentConnectionApi>
 ) {
   try {
     await contactParentPage(info, messageId, LOGIN_INFO)
-    connection.replyTo(parentAppUrl)
+    connection.replyTo()
   } catch (e) {
     console.log('A very unexpected error occurred', e)
-    connection.error(
-      'Could not login, an unexpected error occurred',
-      parentAppUrl
-    )
+    connection.error('Could not login, an unexpected error occurred')
   }
 }
 
@@ -263,6 +312,7 @@ export {
   handlePasswordlessLoginV2,
   handleSocialLogin,
   catchupSigninPage,
+  fetchPasswordlessResponseFromSignIn,
   contactParentPage,
   getStateFromUrl,
   verifyOpenerPage,
diff --git a/src/utils/requestManagement.ts b/src/utils/requestManagement.ts
index 63525565..8abcabc0 100644
--- a/src/utils/requestManagement.ts
+++ b/src/utils/requestManagement.ts
@@ -67,8 +67,13 @@ async function watchRequestQueue(keeper) {
         ) {
           connectionInstance.closePopup()
         } else if (pendingRequestCount === 0 && method && PERMISSIONS[method]) {
-          appStore.expandWallet = false
-          appStore.compactMode = false
+          if (appStore.standaloneMode == 1) {
+            appStore.expandWallet = true
+            appStore.compactMode = false
+          } else {
+            appStore.expandWallet = false
+            appStore.compactMode = false
+          }
         }
       }
     },

From 9272547ac612db640202b4a6661f6113a4ade265 Mon Sep 17 00:00:00 2001
From: mmjee <root@git.maharshi.ninja>
Date: Mon, 5 Jun 2023 11:38:43 +0530
Subject: [PATCH 108/153] Don't set iframe styles for non-UI wallet modes
 (#345)

---
 src/App.vue                | 7 +++++--
 src/pages/loggedInView.vue | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 049e8ec3..1096659e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { AppMode } from '@arcana/auth'
-import { toRefs, watch, computed, onBeforeMount } from 'vue'
+import { computed, onBeforeMount, toRefs, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
 import WalletFooter from '@/components/AppFooter.vue'
@@ -48,6 +48,9 @@ onBeforeMount(async () => {
 })
 
 async function setIframeStyle() {
+  if (app.validAppMode === AppMode.NoUI) {
+    return
+  }
   const parentConnectionInstance = await parentConnectionStore.parentConnection
     ?.promise
   if (parentConnectionInstance && parentConnectionInstance['setIframeStyle']) {
@@ -57,7 +60,7 @@ async function setIframeStyle() {
 
 watch(showWallet, async (newValue) => {
   if (newValue) app.expandWallet = false
-  setIframeStyle()
+  await setIframeStyle()
 })
 
 watch(expandWallet, setIframeStyle)
diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index d361fe0d..fa9dae58 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -147,7 +147,7 @@ async function initAccountHandler() {
 
       if (typeof appStore.validAppMode !== 'number') {
         const walletType = await getWalletType(appStore.id)
-        setAppMode(walletType, parentConnectionInstance)
+        await setAppMode(walletType, parentConnectionInstance)
       }
     }
   } catch (err) {

From 656f904f05d5f0d25224ee8fea3c84edd78e20c2 Mon Sep 17 00:00:00 2001
From: makylfang <makyl@newfang.io>
Date: Mon, 5 Jun 2023 10:20:38 +0400
Subject: [PATCH 109/153] checking dashboard fix

---
 src/components/ActivityView.vue   |   2 +-
 src/pages/backCompat/initPage.vue |  24 +-
 src/pages/backCompat/signIn.vue   | 480 +++++++++++++++---------------
 3 files changed, 251 insertions(+), 255 deletions(-)

diff --git a/src/components/ActivityView.vue b/src/components/ActivityView.vue
index 7f2b7dcc..a0fad41a 100644
--- a/src/components/ActivityView.vue
+++ b/src/components/ActivityView.vue
@@ -29,7 +29,7 @@ type ActivityView = Activity & {
 }
 
 const parentConnectionStore = useParentConnectionStore()
-const handleExplorerClick = async (e: PointerEvent) => {
+const handleExplorerClick = async (e: MouseEvent) => {
   if (app.standaloneMode == 2) {
     const c = await parentConnectionStore.parentConnection?.promise
     if (e.target instanceof HTMLAnchorElement) {
diff --git a/src/pages/backCompat/initPage.vue b/src/pages/backCompat/initPage.vue
index 2dffe077..650232cc 100644
--- a/src/pages/backCompat/initPage.vue
+++ b/src/pages/backCompat/initPage.vue
@@ -11,6 +11,10 @@ import { useUserStore } from '@/store/user'
 import { createInitParentConnection } from '@/utils/createParentConnection'
 import emailScheme from '@/utils/emailScheme'
 import { getAuthProvider } from '@/utils/getAuthProvider'
+import {
+  catchupSigninPage,
+  fetchPasswordlessResponseFromSignIn,
+} from '@/utils/redirectUtils'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
 const route = useRoute()
@@ -33,6 +37,8 @@ const penpalMethods = {
     handlePasswordlessLoginRequest(email),
 }
 
+// let loginSrc = ''
+
 onMounted(init)
 
 onUnmounted(() => {
@@ -67,18 +73,24 @@ async function init() {
 
 async function handleSocialLoginRequest(type: SocialLoginType) {
   if (authProvider) {
-    return await user.handleSocialLogin(authProvider, type)
+    const { url, state } = await user.handleSocialLogin(authProvider, type)
+    await catchupSigninPage(state)
+    return url
   }
 }
 
 async function handlePasswordlessLoginRequest(email: string) {
   const isEmailValid = await emailScheme.isValid(email)
   if (isEmailValid) {
-    const authProvider = await getAuthProvider(app.id)
-    return await user.handlePasswordlessLogin(authProvider, email, {
-      withUI: true,
-    })
+    const connection = await parentConnection?.promise
+    const params = await connection?.getPasswordlessParams()
+    if (!params) {
+      throw new Error('No params found')
+    }
+    return await fetchPasswordlessResponseFromSignIn(params)
   }
 }
 </script>
-<template><div></div></template>
+<template>
+  <div></div>
+</template>
diff --git a/src/pages/backCompat/signIn.vue b/src/pages/backCompat/signIn.vue
index 8918100d..292cefe0 100644
--- a/src/pages/backCompat/signIn.vue
+++ b/src/pages/backCompat/signIn.vue
@@ -1,21 +1,20 @@
 <script setup lang="ts">
-import type {
-  AuthProvider,
-  GetInfoOutput,
-  SocialLoginType,
-} from '@arcana/auth-core'
+import type { AuthProvider, GetInfoOutput } from '@arcana/auth-core'
+import { SocialLoginType } from '@arcana/auth-core'
+import { Core, SecurityQuestionModule } from '@arcana/key-helper'
 import type { Connection } from 'penpal'
-import { toRefs, onMounted, ref, computed, onUnmounted } from 'vue'
+import { toRefs, onMounted, ref, onUnmounted } from 'vue'
 import type { Ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
-import OauthLogin from '@/components/oauthLogin.vue'
 import type { ParentConnectionApi } from '@/models/Connection'
 import { useAppStore } from '@/store/app'
 import { useUserStore } from '@/store/user'
+import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
 import { createParentConnection } from '@/utils/createParentConnection'
-import emailScheme from '@/utils/emailScheme'
 import { getAuthProvider } from '@/utils/getAuthProvider'
+import { decodeJSON } from '@/utils/hash'
+import { PasswordlessLoginHandler } from '@/utils/PasswordlessLoginHandler'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
 const route = useRoute()
@@ -25,41 +24,103 @@ const app = useAppStore()
 const availableLogins: Ref<SocialLoginType[]> = ref([])
 const isLoading: Ref<boolean> = ref(false)
 let parentConnection: Connection<ParentConnectionApi> | null = null
-let channel: BroadcastChannel | null = null
+initStorage()
 
-const userEmailInput = ref('')
-const passwordlessForm = ref(null)
-const isEmailFocused = ref(false)
-
-const disableSendLinkBtn = computed(() => {
-  return userEmailInput.value.length === 0
-})
-
-const LOGINS_FETCHING_ERROR_TEXT = `No logins configured. If you are the app admin, please configure login
-providers on the developer dashboard.`
+enum BearerAuthentication {
+  firebase = 'firebase',
+}
 
 const {
   params: {
     value: { appId },
   },
+  hash,
 } = toRefs(route)
 
-initStorage(String(appId))
-const storage = getStorage()
+type SocialLogins = Exclude<SocialLoginType, SocialLoginType.passwordless>
+let passwordlessLoginHandler: PasswordlessLoginHandler | null
+
+const parseHashAndSetSettings = () => {
+  if (hash.value) {
+    const settings = decodeJSON(hash.value.substring(1))
+    if (settings.standaloneMode) {
+      app.setStandalone(settings.standaloneMode)
+    }
+    if (settings.theme) {
+      app.setTheme(settings.theme)
+    }
+    if (settings.position) {
+      app.setWalletPosition(settings.position)
+    }
+  }
+}
+
+const LoginState = {
+  passwordless: {
+    success: false,
+    error: '',
+  },
+  social: '',
+}
+
+const initPasswordlessLogin = async (email: string) => {
+  if (passwordlessLoginHandler) {
+    passwordlessLoginHandler.cancel()
+  }
+  const provider = await getAuthProvider(appId as string)
+
+  passwordlessLoginHandler = new PasswordlessLoginHandler(email)
+  const params = passwordlessLoginHandler.params()
+  const state = `passwordless-${params.sessionId}-${params.setToken}`
+  const response = await provider.loginWithPasswordlessStart({
+    email,
+    kind: 'link',
+    state,
+  })
+  LoginState.passwordless.success = response.success
+  if (!response.success) {
+    LoginState.passwordless.error = response.error ?? "Couldn't start login"
+    throw new Error(response.error)
+  }
+  passwordlessLoginHandler.start().then(({ privateKey, email, hasMfa, pk }) => {
+    storeUserInfoAndRedirect({
+      loginType: SocialLoginType.passwordless,
+      userInfo: {
+        email,
+        id: email,
+        picture: '',
+        name: '',
+      },
+      privateKey,
+      pk,
+      hasMfa,
+    })
+  })
+  return params
+}
+
+const initSocialLogin = async (type: SocialLogins): Promise<string> => {
+  const val = await authProvider?.loginWithSocial(type)
+  if (val) {
+    LoginState.social = val.state
+    return val.url
+  }
+  throw new Error("Couldn't get login url")
+}
 
 const penpalMethods = {
   isLoggedIn: () => user.isLoggedIn,
+  initPasswordlessLogin: (email: string) => initPasswordlessLogin(email),
+  initSocialLogin: (type: SocialLogins) => initSocialLogin(type),
   isLoginAvailable: (kind: SocialLoginType) =>
     availableLogins.value.includes(kind),
   getPublicKey: handleGetPublicKey,
   getAvailableLogins: () => [...availableLogins.value],
+  triggerBearerLogin: handleBearerLoginRequest,
 }
 
 const cleanup = () => {
   parentConnection?.destroy()
-  if (channel) {
-    channel.close()
-  }
   window.removeEventListener('message', windowEventHandler)
 }
 
@@ -71,50 +132,117 @@ let authProvider: AuthProvider | null = null
 
 async function fetchAvailableLogins(authProvider: AuthProvider) {
   return (await authProvider.getAvailableLogins()).filter(
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     (item) => item !== 'firebase'
   )
 }
 
-function storeUserInfoAndRedirect(userInfo: GetInfoOutput) {
+async function storeUserInfoAndRedirect(
+  userInfo: GetInfoOutput & { hasMfa?: boolean; pk?: string }
+) {
+  const storage = getStorage()
   storage.session.setItem('userInfo', JSON.stringify(userInfo))
   storage.session.setItem('isLoggedIn', JSON.stringify(true))
   user.setUserInfo(userInfo)
   user.setLoginStatus(true)
-  router.push({ name: 'home' })
-}
-
-const channelEventHandler = (ev: MessageEvent) => {
-  if (ev.data?.status === 'LOGIN_INFO') {
-    channel?.postMessage({
-      status: 'LOGIN_INFO_ACK',
-      messageId: ev.data.messageId,
-    })
-    storeUserInfoAndRedirect(ev.data.info)
+  if (!userInfo.hasMfa && userInfo.pk) {
+    const core = new Core(
+      userInfo.pk,
+      userInfo.userInfo.id,
+      `${appId}`,
+      GATEWAY_URL,
+      AUTH_NETWORK === 'dev'
+    )
+    const securityQuestionModule = new SecurityQuestionModule(3)
+    securityQuestionModule.init(core)
+    const isEnabled = await securityQuestionModule.isEnabled()
+    user.hasMfa = isEnabled
+  }
+  if (userInfo.hasMfa) {
+    user.hasMfa = true
+    storage.local.setItem(`${user.info.id}-has-mfa`, '1')
   }
+  const loginCount = storage.local.getItem(
+    `${userInfo.userInfo.id}-login-count`
+  )
+  const newLoginCount = loginCount ? Number(loginCount) + 1 : 1
+  storage.local.setItem(
+    `${userInfo.userInfo.id}-login-count`,
+    String(newLoginCount)
+  )
+  router.push({ name: 'home' })
 }
 
 const windowEventHandler = (
-  ev: MessageEvent<{ status: string; messageId: number; info: GetInfoOutput }>
+  ev: MessageEvent<{
+    status: string
+    messageId: number
+    info: GetInfoOutput & { hasMfa?: boolean }
+    state?: string
+  }>
 ) => {
+  const storage = getStorage()
+  console.log({ ev: ev.data })
   // eslint-disable-next-line no-undef
   if (ev.origin !== process.env.VUE_APP_WALLET_DOMAIN) {
     return
   }
-  if (ev.data?.status === 'LOGIN_INFO') {
-    ev.source?.postMessage(
-      { status: 'LOGIN_INFO_ACK', messageId: ev.data.messageId },
-      { targetOrigin: ev.origin }
-    )
-    storeUserInfoAndRedirect(ev.data.info)
+  switch (ev.data?.status) {
+    case 'LOGIN_INFO': {
+      ev.source?.postMessage(
+        { status: 'LOGIN_INFO_ACK', messageId: ev.data.messageId },
+        { targetOrigin: ev.origin }
+      )
+      storeUserInfoAndRedirect(ev.data.info)
+      if (ev.data.info.hasMfa) {
+        user.hasMfa = true
+        storage.local.setItem(`${ev.data.info.userInfo.id}-has-mfa`, '1')
+      }
+      break
+    }
+    case 'LOGIN_VERIFY': {
+      ev.source?.postMessage(
+        {
+          status: 'LOGIN_VERIFY_ACK',
+          verified: LoginState.social === ev.data?.state,
+        }, // maybe send public key here
+        { targetOrigin: ev.origin }
+      )
+      break
+    }
+    case 'LOGIN_INIT': {
+      if (ev.data.state) {
+        LoginState.social = ev.data.state
+      }
+      ev.source?.postMessage(
+        {
+          status: 'LOGIN_INIT_ACK',
+        }, // maybe send public key here
+        { targetOrigin: ev.origin }
+      )
+      break
+    }
+    case 'LOGIN_PWDL_INQ': {
+      ev.source?.postMessage(
+        {
+          status: 'LOGIN_PWDL_INQ_RES',
+          error: LoginState.passwordless.error,
+          success: LoginState.passwordless.success,
+        }, // maybe send public key here
+        { targetOrigin: ev.origin }
+      )
+      break
+    }
   }
 }
 
 async function init() {
   isLoading.value = true
   try {
-    // channel listener
-    channel = new BroadcastChannel(`${appId}_login_notification`)
-    channel.addEventListener('message', channelEventHandler)
+    const storage = getStorage()
+
+    parseHashAndSetSettings()
 
     // window listener
     window.addEventListener('message', windowEventHandler)
@@ -128,8 +256,23 @@ async function init() {
     const isLoggedIn = storage.session.getItem('isLoggedIn')
 
     if (isLoggedIn) {
+      const hasMfa = storage.local.getItem(`${userInfo.userInfo.id}-has-mfa`)
+      if (!hasMfa && userInfo.pk) {
+        const core = new Core(
+          userInfo.pk,
+          userInfo.userInfo.id,
+          `${appId}`,
+          GATEWAY_URL,
+          AUTH_NETWORK === 'dev'
+        )
+        const securityQuestionModule = new SecurityQuestionModule(3)
+        securityQuestionModule.init(core)
+        const isEnabled = await securityQuestionModule.isEnabled()
+        user.hasMfa = isEnabled
+      }
       user.setUserInfo(userInfo)
       user.setLoginStatus(true)
+      user.hasMfa = hasMfa === '1'
       router.push({ name: 'home' })
     } else {
       parentConnection = createParentConnection({
@@ -153,217 +296,58 @@ async function init() {
   }
 }
 
-async function handleSocialLoginRequest(kind: SocialLoginType) {
-  const c = await parentConnection?.promise
-  c?.triggerSocialLogin(kind)
-}
-
 async function handleGetPublicKey(id, verifier) {
   const authProvider = await getAuthProvider(app.id)
   return await authProvider.getPublicKey({ id, verifier })
 }
 
-async function handlePasswordlessLoginRequest(email: string) {
-  const isEmailValid = await emailScheme.isValid(email)
-  if (isEmailValid) {
-    const c = await parentConnection?.promise
-    c?.triggerPasswordlessLogin(email)
-    return
-  }
-}
-
-async function handleSubmit() {
-  handlePasswordlessLoginRequest(userEmailInput.value)
-}
+async function handleBearerLoginRequest(
+  type: BearerAuthentication,
+  _data: unknown
+) {
+  // Intentionally doing this to get the KeyReconstructor out of Auth SDK (which we shouldn't expose to external users)
+  // but would be OK to use internally
+  const ap = await getAuthProvider(app.id)
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  await ap.initKeyReconstructor()
+  const kr = // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    ap.keyReconstructor
+
+  switch (type) {
+    case BearerAuthentication.firebase: {
+      const data = _data as {
+        uid: string
+        token: string
+      }
+
+      const info = await kr.getPrivateKey({
+        verifier: BearerAuthentication.firebase,
+        id: data.uid,
+        idToken: data.token,
+      })
 
-function onEnterPress() {
-  if (passwordlessForm.value.email.checkValidity()) handleSubmit()
+      // TODO
+      const userInfo = {
+        loginType: 'firebase',
+        hasMfa: false,
+        privateKey: info.privateKey as string,
+        pk: info.privateKey as string,
+        userInfo: {
+          id: data.uid,
+        },
+      }
+      await storeUserInfoAndRedirect(userInfo)
+
+      return true
+    }
+    default:
+      return false
+  }
 }
 </script>
 
 <template>
-  <div v-if="isLoading" class="signin__loader flex-1">
-    <p>Loading...</p>
-  </div>
-  <div v-else class="flex items-center">
-    <div class="wallet__card rounded-[10px] flex flex-col mb-[10px]">
-      <div class="signin__container">
-        <div class="signin__body flow-container">
-          <div class="signin__title-desc flow-element">
-            <h1 class="signin__title">Welcome!</h1>
-            <p class="signin__desc">
-              You will receive a login link in your email for a password-less
-              sign-in.
-            </p>
-          </div>
-          <form
-            ref="passwordlessForm"
-            class="signin__input-container flow-element"
-            @submit.prevent="handleSubmit"
-          >
-            <label class="signin__input-label">Email</label>
-            <input
-              v-model="userEmailInput"
-              name="email"
-              type="email"
-              class="signin__input-field py-4"
-              placeholder="someone@example.com"
-              required
-              :class="{
-                'outline-black dark:outline-white outline-1 outline':
-                  isEmailFocused,
-              }"
-              @keyup.enter="onEnterPress"
-              @focus="isEmailFocused = true"
-              @blur="isEmailFocused = false"
-            />
-            <input
-              type="submit"
-              value="Send Link"
-              class="signin__button"
-              :class="{ 'signin__button--disabled': disableSendLinkBtn }"
-              :disabled="disableSendLinkBtn"
-            />
-          </form>
-        </div>
-        <div class="signin__footer">
-          <div>
-            <OauthLogin
-              v-if="availableLogins.length"
-              :available-logins="availableLogins"
-              @oauth-click="(type) => handleSocialLoginRequest(type, 'wallet')"
-            />
-            <p v-else class="signin__footer-text-error">
-              {{ LOGINS_FETCHING_ERROR_TEXT }}
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+  <div></div>
 </template>
-
-<style scoped>
-.signin__container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  height: 100%;
-  padding: var(--p-500) var(--p-400);
-}
-
-.signin__loader {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-}
-
-.signin__container > *:not(:first-child) {
-  margin-top: 40px;
-}
-
-.signin__body {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  justify-content: space-between;
-}
-
-.signin__footer {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  height: 25px;
-}
-
-.signin__footer-text-loading {
-  font-size: var(--fs-300);
-}
-
-.signin__footer-text-error {
-  font-size: var(--fs-250);
-  text-align: center;
-}
-
-.signin__title-desc {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-around;
-}
-
-.signin__title {
-  font-size: var(--fs-500);
-  font-weight: 600;
-  text-align: center;
-}
-
-.signin__desc {
-  font-size: var(--fs-350);
-  font-weight: 400;
-  text-align: center;
-}
-
-.signin__input-container {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  width: 100%;
-}
-
-.signin__input-label {
-  margin-left: 15px;
-  font-size: var(--fs-300);
-  font-weight: 400;
-}
-
-.signin__input-field {
-  padding: var(--p-400);
-  font-size: var(--fs-350);
-  font-weight: 400;
-  color: var(--fg-color);
-  background: var(--debossed-box-color);
-  border: none;
-  border-radius: 10px;
-  box-shadow: var(--debossed-shadow);
-}
-
-.signin__button {
-  width: 100%;
-  height: 2.25rem;
-  font-size: var(--fs-350);
-  font-weight: 600;
-  color: var(--filled-button-fg-color);
-  text-transform: uppercase;
-  background: var(--filled-button-bg-color);
-  border: none;
-  border-radius: 10px;
-}
-
-.signin__button:hover {
-  transition: all 0.5s;
-  transform: scale(1.05, 1.15);
-}
-
-.signin__button--disabled {
-  cursor: not-allowed;
-  background: var(--button-bg-disabled);
-  transform: none;
-}
-
-.signin__button--disabled:hover {
-  transform: none;
-}
-
-@media (max-width: 235px) {
-  .signin__container > *:not(:first-child) {
-    margin-top: 30px;
-  }
-
-  .signin__button {
-    height: 1.75rem;
-  }
-}
-</style>

From 3e2cd96b981041600e4f1fa5958acd738a2bcebf Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 6 Jun 2023 12:46:52 +0530
Subject: [PATCH 110/153] Remove notification dot

---
 src/App.vue | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 1096659e..6be527a1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -146,17 +146,6 @@ function canShowCollapseButton() {
       }"
     >
       <WalletButton class="relative z-1" />
-      <span
-        v-if="requestStore.areRequestsPendingForApproval"
-        class="absolute -top-[15vh] right-[20vh] flex h-3 w-3"
-      >
-        <span
-          class="animate-ping absolute inline-flex h-full w-full rounded-full bg-red-300 opacity-75 duration-[4s]"
-        ></span>
-        <span
-          class="relative inline-flex rounded-full h-3 w-3 bg-red-600"
-        ></span>
-      </span>
     </div>
   </div>
   <div v-else class="flex flex-col h-full bg-white-300 dark:bg-black-300">

From fe5099ae82ebb4803ea749125833b0ed8417689d Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 6 Jun 2023 12:47:12 +0530
Subject: [PATCH 111/153] Refresh list of NFTs after add

---
 src/pages/ManageNFTScreen.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/pages/ManageNFTScreen.vue b/src/pages/ManageNFTScreen.vue
index c83cae1c..3779a4aa 100644
--- a/src/pages/ManageNFTScreen.vue
+++ b/src/pages/ManageNFTScreen.vue
@@ -64,8 +64,15 @@ function handleEditToken(nft: NFT) {
 
 watch(
   () => modalStore.show,
-  () => {
-    if (!modalStore.show) showModal.value = false
+  async () => {
+    if (!modalStore.show) {
+      showModal.value = false
+      loader.show = true
+      loader.message = 'Loading NFTs...'
+      nftDB = await NFTDB.create(storage.local, userStore.walletAddress)
+      nfts.value = nftDB.getNFTs(Number(rpcStore.selectedChainId))
+      loader.show = false
+    }
   }
 )
 

From 04e6dcf5e3cd7e48e7980dae5fbe88d4f885900f Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 6 Jun 2023 12:47:26 +0530
Subject: [PATCH 112/153] Fix button sizes

---
 src/components/MFAProceedModal.vue        | 2 +-
 src/components/PrivateKeyCautionModal.vue | 2 +-
 src/components/SendNftPreview.vue         | 2 +-
 src/pages/NFTScreen.vue                   | 2 +-
 src/pages/SendNft.vue                     | 1 +
 src/pages/profileScreen.vue               | 4 ++--
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/MFAProceedModal.vue b/src/components/MFAProceedModal.vue
index 09581aba..79d1a946 100644
--- a/src/components/MFAProceedModal.vue
+++ b/src/components/MFAProceedModal.vue
@@ -25,7 +25,7 @@ const emit = defineEmits(['proceed', 'close'])
     </div>
     <div>
       <button
-        class="uppercase text-sm font-bold p-3 btn-primary flex justify-center items-center w-full"
+        class="uppercase text-sm font-bold p-2 btn-primary flex justify-center items-center w-full"
         @click.stop="emit('proceed')"
       >
         Proceed
diff --git a/src/components/PrivateKeyCautionModal.vue b/src/components/PrivateKeyCautionModal.vue
index c38fdbac..42d407fb 100644
--- a/src/components/PrivateKeyCautionModal.vue
+++ b/src/components/PrivateKeyCautionModal.vue
@@ -28,7 +28,7 @@ const emit = defineEmits(['proceed', 'close'])
     </div>
     <div>
       <button
-        class="uppercase text-sm font-bold p-3 btn-primary flex justify-center items-center w-full"
+        class="uppercase text-sm font-bold p-2 btn-primary flex justify-center items-center w-full"
         @click.stop="emit('proceed')"
       >
         Proceed
diff --git a/src/components/SendNftPreview.vue b/src/components/SendNftPreview.vue
index 9778ec61..4e7ee464 100644
--- a/src/components/SendNftPreview.vue
+++ b/src/components/SendNftPreview.vue
@@ -74,7 +74,7 @@ function truncateAddress(address: string) {
       <div class="flex flex-col gap-1">
         <div class="flex justify-between">
           <span class="text-base font-normal text-gray-100">Quantity</span>
-          <span class="text-base">10</span>
+          <span class="text-base">{{ props.previewData.quantity || 1 }}</span>
         </div>
         <div class="flex justify-between">
           <span class="text-base font-normal text-gray-100">Gas Fee</span>
diff --git a/src/pages/NFTScreen.vue b/src/pages/NFTScreen.vue
index 4de3e9f3..6de91e6c 100644
--- a/src/pages/NFTScreen.vue
+++ b/src/pages/NFTScreen.vue
@@ -48,7 +48,7 @@ onBeforeRouteLeave((to) => {
   </div>
   <div v-else class="h-full">
     <div class="pb-5 flex flex-col gap-3">
-      <span class="uppercase font-lg font-bold">NFTs</span>
+      <span class="font-lg font-bold">NFTs</span>
       <div class="card flex flex-col overflow-hidden">
         <NFTView
           :refresh-state="refreshState"
diff --git a/src/pages/SendNft.vue b/src/pages/SendNft.vue
index 132d6bab..f75c4128 100644
--- a/src/pages/SendNft.vue
+++ b/src/pages/SendNft.vue
@@ -215,6 +215,7 @@ async function handleShowPreview() {
         nftContractAddress: props.address,
         tokenId: props.tokenId,
         imageUrl: props.imageUrl,
+        quantity,
       }"
       @close="showPreview = false"
       @submit="handleSendToken"
diff --git a/src/pages/profileScreen.vue b/src/pages/profileScreen.vue
index 5c6744c4..2e393c70 100644
--- a/src/pages/profileScreen.vue
+++ b/src/pages/profileScreen.vue
@@ -179,7 +179,7 @@ watch(
     <div class="flex justify-center align-center">
       <span class="text-lg font-bold">Profile</span>
     </div>
-    <div class="card p-4 flex flex-col gap-4">
+    <div class="card p-4 flex flex-col gap-5">
       <div v-if="name" class="flex flex-col">
         <span class="text-sm text-gray-100">Name</span>
         <span class="text-lg font-bold">
@@ -241,7 +241,7 @@ watch(
       </div>
       <div class="flex">
         <button
-          class="flex flex-grow justify-center items-center btn-secondary p-3 font-bold text-sm uppercase"
+          class="flex flex-grow justify-center items-center btn-secondary p-2 font-bold text-sm uppercase"
           @click="handleLogout"
         >
           Logout

From 6829ed8732699d3a97836aec14971a45d2e44a27 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 7 Jun 2023 13:50:47 +0530
Subject: [PATCH 113/153] Add pending requests in activities

---
 src/assets/images/info-circle.svg         |  10 ++
 src/components/SendTransaction.vue        |  43 ++++--
 src/components/SendTransactionCompact.vue |  42 ++++--
 src/components/SignMessage.vue            |  53 +++++---
 src/components/SignMessageCompact.vue     |  42 ++++--
 src/components/SkippedRequestView.vue     | 154 ++++++++++++++++++++++
 src/pages/ActivitiesScreen.vue            |  14 ++
 src/store/app.ts                          |   6 +-
 src/store/request.ts                      |  28 ++++
 src/utils/requestManagement.ts            |  21 ++-
 10 files changed, 354 insertions(+), 59 deletions(-)
 create mode 100644 src/assets/images/info-circle.svg
 create mode 100644 src/components/SkippedRequestView.vue

diff --git a/src/assets/images/info-circle.svg b/src/assets/images/info-circle.svg
new file mode 100644
index 00000000..97e1f4b3
--- /dev/null
+++ b/src/assets/images/info-circle.svg
@@ -0,0 +1,10 @@
+<svg width="10" height="11" viewBox="0 0 10 11" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_847_4948)">
+<path d="M5.00016 7.16634V5.49967M5.00016 3.83301H5.00433M9.16683 5.49967C9.16683 7.80086 7.30135 9.66634 5.00016 9.66634C2.69898 9.66634 0.833496 7.80086 0.833496 5.49967C0.833496 3.19849 2.69898 1.33301 5.00016 1.33301C7.30135 1.33301 9.16683 3.19849 9.16683 5.49967Z" stroke="#8D8D8D" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_847_4948">
+<rect width="10" height="10" fill="white" transform="translate(0 0.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/components/SendTransaction.vue b/src/components/SendTransaction.vue
index 00db03a8..7845a374 100644
--- a/src/components/SendTransaction.vue
+++ b/src/components/SendTransaction.vue
@@ -2,6 +2,7 @@
 import { ethers } from 'ethers'
 import { ref, onMounted } from 'vue'
 import type { Ref } from 'vue'
+import { useRoute } from 'vue-router'
 
 import AppLoader from '@/components/AppLoader.vue'
 import GasPrice from '@/components/GasPrice.vue'
@@ -12,6 +13,7 @@ import {
   GAS_AVAILABLE_CHAIN_IDS,
 } from '@/services/gasPrice.service'
 import { useAppStore } from '@/store/app'
+import { useRequestStore } from '@/store/request'
 import { useRpcStore } from '@/store/rpc'
 import { advancedInfo } from '@/utils/advancedInfo'
 import { getRequestHandler } from '@/utils/requestHandlerSingleton'
@@ -32,6 +34,8 @@ const appStore = useAppStore()
 const getImage = useImage()
 const baseFee = ref('0')
 const chainId = Number(rpcStore.selectedChainId)
+const requestStore = useRequestStore()
+const route = useRoute()
 
 const gasPrices: Ref<object> = ref({})
 
@@ -82,7 +86,7 @@ function handleSetGasPrice(value) {
 </script>
 
 <template>
-  <div v-if="loader.show" class="flex justify-center items-center flex-1">
+  <div v-if="loader.show" class="flex justify-center items-center flex-1 p-4">
     <AppLoader :message="loader.message" />
   </div>
   <SendTransactionCompact
@@ -114,19 +118,32 @@ function handleSetGasPrice(value) {
       :base-fee="baseFee"
       @gas-price-input="handleSetGasPrice"
     />
-    <div class="mt-auto flex gap-2">
-      <button
-        class="btn-secondary p-2 uppercase w-full text-sm font-bold"
-        @click="emits('reject')"
+    <div class="mt-auto flex flex-col gap-4">
+      <div class="flex gap-2">
+        <button
+          class="btn-secondary p-2 uppercase w-full text-sm font-bold"
+          @click="emits('reject')"
+        >
+          Reject
+        </button>
+        <button
+          class="btn-primary p-2 uppercase w-full text-sm font-bold"
+          @click="emits('approve')"
+        >
+          Approve
+        </button>
+      </div>
+      <div
+        v-if="route.name === 'requests'"
+        class="flex items-center justify-center"
       >
-        Reject
-      </button>
-      <button
-        class="btn-primary p-2 uppercase w-full text-sm font-bold"
-        @click="emits('approve')"
-      >
-        Approve
-      </button>
+        <button
+          class="btn-tertiary text-sm font-bold"
+          @click.stop="requestStore.skipRequest(request.request.id)"
+        >
+          Do this later
+        </button>
+      </div>
     </div>
   </div>
 </template>
diff --git a/src/components/SendTransactionCompact.vue b/src/components/SendTransactionCompact.vue
index 78f127ac..ecdb0af8 100644
--- a/src/components/SendTransactionCompact.vue
+++ b/src/components/SendTransactionCompact.vue
@@ -1,9 +1,11 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
+import { useRoute } from 'vue-router'
 
 import DateTime from '@/components/DateTime.vue'
 import { useAppStore } from '@/store/app'
 import { useParentConnectionStore } from '@/store/parentConnection'
+import { useRequestStore } from '@/store/request'
 import { useRpcStore } from '@/store/rpc'
 import { GAS_FEE_UNIT, GAS_PRICE_SPEED_MAP } from '@/utils/constants'
 
@@ -14,6 +16,8 @@ const appStore = useAppStore()
 const parentConnectionStore = useParentConnectionStore()
 const gasFee = ref(0)
 const transactionTime = ref(null)
+const requestStore = useRequestStore()
+const route = useRoute()
 
 const props = defineProps({
   request: {
@@ -37,7 +41,6 @@ async function setHeight() {
     ?.promise
   await parentConnectionInstance?.setIframeStyle({
     ...appStore.iframeStyle(),
-    height: '300px',
   })
 }
 
@@ -71,19 +74,32 @@ function getGasPriceInfo() {
         </div>
       </div>
     </div>
-    <div class="flex gap-2 text-sm font-bold">
-      <button
-        class="uppercase w-full btn-secondary p-2"
-        @click="emits('reject')"
-      >
-        Reject
-      </button>
-      <button
-        class="uppercase w-full btn-primary p-2"
-        @click="emits('approve')"
+    <div class="flex flex-col gap-4">
+      <div class="flex gap-2 text-sm font-bold">
+        <button
+          class="uppercase w-full btn-secondary p-2"
+          @click="emits('reject')"
+        >
+          Reject
+        </button>
+        <button
+          class="uppercase w-full btn-primary p-2"
+          @click="emits('approve')"
+        >
+          Approve
+        </button>
+      </div>
+      <div
+        v-if="route.name === 'requests'"
+        class="flex items-center justify-center"
       >
-        Approve
-      </button>
+        <button
+          class="btn-tertiary text-sm font-bold"
+          @click.stop="requestStore.skipRequest(request.request.id)"
+        >
+          Do this later
+        </button>
+      </div>
     </div>
   </div>
 </template>
diff --git a/src/components/SignMessage.vue b/src/components/SignMessage.vue
index be2ed574..db0aecd5 100644
--- a/src/components/SignMessage.vue
+++ b/src/components/SignMessage.vue
@@ -1,18 +1,18 @@
 <script setup lang="ts">
-import { storeToRefs } from 'pinia'
+import { useRoute } from 'vue-router'
 
 import SignMessageAdvancedInfo from '@/components/signMessageAdvancedInfo.vue'
 import SignMessageCompact from '@/components/SignMessageCompact.vue'
 import type { Request } from '@/models/Connection'
 import { useAppStore } from '@/store/app'
+import { useRequestStore } from '@/store/request'
 import { useRpcStore } from '@/store/rpc'
 import { advancedInfo } from '@/utils/advancedInfo'
 import { methodAndAction } from '@/utils/method'
 
 const appStore = useAppStore()
-const rpcStore = useRpcStore()
-
-const { selectedRpcConfig } = storeToRefs(rpcStore)
+const requestStore = useRequestStore()
+const route = useRoute()
 
 defineProps({
   request: {
@@ -59,20 +59,41 @@ function getTitle(requestMethod: string) {
       <SignMessageAdvancedInfo
         :info="advancedInfo(request.request.method, request.request.params)"
       />
+      <div class="flex justify-center mt-4">
+        <div
+          class="flex bg-gray-300 rounded-sm p-2 text-xs gap-1 text-gray-100"
+        >
+          <img src="@/assets/images/info-circle.svg" />
+          <span>You're not going to be charged</span>
+        </div>
+      </div>
     </div>
-    <div class="mt-auto flex gap-2">
-      <button
-        class="btn-secondary p-2 uppercase w-full text-sm font-bold"
-        @click="emits('reject')"
-      >
-        Reject
-      </button>
-      <button
-        class="btn-primary p-2 uppercase w-full text-sm font-bold"
-        @click="emits('approve')"
+    <div class="mt-auto flex flex-col gap-4">
+      <div class="flex gap-2">
+        <button
+          class="btn-secondary p-2 uppercase w-full text-sm font-bold"
+          @click="emits('reject')"
+        >
+          Reject
+        </button>
+        <button
+          class="btn-primary p-2 uppercase w-full text-sm font-bold"
+          @click="emits('approve')"
+        >
+          Approve
+        </button>
+      </div>
+      <div
+        v-if="route.name === 'requests'"
+        class="flex items-center justify-center"
       >
-        Approve
-      </button>
+        <button
+          class="btn-tertiary text-sm font-bold"
+          @click.stop="requestStore.skipRequest(request.request.id)"
+        >
+          Do this later
+        </button>
+      </div>
     </div>
   </div>
 </template>
diff --git a/src/components/SignMessageCompact.vue b/src/components/SignMessageCompact.vue
index 75a2c653..22f4f400 100644
--- a/src/components/SignMessageCompact.vue
+++ b/src/components/SignMessageCompact.vue
@@ -1,6 +1,9 @@
 <script setup lang="ts">
+import { useRoute } from 'vue-router'
+
 import type { Request } from '@/models/Connection'
 import { useAppStore } from '@/store/app'
+import { useRequestStore } from '@/store/request'
 import { methodAndAction } from '@/utils/method'
 
 defineProps({
@@ -13,6 +16,8 @@ defineProps({
 const emits = defineEmits(['reject', 'approve'])
 
 const appStore = useAppStore()
+const route = useRoute()
+const requestStore = useRequestStore()
 
 const stateChangeRequests = [
   methodAndAction.wallet_addEthereumChain,
@@ -53,19 +58,32 @@ function getPermissionText(method, request) {
         {{ getPermissionText(request.request.method, request.request) }}
       </p>
     </div>
-    <div class="flex justify-end gap-4 text-sm font-bold">
-      <button
-        class="uppercase btn-secondary w-full p-2"
-        @click="emits('reject')"
-      >
-        Reject
-      </button>
-      <button
-        class="uppercase btn-primary w-full p-2"
-        @click="emits('approve')"
+    <div class="flex flex-col gap-4">
+      <div class="flex justify-end gap-4 text-sm font-bold">
+        <button
+          class="uppercase btn-secondary w-full p-2"
+          @click="emits('reject')"
+        >
+          Reject
+        </button>
+        <button
+          class="uppercase btn-primary w-full p-2"
+          @click="emits('approve')"
+        >
+          Approve
+        </button>
+      </div>
+      <div
+        v-if="route.name === 'requests'"
+        class="flex items-center justify-center"
       >
-        Approve
-      </button>
+        <button
+          class="btn-tertiary text-sm font-bold"
+          @click.stop="requestStore.skipRequest(request.request.id)"
+        >
+          Do this later
+        </button>
+      </div>
     </div>
   </div>
 </template>
diff --git a/src/components/SkippedRequestView.vue b/src/components/SkippedRequestView.vue
new file mode 100644
index 00000000..a7934100
--- /dev/null
+++ b/src/components/SkippedRequestView.vue
@@ -0,0 +1,154 @@
+<script setup lang="ts">
+import { watch, computed } from 'vue'
+import { useToast } from 'vue-toastification'
+
+import SendTransaction from '@/components/SendTransaction.vue'
+import SignMessage from '@/components/SignMessage.vue'
+import { router } from '@/routes'
+import { useRequestStore } from '@/store/request'
+
+const requestStore = useRequestStore()
+const toast = useToast()
+console.log(requestStore.skippedRequests)
+
+const currentRequest = computed(() => {
+  return requestStore.skippedRequestsForApproval[0]
+})
+
+const onApproveClick = (requestId) => {
+  if (isSendTransactionRequest(requestId)) {
+    const request = requestStore.skippedRequests[requestId].request
+    if (Array.isArray(request.params)) {
+      const param = request.params[0]
+      const gasPrice = String(param.gasPrice)
+      if (!gasPrice.length) {
+        toast.error('Please provide Gas Fee')
+        return
+      }
+    }
+  }
+  requestStore.approveSkippedRequest(requestId)
+}
+
+const onRejectClick = (requestId) => {
+  requestStore.rejectSkippedRequest(requestId)
+}
+
+const isSendTransactionRequest = (requestId) => {
+  const {
+    request: { method },
+  } = requestStore.skippedRequests[requestId]
+  return method === 'eth_sendTransaction'
+}
+
+function handleGasPriceInput({ value, requestId }) {
+  requestStore.setGasFee(value, requestId)
+}
+
+watch(
+  () => requestStore.skippedRequestsPendingForApprovalLength,
+  () => {
+    if (!requestStore.skippedRequestsPendingForApprovalLength) {
+      router.push({ name: 'home' })
+    }
+  }
+)
+</script>
+
+<template>
+  <div class="relative card flex flex-col gap-2">
+    <div class="card z-30 relative">
+      <SendTransaction
+        v-if="isSendTransactionRequest(currentRequest.request.id)"
+        :request="currentRequest"
+        @gas-price-input="handleGasPriceInput"
+        @reject="() => onRejectClick(currentRequest?.request.id)"
+        @approve="() => onApproveClick(currentRequest?.request.id)"
+      />
+      <SignMessage
+        v-else
+        :request="currentRequest"
+        @reject="() => onRejectClick(currentRequest?.request.id)"
+        @approve="() => onApproveClick(currentRequest?.request.id)"
+      />
+    </div>
+    <div
+      v-if="requestStore.skippedRequestsForApproval.length > 1"
+      class="border-gray-800 dark:border-gray-200 bg-white-300 dark:bg-black-300 border rounded-md absolute w-[90%] h-full -bottom-2 left-1/2 transform -translate-x-1/2 z-20"
+    ></div>
+    <div
+      v-if="requestStore.skippedRequestsForApproval.length > 2"
+      class="border-gray-800 dark:border-gray-200 bg-white-300 dark:bg-black-300 border rounded-md absolute w-[82%] h-full -bottom-4 left-1/2 transform -translate-x-1/2 z-10"
+    ></div>
+  </div>
+</template>
+
+<style scoped>
+.sign__messages-container {
+  height: 100%;
+  overflow: hidden;
+}
+
+.sign__message-container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: var(--p-400);
+  overflow: auto;
+}
+
+.sign__message-footer {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.sign__message-info-text {
+  display: flex;
+  align-items: center;
+  font-size: var(--fs-300);
+  color: var(--fg-color);
+}
+
+.sign__message-info-icon {
+  width: 12.5px;
+  height: 12.5px;
+  margin-left: 6px;
+}
+
+.sign__message-button-container {
+  width: calc(100% + 2rem);
+  background: var(--request-footer-bg);
+}
+
+.sign__message-button-reject,
+.sign__message-button-approve {
+  flex: 1;
+  padding: var(--p-250);
+  font-size: var(--fs-350);
+  font-weight: 600;
+  text-transform: uppercase;
+  border: 2px solid #101010;
+  border-radius: 10px;
+}
+
+.sign__message-button-reject {
+  margin-right: 5px;
+  color: var(--outlined-button-fg-color);
+  border-color: var(--outlined-button-border-color);
+}
+
+.sign__message-button-approve {
+  margin-left: 5px;
+  color: var(--filled-button-fg-color);
+  text-transform: uppercase;
+  background-color: var(--filled-button-bg-color);
+}
+
+.sign__message-button-reject:hover,
+.sign__message-button-approve:hover {
+  transition: all 0.5s;
+  transform: scale(1.05, 1.05);
+}
+</style>
diff --git a/src/pages/ActivitiesScreen.vue b/src/pages/ActivitiesScreen.vue
index b61012f6..72c8f357 100644
--- a/src/pages/ActivitiesScreen.vue
+++ b/src/pages/ActivitiesScreen.vue
@@ -4,9 +4,11 @@ import type { Ref } from 'vue'
 import { ref, onMounted, computed, type ComputedRef } from 'vue'
 
 import ActivityView from '@/components/ActivityView.vue'
+import SkippedRequestView from '@/components/SkippedRequestView.vue'
 import { getExchangeRate } from '@/services/exchangeRate.service'
 import type { CurrencySymbol } from '@/services/exchangeRate.service'
 import { useActivitiesStore, type Activity } from '@/store/activities'
+import { useRequestStore } from '@/store/request'
 import { useRpcStore } from '@/store/rpc'
 
 const filters = [
@@ -35,6 +37,7 @@ onMounted(() => {
 })
 
 const rpcStore = useRpcStore()
+const requestStore = useRequestStore()
 
 const showFilter = ref(false)
 const selectedFilter = ref(filters[0].value)
@@ -74,6 +77,17 @@ async function getCurrencyExchangeRate() {
     <div class="flex justify-between relative items-center">
       <h1 class="font-bold text-xl text-center flex-grow">Activities</h1>
     </div>
+    <div
+      v-if="requestStore.skippedRequestsPendingForApprovalLength"
+      class="flex-1 flex flex-col gap-2"
+    >
+      <span class="text-xs text-gray-100 font-bold"
+        >Pending ({{
+          requestStore.skippedRequestsPendingForApprovalLength
+        }})</span
+      >
+      <SkippedRequestView />
+    </div>
     <div class="flex-1 flex flex-col gap-2">
       <span class="text-xs text-gray-100 font-bold"
         >Confirmed ({{ activities.length }})</span
diff --git a/src/store/app.ts b/src/store/app.ts
index e6b4ee6d..ed90252c 100644
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -25,6 +25,7 @@ type AppState = {
   appLogo: AppLogo
   compactMode: boolean
   sdkVersion: SDKVersion | null
+  expandedByRequest: boolean
 }
 
 export const useAppStore = defineStore('app', {
@@ -38,6 +39,7 @@ export const useAppStore = defineStore('app', {
       walletPosition: 'right',
       compactMode: false,
       sdkVersion: null,
+      expandedByRequest: false,
     } as AppState),
   getters: {
     iframeStyle: ({
@@ -56,8 +58,8 @@ export const useAppStore = defineStore('app', {
             ? compactMode
               ? requestStore.pendingRequest?.request.method ===
                 'eth_sendTransaction'
-                ? '300px'
-                : '260px'
+                ? '328px'
+                : '288px'
               : '80vh'
             : '40px'
           : '0'
diff --git a/src/store/request.ts b/src/store/request.ts
index 0cd55906..82fba752 100644
--- a/src/store/request.ts
+++ b/src/store/request.ts
@@ -9,6 +9,7 @@ type PendingRequest = {
 
 type RequestState = {
   pendingRequests: { [key: string]: PendingRequest }
+  skippedRequests: { [key: string]: PendingRequest }
   processQueue: PendingRequest[]
 }
 
@@ -17,6 +18,7 @@ export const useRequestStore = defineStore('request', {
     ({
       pendingRequests: {},
       processQueue: [],
+      skippedRequests: {},
     } as RequestState),
   getters: {
     pendingRequestsForApproval({ pendingRequests }): PendingRequest[] {
@@ -26,11 +28,22 @@ export const useRequestStore = defineStore('request', {
       const requests = Object.values(state.pendingRequests)
       return requests.length > 0
     },
+    skippedRequestsPendingForApprovalLength(state: RequestState): number {
+      return Object.values(state.skippedRequests).length
+    },
+    skippedRequestsForApproval({ skippedRequests }): PendingRequest[] {
+      return Object.values(skippedRequests)
+    },
     pendingRequest({ pendingRequests }) {
       if (this.areRequestsPendingForApproval) {
         return Object.values(pendingRequests)[0]
       }
     },
+    skippedRequest({ skippedRequests }) {
+      if (this.skippedRequestsPendingForApprovalLength > 0) {
+        return Object.values(skippedRequests)[0]
+      }
+    },
   },
   actions: {
     addRequests(
@@ -55,11 +68,26 @@ export const useRequestStore = defineStore('request', {
         param.gasPrice = gasPrice
       }
     },
+    skipRequest(requestId: string): void {
+      this.skippedRequests[requestId] = this.pendingRequests[requestId]
+      console.log(this.skippedRequests)
+      delete this.pendingRequests[requestId]
+    },
+    approveSkippedRequest(requestId: string): void {
+      this.skippedRequests[requestId].isPermissionGranted = true
+      this.processQueue.push(this.skippedRequests[requestId])
+      delete this.skippedRequests[requestId]
+    },
     approveRequest(requestId: string): void {
       this.pendingRequests[requestId].isPermissionGranted = true
       this.processQueue.push(this.pendingRequests[requestId])
       delete this.pendingRequests[requestId]
     },
+    rejectSkippedRequest(requestId: string): void {
+      this.skippedRequests[requestId].isPermissionGranted = false
+      this.processQueue.push(this.skippedRequests[requestId])
+      delete this.skippedRequests[requestId]
+    },
     rejectRequest(requestId: string): void {
       this.pendingRequests[requestId].isPermissionGranted = false
       this.processQueue.push(this.pendingRequests[requestId])
diff --git a/src/utils/requestManagement.ts b/src/utils/requestManagement.ts
index 499d0ac8..2ffafacb 100644
--- a/src/utils/requestManagement.ts
+++ b/src/utils/requestManagement.ts
@@ -62,13 +62,23 @@ async function watchRequestQueue(keeper) {
         const method = request?.request.method
         if (
           appMode === AppMode.Widget &&
-          pendingRequestCount === 0 &&
+          !pendingRequestCount &&
           appStore.sdkVersion !== 'v3'
         ) {
           connectionInstance.closePopup()
-        } else if (pendingRequestCount === 0 && method && PERMISSIONS[method]) {
-          appStore.expandWallet = false
+        } else if (!pendingRequestCount && method && PERMISSIONS[method]) {
           appStore.compactMode = false
+          if (appStore.expandedByRequest) {
+            appStore.expandedByRequest = false
+            appStore.expandWallet = false
+          }
+        }
+      }
+      if (!pendingRequestCount) {
+        appStore.compactMode = false
+        if (appStore.expandedByRequest) {
+          appStore.expandedByRequest = false
+          appStore.expandWallet = false
         }
       }
     },
@@ -452,6 +462,11 @@ async function handleRequest(request, requestStore, appStore, keeper) {
   const isPermissionRequired = requirePermission(request, appStore.validAppMode)
   if (isPermissionRequired) {
     if (appStore.sdkVersion === 'v3') {
+      console.log('appStore.expandWallet', appStore.expandWallet)
+      if (!appStore.expandWallet) {
+        appStore.expandedByRequest = true
+      }
+      console.log('appStore.expandedByRequest', appStore.expandedByRequest)
       appStore.expandWallet = true
       appStore.compactMode = isPermissionRequired
     } else {

From 983929ac0c6f5f871deb6211b1c6b22f79361409 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 7 Jun 2023 13:52:48 +0530
Subject: [PATCH 114/153] Only show skip in UI mode

---
 src/components/SendTransactionCompact.vue | 6 ++++--
 src/components/SignMessage.vue            | 5 ++++-
 src/components/SignMessageCompact.vue     | 5 ++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/SendTransactionCompact.vue b/src/components/SendTransactionCompact.vue
index ecdb0af8..5f5e8bdb 100644
--- a/src/components/SendTransactionCompact.vue
+++ b/src/components/SendTransactionCompact.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
+import { AppMode } from '@arcana/auth'
 import { onMounted, ref } from 'vue'
 import { useRoute } from 'vue-router'
 
-import DateTime from '@/components/DateTime.vue'
 import { useAppStore } from '@/store/app'
 import { useParentConnectionStore } from '@/store/parentConnection'
 import { useRequestStore } from '@/store/request'
@@ -90,7 +90,9 @@ function getGasPriceInfo() {
         </button>
       </div>
       <div
-        v-if="route.name === 'requests'"
+        v-if="
+          route.name === 'requests' && appStore.validAppMode === AppMode.Full
+        "
         class="flex items-center justify-center"
       >
         <button
diff --git a/src/components/SignMessage.vue b/src/components/SignMessage.vue
index db0aecd5..2da2fdfb 100644
--- a/src/components/SignMessage.vue
+++ b/src/components/SignMessage.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { AppMode } from '@arcana/auth'
 import { useRoute } from 'vue-router'
 
 import SignMessageAdvancedInfo from '@/components/signMessageAdvancedInfo.vue'
@@ -84,7 +85,9 @@ function getTitle(requestMethod: string) {
         </button>
       </div>
       <div
-        v-if="route.name === 'requests'"
+        v-if="
+          route.name === 'requests' && appStore.validAppMode === AppMode.Full
+        "
         class="flex items-center justify-center"
       >
         <button
diff --git a/src/components/SignMessageCompact.vue b/src/components/SignMessageCompact.vue
index 22f4f400..de3b325c 100644
--- a/src/components/SignMessageCompact.vue
+++ b/src/components/SignMessageCompact.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { AppMode } from '@arcana/auth'
 import { useRoute } from 'vue-router'
 
 import type { Request } from '@/models/Connection'
@@ -74,7 +75,9 @@ function getPermissionText(method, request) {
         </button>
       </div>
       <div
-        v-if="route.name === 'requests'"
+        v-if="
+          route.name === 'requests' && appStore.validAppMode === AppMode.Full
+        "
         class="flex items-center justify-center"
       >
         <button

From 1d551f437ccc5bbd9100ab9831cf27859a3b8bc4 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 7 Jun 2023 14:00:17 +0530
Subject: [PATCH 115/153] Only show in UI mode

---
 src/components/SendTransaction.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/SendTransaction.vue b/src/components/SendTransaction.vue
index 7845a374..795c3d9c 100644
--- a/src/components/SendTransaction.vue
+++ b/src/components/SendTransaction.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { AppMode } from '@arcana/auth'
 import { ethers } from 'ethers'
 import { ref, onMounted } from 'vue'
 import type { Ref } from 'vue'
@@ -134,7 +135,9 @@ function handleSetGasPrice(value) {
         </button>
       </div>
       <div
-        v-if="route.name === 'requests'"
+        v-if="
+          route.name === 'requests' && appStore.validAppMode === AppMode.Full
+        "
         class="flex items-center justify-center"
       >
         <button

From 6d9ab610b422414596cb3eaa462f428691cd290e Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 7 Jun 2023 15:50:02 +0530
Subject: [PATCH 116/153] Remove green success check mark

---
 src/components/signMessageNoRequests.vue | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/components/signMessageNoRequests.vue b/src/components/signMessageNoRequests.vue
index 6fb1bc06..0c4feb41 100644
--- a/src/components/signMessageNoRequests.vue
+++ b/src/components/signMessageNoRequests.vue
@@ -1,19 +1,8 @@
-<script setup lang="ts">
-import { getIconAsset } from '@/utils/useImage'
-</script>
-
 <template>
   <div
     class="no-requests__container flex-1 flex flex-col content-center justify-center h-full"
   >
-    <img
-      :src="getIconAsset('no-pending-requests.svg')"
-      alt="Tick Icon"
-      class="w-20 h-20 mx-auto mb-5"
-    />
-    <p class="no-requests__text font-semibold text-center">
-      No Pending Requests!
-    </p>
+    <p class="no-requests__text font-semibold text-center"></p>
   </div>
 </template>
 

From 405376af7d4f05c7a8f85f8385a4af89ef73ae30 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 7 Jun 2023 15:51:42 +0530
Subject: [PATCH 117/153] Remove obsolete styles

---
 src/components/SkippedRequestView.vue | 70 ---------------------------
 1 file changed, 70 deletions(-)

diff --git a/src/components/SkippedRequestView.vue b/src/components/SkippedRequestView.vue
index a7934100..8ee4815f 100644
--- a/src/components/SkippedRequestView.vue
+++ b/src/components/SkippedRequestView.vue
@@ -82,73 +82,3 @@ watch(
     ></div>
   </div>
 </template>
-
-<style scoped>
-.sign__messages-container {
-  height: 100%;
-  overflow: hidden;
-}
-
-.sign__message-container {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  padding: var(--p-400);
-  overflow: auto;
-}
-
-.sign__message-footer {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.sign__message-info-text {
-  display: flex;
-  align-items: center;
-  font-size: var(--fs-300);
-  color: var(--fg-color);
-}
-
-.sign__message-info-icon {
-  width: 12.5px;
-  height: 12.5px;
-  margin-left: 6px;
-}
-
-.sign__message-button-container {
-  width: calc(100% + 2rem);
-  background: var(--request-footer-bg);
-}
-
-.sign__message-button-reject,
-.sign__message-button-approve {
-  flex: 1;
-  padding: var(--p-250);
-  font-size: var(--fs-350);
-  font-weight: 600;
-  text-transform: uppercase;
-  border: 2px solid #101010;
-  border-radius: 10px;
-}
-
-.sign__message-button-reject {
-  margin-right: 5px;
-  color: var(--outlined-button-fg-color);
-  border-color: var(--outlined-button-border-color);
-}
-
-.sign__message-button-approve {
-  margin-left: 5px;
-  color: var(--filled-button-fg-color);
-  text-transform: uppercase;
-  background-color: var(--filled-button-bg-color);
-}
-
-.sign__message-button-reject:hover,
-.sign__message-button-approve:hover {
-  transition: all 0.5s;
-  transform: scale(1.05, 1.05);
-}
-</style>

From 2b9d816257b0edd710d99346a5eb4962b8f52405 Mon Sep 17 00:00:00 2001
From: karthikdurai <iamkarthiksiddarth@gmail.com>
Date: Thu, 8 Jun 2023 10:41:49 +0530
Subject: [PATCH 118/153] implement nft search

---
 src/components/NFTView.vue | 38 +++++++++++++++++++++++++++++++-------
 src/pages/NFTScreen.vue    |  6 +-----
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/components/NFTView.vue b/src/components/NFTView.vue
index 1db9249d..df9189cc 100644
--- a/src/components/NFTView.vue
+++ b/src/components/NFTView.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref, type Ref, reactive, watch } from 'vue'
+import { onMounted, ref, type Ref, reactive, watch, computed } from 'vue'
 import { useRouter } from 'vue-router'
 
 import type { NFT } from '@/models/NFT'
@@ -14,6 +14,7 @@ const userStore = useUserStore()
 const rpcStore = useRpcStore()
 const storage = getStorage()
 let nftDB: NFTDB
+const searchTerm = ref('')
 
 type NFTViewProps = {
   refreshState?: boolean
@@ -33,7 +34,6 @@ async function getNFTAssets() {
   loader.show = true
   nftDB = await NFTDB.create(storage.local, userStore.walletAddress)
   nfts.value = await getDetailedNFTs(nftDB, Number(rpcStore.selectedChainId))
-
   loader.show = false
 }
 
@@ -66,14 +66,38 @@ watch(
     }
   }
 )
+
+const filteredNFTs = computed(() => {
+  return nfts.value.filter(
+    (item) =>
+      item.name.toLowerCase().includes(searchTerm.value.toLowerCase()) ||
+      item.tokenId.toLowerCase().includes(searchTerm.value.toLowerCase())
+  )
+})
+
+watch(filteredNFTs.value, () => {
+  console.log({ filteredNFTs })
+})
 </script>
 
 <template>
-  <div>
-    <div class="flex flex-col max-h-96">
+  <div class="space-y-3">
+    <div v-if="!loader.show && nfts.length" class="flex flex-col space-y-1">
+      <label for="search-nft" class="text-sm">Search NFT</label>
+      <div class="card flex px-3 space-x-2">
+        <img :src="getImage('search.svg')" alt="search" />
+        <input
+          id="search-nft"
+          v-model="searchTerm"
+          class="w-full py-3 px-0"
+          placeholder="Type the name or ID of the NFT"
+        />
+      </div>
+    </div>
+    <div class="card flex flex-col max-h-96">
       <div
         v-if="loader.show"
-        class="flex justify-center items-center flex-1 flex p-3 m-1"
+        class="flex justify-center items-center flex-1 p-3 m-1"
       >
         <p class="text-sm font-bold">
           {{ loader.message }}
@@ -82,7 +106,7 @@ watch(
       <div v-else class="p-3 m-1 overflow-y-auto">
         <div v-if="nfts.length" class="grid grid-cols-2 gap-[10px]">
           <div
-            v-for="nft in nfts"
+            v-for="nft in filteredNFTs"
             :key="`nft-${nft.address}-${nft.tokenId}`"
             class="nft-card rounded cursor-pointer"
             @click.stop="
@@ -120,7 +144,7 @@ watch(
       </div>
       <div class="flex justify-center">
         <button
-          class="btn-quaternery border-b-0 border-t-1 border-x-0 flex py-1 gap-1 text-sm items-center cursor-pointer flex-grow justify-center"
+          class="btn-quaternery border-b-0 border-t-1 border-x-0 flex py-1 gap-1 text-sm items-center cursor-pointer flex-grow justify-center rounded-b-md"
           @click.stop="handleManageNFT"
         >
           <img :src="getImage('settings.svg')" />
diff --git a/src/pages/NFTScreen.vue b/src/pages/NFTScreen.vue
index 6de91e6c..f9e6b4b0 100644
--- a/src/pages/NFTScreen.vue
+++ b/src/pages/NFTScreen.vue
@@ -33,10 +33,6 @@ onMounted(async () => {
   helpOtherTabsLogin()
 })
 
-async function handleRefresh() {
-  refreshState.value = true
-}
-
 onBeforeRouteLeave((to) => {
   if (to.path.includes('login')) parentConnection?.destroy()
 })
@@ -49,7 +45,7 @@ onBeforeRouteLeave((to) => {
   <div v-else class="h-full">
     <div class="pb-5 flex flex-col gap-3">
       <span class="font-lg font-bold">NFTs</span>
-      <div class="card flex flex-col overflow-hidden">
+      <div class="flex flex-col overflow-hidden">
         <NFTView
           :refresh-state="refreshState"
           @refreshed="refreshState = false"

From f9a421ea721f8fdb3af63376f2b2567e7e53af0c Mon Sep 17 00:00:00 2001
From: makylfang <makyl@newfang.io>
Date: Thu, 8 Jun 2023 10:02:10 +0400
Subject: [PATCH 119/153] [Feature] New login flow (#340)

* Updated signin flow for social

* Removed isV3 check from redirect

* Updated auth core version, added backcompat for older auth sdk, added standalone hooks

* checking dashboard fix (#346)

* Fixed redirectUtils duplication of code, fixed duplication of handleLogin code

* Removed checking of ev.data

* Storing to session after mfa restore

* Emit mfa setup for standalone app

* Emit mfa setup event

* fix expandWallet issue
---
 package-lock.json                     |  59 +++-
 package.json                          |   2 +-
 src/App.vue                           |  12 +-
 src/components/ActivityView.vue       |  15 +
 src/components/AssetsView.vue         |   4 +-
 src/models/Connection.ts              |   4 +-
 src/pages/MFARequiredScreen.vue       |  87 ++---
 src/pages/MFARestoreScreen.vue        |  43 +--
 src/pages/backCompat/initPage.vue     |  24 +-
 src/pages/backCompat/signIn.vue       | 480 +++++++++++++-------------
 src/pages/initPageV2.vue              |  26 +-
 src/pages/loggedInView.vue            |  16 +-
 src/pages/loginRedirect.vue           |  76 ++--
 src/pages/profileScreen.vue           |  87 ++---
 src/pages/signInV2.vue                | 352 ++++++-------------
 src/store/app.ts                      |   5 +
 src/store/user.ts                     |   5 +-
 src/utils/PasswordlessLoginHandler.ts |   2 +-
 src/utils/getAuthProvider.ts          |   7 +-
 src/utils/hash.ts                     |  13 +
 src/utils/redirectUtils.ts            | 237 ++++++++-----
 src/utils/requestHandlerSingleton.ts  |  13 +-
 src/utils/requestManagement.ts        |  15 +-
 23 files changed, 808 insertions(+), 776 deletions(-)
 create mode 100644 src/utils/hash.ts

diff --git a/package-lock.json b/package-lock.json
index 2a9d271e..4ec2063a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "@arcana/auth": "^0.1.3",
-        "@arcana/auth-core": "^1.0.0-beta.7",
+        "@arcana/auth-core": "^1.0.0-beta.8",
         "@arcana/key-helper": "^1.0.0-beta.7",
         "@ethereumjs/tx": "^3.4.0",
         "@fontsource/montserrat": "^4.5.14",
@@ -82,6 +82,51 @@
         "typescript": "~4.5.5"
       }
     },
+    "../auth-core": {
+      "name": "@arcana/auth-core",
+      "version": "1.0.0-beta.8",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "@arcana/keystore": "^1.0.0",
+        "@stablelib/base64": "^1.0.1",
+        "ethers": "^5.5.1"
+      },
+      "devDependencies": {
+        "@babel/core": "^7.15.0",
+        "@babel/preset-env": "^7.15.0",
+        "@babel/preset-typescript": "^7.15.0",
+        "@peculiar/webcrypto": "^1.1.7",
+        "@types/jest": "^27.0.1",
+        "@typescript-eslint/eslint-plugin": "^4.29.2",
+        "@typescript-eslint/parser": "^4.29.2",
+        "assert": "^2.0.0",
+        "babel-jest": "^27.0.6",
+        "buffer": "^6.0.3",
+        "crypto-browserify": "^3.12.0",
+        "esbuild": "^0.14.10",
+        "esbuild-plugin-alias": "^0.2.1",
+        "eslint": "^7.32.0",
+        "eslint-config-airbnb-base": "^14.2.1",
+        "eslint-plugin-import": "^2.24.0",
+        "eslint-plugin-tsdoc": "^0.2.16",
+        "husky": "^7.0.2",
+        "jest": "^27.0.6",
+        "jest-environment-jsdom": "^27.2.4",
+        "jest-fetch-mock": "^3.0.3",
+        "node-stdlib-browser": "^1.2.0",
+        "prettier": "^2.6.1",
+        "process": "^0.11.10",
+        "rimraf": "^3.0.2",
+        "stream-browserify": "^3.0.0",
+        "ts-loader": "^9.2.6",
+        "typedoc": "^0.22.15",
+        "typedoc-plugin-extras": "^2.2.3",
+        "typedoc-plugin-markdown": "^3.12.1",
+        "typescript": "^4.4.4",
+        "util": "^0.12.4"
+      }
+    },
     "node_modules/@achrinza/node-ipc": {
       "version": "9.2.5",
       "resolved": "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.5.tgz",
@@ -122,9 +167,9 @@
       }
     },
     "node_modules/@arcana/auth-core": {
-      "version": "1.0.0-beta.7",
-      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.7.tgz",
-      "integrity": "sha512-+W0izQ/onZnsnffe1W/7nBfyiIrSDNP8bkJ/9WhgBM0EJh00KNJ4MT9aSf4v7Y5KEsJRFF6mPrENjItf2i7mVA==",
+      "version": "1.0.0-beta.8",
+      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.8.tgz",
+      "integrity": "sha512-A7pgnBydII2c4EFjNcyzIjT1bsqWEgo6kxFm77BIQiNNBkPfPAq2DN70YzDoTtn0sEDYHZvj1hJn5bs6KKAtLA==",
       "dependencies": {
         "@arcana/keystore": "^1.0.0",
         "@stablelib/base64": "^1.0.1",
@@ -18929,9 +18974,9 @@
       }
     },
     "@arcana/auth-core": {
-      "version": "1.0.0-beta.7",
-      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.7.tgz",
-      "integrity": "sha512-+W0izQ/onZnsnffe1W/7nBfyiIrSDNP8bkJ/9WhgBM0EJh00KNJ4MT9aSf4v7Y5KEsJRFF6mPrENjItf2i7mVA==",
+      "version": "1.0.0-beta.8",
+      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.8.tgz",
+      "integrity": "sha512-A7pgnBydII2c4EFjNcyzIjT1bsqWEgo6kxFm77BIQiNNBkPfPAq2DN70YzDoTtn0sEDYHZvj1hJn5bs6KKAtLA==",
       "requires": {
         "@arcana/keystore": "^1.0.0",
         "@stablelib/base64": "^1.0.1",
diff --git a/package.json b/package.json
index 7ca01ba8..a118c8d9 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@arcana/auth": "^0.1.3",
-    "@arcana/auth-core": "^1.0.0-beta.7",
+    "@arcana/auth-core": "^1.0.0-beta.8",
     "@arcana/key-helper": "^1.0.0-beta.7",
     "@ethereumjs/tx": "^3.4.0",
     "@fontsource/montserrat": "^4.5.14",
diff --git a/src/App.vue b/src/App.vue
index 6be527a1..e7903ef5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -92,9 +92,15 @@ const showFooter = computed(() => {
   )
 })
 
-function onClickOfHeader() {
-  if (app.compactMode) app.compactMode = false
-  else app.expandWallet = false
+async function onClickOfHeader() {
+  const c = await parentConnectionStore.parentConnection?.promise
+  if (app.compactMode) {
+    app.compactMode = false
+  } else {
+    app.standaloneMode == 1 || app.standaloneMode == 2
+      ? c?.uiEvent('wallet_close', null)
+      : (app.expandWallet = false)
+  }
 }
 
 function canShowCollapseButton() {
diff --git a/src/components/ActivityView.vue b/src/components/ActivityView.vue
index b05192cb..a0fad41a 100644
--- a/src/components/ActivityView.vue
+++ b/src/components/ActivityView.vue
@@ -5,6 +5,8 @@ import { computed, ComputedRef } from 'vue'
 
 import { useActivitiesStore } from '@/store/activities'
 import type { Activity, TransactionOps, FileOps } from '@/store/activities'
+import { useAppStore } from '@/store/app'
+import { useParentConnectionStore } from '@/store/parentConnection'
 import { useRpcStore } from '@/store/rpc'
 import { beautifyBalance } from '@/utils/formatTokenDecimals'
 import { truncateEnd, truncateMid } from '@/utils/stringUtils'
@@ -15,6 +17,7 @@ type ActivityViewProps = {
   filterOperations: string[]
 }
 
+const app = useAppStore()
 const props = defineProps<ActivityViewProps>()
 
 const activitiesStore = useActivitiesStore()
@@ -25,6 +28,17 @@ type ActivityView = Activity & {
   isExpanded?: boolean
 }
 
+const parentConnectionStore = useParentConnectionStore()
+const handleExplorerClick = async (e: MouseEvent) => {
+  if (app.standaloneMode == 2) {
+    const c = await parentConnectionStore.parentConnection?.promise
+    if (e.target instanceof HTMLAnchorElement) {
+      c?.uiEvent('open_url', { url: e.target?.href })
+      e.preventDefault()
+    }
+  }
+}
+
 const [explorerUrl] = rpcStore.selectedRpcConfig?.blockExplorerUrls || []
 
 const activities: ComputedRef<ActivityView[]> = computed(() => {
@@ -353,6 +367,7 @@ function canShowDropdown(activity: Activity) {
             :href="`${explorerUrl}/tx/${activity.txHash}`"
             class="flex font-montserrat font-medium text-xs"
             target="_blank"
+            @click="handleExplorerClick"
           >
             View on Explorer
             <img
diff --git a/src/components/AssetsView.vue b/src/components/AssetsView.vue
index 825e8af1..ee395a09 100644
--- a/src/components/AssetsView.vue
+++ b/src/components/AssetsView.vue
@@ -57,9 +57,7 @@ function fetchNativeAsset() {
 }
 
 async function getAssetsBalance() {
-  await sleep(100)
-  assets.length = 0
-  assets.push(fetchNativeAsset())
+  const assets = [fetchNativeAsset()]
   const storedAssetContracts = fetchStoredAssetContracts()
   storedAssetContracts.forEach((contract) => {
     assets.push({
diff --git a/src/models/Connection.ts b/src/models/Connection.ts
index ba2ce5af..aeecb48c 100644
--- a/src/models/Connection.ts
+++ b/src/models/Connection.ts
@@ -52,7 +52,7 @@ type RedirectParentConnectionApi = {
   redirect(url: string | null): Promise<void>
   replyTo(parentAppUrl?: string | null): Promise<void>
   goToWallet(): Promise<void>
-  error(errorMessage: string, parentAppUrl: string): Promise<void>
+  error(errorMessage: string): Promise<void>
 }
 
 type ParentConnectionApi = {
@@ -65,6 +65,7 @@ type ParentConnectionApi = {
   sendPendingRequestCount(count: number): void
   getParentUrl(): string
   onEvent(event: string, params?: ProviderEvent): void
+  uiEvent(event: string, val: any): void
   getAppMode(): Promise<AppMode>
   triggerSocialLogin(type: SocialLoginType): void
   triggerPasswordlessLogin(email: string): void
@@ -77,6 +78,7 @@ type InitParentConnectionApi = {
   getLoginSource(): string
   getPasswordlessParams(): { sessionId: string; setToken: string }
   error(e: string): void
+  uiEvent(event: string, val: any): void
   setIframeStyle(styles: Partial<CSSStyleDeclaration>): void
 }
 
diff --git a/src/pages/MFARequiredScreen.vue b/src/pages/MFARequiredScreen.vue
index b5b99aa8..73694af2 100644
--- a/src/pages/MFARequiredScreen.vue
+++ b/src/pages/MFARequiredScreen.vue
@@ -5,6 +5,7 @@ import { useToast } from 'vue-toastification'
 
 import AppLoader from '@/components/AppLoader.vue'
 import { useAppStore } from '@/store/app'
+import { useParentConnectionStore } from '@/store/parentConnection'
 import { useUserStore } from '@/store/user'
 import { AUTH_URL, DOCS_URL } from '@/utils/constants'
 import { getWindowFeatures } from '@/utils/popupProps'
@@ -25,51 +26,55 @@ const storage = getStorage()
 async function handleProceed() {
   cleanExit = false
   const mfaSetupPath = new URL(`mfa/${appStore.id}/setup`, AUTH_URL)
-  mfaWindow = window.open(
-    mfaSetupPath.toString(),
-    '_blank',
-    getWindowFeatures()
-  )
-  const handler = async (event: MessageEvent) => {
-    if (!event?.data?.status) {
-      return
-    }
-    cleanExit = true
-    const data = event.data
+  if (appStore.standaloneMode == 0) {
+    mfaWindow = window.open(
+      mfaSetupPath.toString(),
+      '_blank',
+      getWindowFeatures()
+    )
+    const handler = async (event: MessageEvent) => {
+      if (!event?.data?.status) {
+        return
+      }
+      cleanExit = true
+      const data = event.data
 
-    if (data.status === 'success') {
-      mfaWindow?.close()
-      storage.local.setItem(`${user.info.id}-has-mfa`, '1')
-      user.hasMfa = true
-      toast.success('MFA setup completed')
-      window.removeEventListener('message', handler, false)
-      hideLoader()
-      router.push({ name: 'home' })
-    } else if (data.status == 'error') {
-      mfaWindow?.close()
-      window.removeEventListener('message', handler, false)
-      hideLoader()
-      if (data.error !== 'User cancelled the setup') toast.error(data.error)
-    } else {
-      toast.error('Error occured while setting up MFA. Please try again')
-      console.log('Unexpected event')
+      if (data.status === 'success') {
+        mfaWindow?.close()
+        storage.local.setItem(`${user.info.id}-has-mfa`, '1')
+        user.hasMfa = true
+        toast.success('MFA setup completed')
+        window.removeEventListener('message', handler, false)
+        hideLoader()
+        router.push({ name: 'home' })
+      } else if (data.status == 'error') {
+        mfaWindow?.close()
+        window.removeEventListener('message', handler, false)
+        hideLoader()
+        if (data.error !== 'User cancelled the setup') toast.error(data.error)
+      } else {
+        toast.error('Error occured while setting up MFA. Please try again')
+        console.log('Unexpected event')
+      }
+    }
+    window.addEventListener('message', handler, false)
+    loader.value = {
+      show: true,
+      message: 'Setting up MFA...',
     }
-  }
-  window.addEventListener('message', handler, false)
 
-  loader.value = {
-    show: true,
-    message: 'Setting up MFA...',
+    const id = window.setInterval(() => {
+      if (!cleanExit && mfaWindow?.closed) {
+        console.error('User closed the popup')
+        window.removeEventListener('message', handler, false)
+        hideLoader()
+        clearInterval(id)
+      }
+    }, 500)
+  } else {
+    const c = await useParentConnectionStore().parentConnection?.promise
+    c?.uiEvent('mfa_setup', {})
   }
-
-  const id = window.setInterval(() => {
-    if (!cleanExit && mfaWindow?.closed) {
-      console.error('User closed the popup')
-      window.removeEventListener('message', handler, false)
-      hideLoader()
-      clearInterval(id)
-    }
-  }, 500)
 }
 
 function hideLoader() {
diff --git a/src/pages/MFARestoreScreen.vue b/src/pages/MFARestoreScreen.vue
index 97b9c4cf..1568f520 100644
--- a/src/pages/MFARestoreScreen.vue
+++ b/src/pages/MFARestoreScreen.vue
@@ -12,11 +12,7 @@ import SecurityQuestionRecoveryModal from '@/components/SecurityQuestionRecovery
 import type { RedirectParentConnectionApi } from '@/models/Connection'
 import { useModalStore } from '@/store/modal'
 import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
-import {
-  handlePasswordlessLogin,
-  handlePasswordlessLoginV2,
-  handleSocialLogin,
-} from '@/utils/redirectUtils'
+import { handleLogin } from '@/utils/redirectUtils'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
 const modalStore = useModalStore()
@@ -132,33 +128,32 @@ async function returnToParent(key: string) {
     {}
   ).promise
   const info = JSON.parse(storage.session.getItem('info') as string)
-  const parentAppUrl = storage.local.getItem('parentAppUrl') as string
+  const state = storage.local.getItem('state') as string
   const loginSrc = storage.local.getItem('loginSrc')
+  const isStandalone =
+    loginSrc === 'rn' || loginSrc === 'flutter' || loginSrc === 'unity'
   storage.local.setItem(`${info.userInfo.id}-has-mfa`, '1')
   info.privateKey = key
   info.hasMfa = true
   storage.local.removeItem('pk')
+  storage.session.setItem(`isLoggedIn`, JSON.stringify(true))
+  storage.session.setItem(`userInfo`, JSON.stringify(info))
+
   const messageId = getUniqueId()
-  if (info.loginType === 'passwordless') {
-    await handlePasswordlessLoginV2(info, connectionToParent).catch(
-      async () => {
-        channel = new BroadcastChannel(`${appId}_login_notification`)
-        await handlePasswordlessLogin(
-          info,
-          messageId,
-          parentAppUrl,
-          connectionToParent,
-          channel
-        )
-      }
-    )
-  } else {
-    if (loginSrc === 'rn' || loginSrc === 'flutter' || loginSrc === 'unity') {
-      await connectionToParent.goToWallet()
+  await handleLogin({
+    state,
+    isStandalone,
+    userInfo: info,
+    messageId,
+    connection: connectionToParent,
+  }).catch(async (e) => {
+    if (e instanceof Error) {
+      reportError(e.message)
       return
     }
-    await handleSocialLogin(info, messageId, parentAppUrl, connectionToParent)
-  }
+    reportError(e)
+    storage.local.removeItem('loginSrc')
+  })
 }
 
 onUnmounted(() => {
diff --git a/src/pages/backCompat/initPage.vue b/src/pages/backCompat/initPage.vue
index 2dffe077..650232cc 100644
--- a/src/pages/backCompat/initPage.vue
+++ b/src/pages/backCompat/initPage.vue
@@ -11,6 +11,10 @@ import { useUserStore } from '@/store/user'
 import { createInitParentConnection } from '@/utils/createParentConnection'
 import emailScheme from '@/utils/emailScheme'
 import { getAuthProvider } from '@/utils/getAuthProvider'
+import {
+  catchupSigninPage,
+  fetchPasswordlessResponseFromSignIn,
+} from '@/utils/redirectUtils'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
 const route = useRoute()
@@ -33,6 +37,8 @@ const penpalMethods = {
     handlePasswordlessLoginRequest(email),
 }
 
+// let loginSrc = ''
+
 onMounted(init)
 
 onUnmounted(() => {
@@ -67,18 +73,24 @@ async function init() {
 
 async function handleSocialLoginRequest(type: SocialLoginType) {
   if (authProvider) {
-    return await user.handleSocialLogin(authProvider, type)
+    const { url, state } = await user.handleSocialLogin(authProvider, type)
+    await catchupSigninPage(state)
+    return url
   }
 }
 
 async function handlePasswordlessLoginRequest(email: string) {
   const isEmailValid = await emailScheme.isValid(email)
   if (isEmailValid) {
-    const authProvider = await getAuthProvider(app.id)
-    return await user.handlePasswordlessLogin(authProvider, email, {
-      withUI: true,
-    })
+    const connection = await parentConnection?.promise
+    const params = await connection?.getPasswordlessParams()
+    if (!params) {
+      throw new Error('No params found')
+    }
+    return await fetchPasswordlessResponseFromSignIn(params)
   }
 }
 </script>
-<template><div></div></template>
+<template>
+  <div></div>
+</template>
diff --git a/src/pages/backCompat/signIn.vue b/src/pages/backCompat/signIn.vue
index 8918100d..292cefe0 100644
--- a/src/pages/backCompat/signIn.vue
+++ b/src/pages/backCompat/signIn.vue
@@ -1,21 +1,20 @@
 <script setup lang="ts">
-import type {
-  AuthProvider,
-  GetInfoOutput,
-  SocialLoginType,
-} from '@arcana/auth-core'
+import type { AuthProvider, GetInfoOutput } from '@arcana/auth-core'
+import { SocialLoginType } from '@arcana/auth-core'
+import { Core, SecurityQuestionModule } from '@arcana/key-helper'
 import type { Connection } from 'penpal'
-import { toRefs, onMounted, ref, computed, onUnmounted } from 'vue'
+import { toRefs, onMounted, ref, onUnmounted } from 'vue'
 import type { Ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
-import OauthLogin from '@/components/oauthLogin.vue'
 import type { ParentConnectionApi } from '@/models/Connection'
 import { useAppStore } from '@/store/app'
 import { useUserStore } from '@/store/user'
+import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
 import { createParentConnection } from '@/utils/createParentConnection'
-import emailScheme from '@/utils/emailScheme'
 import { getAuthProvider } from '@/utils/getAuthProvider'
+import { decodeJSON } from '@/utils/hash'
+import { PasswordlessLoginHandler } from '@/utils/PasswordlessLoginHandler'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
 const route = useRoute()
@@ -25,41 +24,103 @@ const app = useAppStore()
 const availableLogins: Ref<SocialLoginType[]> = ref([])
 const isLoading: Ref<boolean> = ref(false)
 let parentConnection: Connection<ParentConnectionApi> | null = null
-let channel: BroadcastChannel | null = null
+initStorage()
 
-const userEmailInput = ref('')
-const passwordlessForm = ref(null)
-const isEmailFocused = ref(false)
-
-const disableSendLinkBtn = computed(() => {
-  return userEmailInput.value.length === 0
-})
-
-const LOGINS_FETCHING_ERROR_TEXT = `No logins configured. If you are the app admin, please configure login
-providers on the developer dashboard.`
+enum BearerAuthentication {
+  firebase = 'firebase',
+}
 
 const {
   params: {
     value: { appId },
   },
+  hash,
 } = toRefs(route)
 
-initStorage(String(appId))
-const storage = getStorage()
+type SocialLogins = Exclude<SocialLoginType, SocialLoginType.passwordless>
+let passwordlessLoginHandler: PasswordlessLoginHandler | null
+
+const parseHashAndSetSettings = () => {
+  if (hash.value) {
+    const settings = decodeJSON(hash.value.substring(1))
+    if (settings.standaloneMode) {
+      app.setStandalone(settings.standaloneMode)
+    }
+    if (settings.theme) {
+      app.setTheme(settings.theme)
+    }
+    if (settings.position) {
+      app.setWalletPosition(settings.position)
+    }
+  }
+}
+
+const LoginState = {
+  passwordless: {
+    success: false,
+    error: '',
+  },
+  social: '',
+}
+
+const initPasswordlessLogin = async (email: string) => {
+  if (passwordlessLoginHandler) {
+    passwordlessLoginHandler.cancel()
+  }
+  const provider = await getAuthProvider(appId as string)
+
+  passwordlessLoginHandler = new PasswordlessLoginHandler(email)
+  const params = passwordlessLoginHandler.params()
+  const state = `passwordless-${params.sessionId}-${params.setToken}`
+  const response = await provider.loginWithPasswordlessStart({
+    email,
+    kind: 'link',
+    state,
+  })
+  LoginState.passwordless.success = response.success
+  if (!response.success) {
+    LoginState.passwordless.error = response.error ?? "Couldn't start login"
+    throw new Error(response.error)
+  }
+  passwordlessLoginHandler.start().then(({ privateKey, email, hasMfa, pk }) => {
+    storeUserInfoAndRedirect({
+      loginType: SocialLoginType.passwordless,
+      userInfo: {
+        email,
+        id: email,
+        picture: '',
+        name: '',
+      },
+      privateKey,
+      pk,
+      hasMfa,
+    })
+  })
+  return params
+}
+
+const initSocialLogin = async (type: SocialLogins): Promise<string> => {
+  const val = await authProvider?.loginWithSocial(type)
+  if (val) {
+    LoginState.social = val.state
+    return val.url
+  }
+  throw new Error("Couldn't get login url")
+}
 
 const penpalMethods = {
   isLoggedIn: () => user.isLoggedIn,
+  initPasswordlessLogin: (email: string) => initPasswordlessLogin(email),
+  initSocialLogin: (type: SocialLogins) => initSocialLogin(type),
   isLoginAvailable: (kind: SocialLoginType) =>
     availableLogins.value.includes(kind),
   getPublicKey: handleGetPublicKey,
   getAvailableLogins: () => [...availableLogins.value],
+  triggerBearerLogin: handleBearerLoginRequest,
 }
 
 const cleanup = () => {
   parentConnection?.destroy()
-  if (channel) {
-    channel.close()
-  }
   window.removeEventListener('message', windowEventHandler)
 }
 
@@ -71,50 +132,117 @@ let authProvider: AuthProvider | null = null
 
 async function fetchAvailableLogins(authProvider: AuthProvider) {
   return (await authProvider.getAvailableLogins()).filter(
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
     (item) => item !== 'firebase'
   )
 }
 
-function storeUserInfoAndRedirect(userInfo: GetInfoOutput) {
+async function storeUserInfoAndRedirect(
+  userInfo: GetInfoOutput & { hasMfa?: boolean; pk?: string }
+) {
+  const storage = getStorage()
   storage.session.setItem('userInfo', JSON.stringify(userInfo))
   storage.session.setItem('isLoggedIn', JSON.stringify(true))
   user.setUserInfo(userInfo)
   user.setLoginStatus(true)
-  router.push({ name: 'home' })
-}
-
-const channelEventHandler = (ev: MessageEvent) => {
-  if (ev.data?.status === 'LOGIN_INFO') {
-    channel?.postMessage({
-      status: 'LOGIN_INFO_ACK',
-      messageId: ev.data.messageId,
-    })
-    storeUserInfoAndRedirect(ev.data.info)
+  if (!userInfo.hasMfa && userInfo.pk) {
+    const core = new Core(
+      userInfo.pk,
+      userInfo.userInfo.id,
+      `${appId}`,
+      GATEWAY_URL,
+      AUTH_NETWORK === 'dev'
+    )
+    const securityQuestionModule = new SecurityQuestionModule(3)
+    securityQuestionModule.init(core)
+    const isEnabled = await securityQuestionModule.isEnabled()
+    user.hasMfa = isEnabled
+  }
+  if (userInfo.hasMfa) {
+    user.hasMfa = true
+    storage.local.setItem(`${user.info.id}-has-mfa`, '1')
   }
+  const loginCount = storage.local.getItem(
+    `${userInfo.userInfo.id}-login-count`
+  )
+  const newLoginCount = loginCount ? Number(loginCount) + 1 : 1
+  storage.local.setItem(
+    `${userInfo.userInfo.id}-login-count`,
+    String(newLoginCount)
+  )
+  router.push({ name: 'home' })
 }
 
 const windowEventHandler = (
-  ev: MessageEvent<{ status: string; messageId: number; info: GetInfoOutput }>
+  ev: MessageEvent<{
+    status: string
+    messageId: number
+    info: GetInfoOutput & { hasMfa?: boolean }
+    state?: string
+  }>
 ) => {
+  const storage = getStorage()
+  console.log({ ev: ev.data })
   // eslint-disable-next-line no-undef
   if (ev.origin !== process.env.VUE_APP_WALLET_DOMAIN) {
     return
   }
-  if (ev.data?.status === 'LOGIN_INFO') {
-    ev.source?.postMessage(
-      { status: 'LOGIN_INFO_ACK', messageId: ev.data.messageId },
-      { targetOrigin: ev.origin }
-    )
-    storeUserInfoAndRedirect(ev.data.info)
+  switch (ev.data?.status) {
+    case 'LOGIN_INFO': {
+      ev.source?.postMessage(
+        { status: 'LOGIN_INFO_ACK', messageId: ev.data.messageId },
+        { targetOrigin: ev.origin }
+      )
+      storeUserInfoAndRedirect(ev.data.info)
+      if (ev.data.info.hasMfa) {
+        user.hasMfa = true
+        storage.local.setItem(`${ev.data.info.userInfo.id}-has-mfa`, '1')
+      }
+      break
+    }
+    case 'LOGIN_VERIFY': {
+      ev.source?.postMessage(
+        {
+          status: 'LOGIN_VERIFY_ACK',
+          verified: LoginState.social === ev.data?.state,
+        }, // maybe send public key here
+        { targetOrigin: ev.origin }
+      )
+      break
+    }
+    case 'LOGIN_INIT': {
+      if (ev.data.state) {
+        LoginState.social = ev.data.state
+      }
+      ev.source?.postMessage(
+        {
+          status: 'LOGIN_INIT_ACK',
+        }, // maybe send public key here
+        { targetOrigin: ev.origin }
+      )
+      break
+    }
+    case 'LOGIN_PWDL_INQ': {
+      ev.source?.postMessage(
+        {
+          status: 'LOGIN_PWDL_INQ_RES',
+          error: LoginState.passwordless.error,
+          success: LoginState.passwordless.success,
+        }, // maybe send public key here
+        { targetOrigin: ev.origin }
+      )
+      break
+    }
   }
 }
 
 async function init() {
   isLoading.value = true
   try {
-    // channel listener
-    channel = new BroadcastChannel(`${appId}_login_notification`)
-    channel.addEventListener('message', channelEventHandler)
+    const storage = getStorage()
+
+    parseHashAndSetSettings()
 
     // window listener
     window.addEventListener('message', windowEventHandler)
@@ -128,8 +256,23 @@ async function init() {
     const isLoggedIn = storage.session.getItem('isLoggedIn')
 
     if (isLoggedIn) {
+      const hasMfa = storage.local.getItem(`${userInfo.userInfo.id}-has-mfa`)
+      if (!hasMfa && userInfo.pk) {
+        const core = new Core(
+          userInfo.pk,
+          userInfo.userInfo.id,
+          `${appId}`,
+          GATEWAY_URL,
+          AUTH_NETWORK === 'dev'
+        )
+        const securityQuestionModule = new SecurityQuestionModule(3)
+        securityQuestionModule.init(core)
+        const isEnabled = await securityQuestionModule.isEnabled()
+        user.hasMfa = isEnabled
+      }
       user.setUserInfo(userInfo)
       user.setLoginStatus(true)
+      user.hasMfa = hasMfa === '1'
       router.push({ name: 'home' })
     } else {
       parentConnection = createParentConnection({
@@ -153,217 +296,58 @@ async function init() {
   }
 }
 
-async function handleSocialLoginRequest(kind: SocialLoginType) {
-  const c = await parentConnection?.promise
-  c?.triggerSocialLogin(kind)
-}
-
 async function handleGetPublicKey(id, verifier) {
   const authProvider = await getAuthProvider(app.id)
   return await authProvider.getPublicKey({ id, verifier })
 }
 
-async function handlePasswordlessLoginRequest(email: string) {
-  const isEmailValid = await emailScheme.isValid(email)
-  if (isEmailValid) {
-    const c = await parentConnection?.promise
-    c?.triggerPasswordlessLogin(email)
-    return
-  }
-}
-
-async function handleSubmit() {
-  handlePasswordlessLoginRequest(userEmailInput.value)
-}
+async function handleBearerLoginRequest(
+  type: BearerAuthentication,
+  _data: unknown
+) {
+  // Intentionally doing this to get the KeyReconstructor out of Auth SDK (which we shouldn't expose to external users)
+  // but would be OK to use internally
+  const ap = await getAuthProvider(app.id)
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  await ap.initKeyReconstructor()
+  const kr = // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    ap.keyReconstructor
+
+  switch (type) {
+    case BearerAuthentication.firebase: {
+      const data = _data as {
+        uid: string
+        token: string
+      }
+
+      const info = await kr.getPrivateKey({
+        verifier: BearerAuthentication.firebase,
+        id: data.uid,
+        idToken: data.token,
+      })
 
-function onEnterPress() {
-  if (passwordlessForm.value.email.checkValidity()) handleSubmit()
+      // TODO
+      const userInfo = {
+        loginType: 'firebase',
+        hasMfa: false,
+        privateKey: info.privateKey as string,
+        pk: info.privateKey as string,
+        userInfo: {
+          id: data.uid,
+        },
+      }
+      await storeUserInfoAndRedirect(userInfo)
+
+      return true
+    }
+    default:
+      return false
+  }
 }
 </script>
 
 <template>
-  <div v-if="isLoading" class="signin__loader flex-1">
-    <p>Loading...</p>
-  </div>
-  <div v-else class="flex items-center">
-    <div class="wallet__card rounded-[10px] flex flex-col mb-[10px]">
-      <div class="signin__container">
-        <div class="signin__body flow-container">
-          <div class="signin__title-desc flow-element">
-            <h1 class="signin__title">Welcome!</h1>
-            <p class="signin__desc">
-              You will receive a login link in your email for a password-less
-              sign-in.
-            </p>
-          </div>
-          <form
-            ref="passwordlessForm"
-            class="signin__input-container flow-element"
-            @submit.prevent="handleSubmit"
-          >
-            <label class="signin__input-label">Email</label>
-            <input
-              v-model="userEmailInput"
-              name="email"
-              type="email"
-              class="signin__input-field py-4"
-              placeholder="someone@example.com"
-              required
-              :class="{
-                'outline-black dark:outline-white outline-1 outline':
-                  isEmailFocused,
-              }"
-              @keyup.enter="onEnterPress"
-              @focus="isEmailFocused = true"
-              @blur="isEmailFocused = false"
-            />
-            <input
-              type="submit"
-              value="Send Link"
-              class="signin__button"
-              :class="{ 'signin__button--disabled': disableSendLinkBtn }"
-              :disabled="disableSendLinkBtn"
-            />
-          </form>
-        </div>
-        <div class="signin__footer">
-          <div>
-            <OauthLogin
-              v-if="availableLogins.length"
-              :available-logins="availableLogins"
-              @oauth-click="(type) => handleSocialLoginRequest(type, 'wallet')"
-            />
-            <p v-else class="signin__footer-text-error">
-              {{ LOGINS_FETCHING_ERROR_TEXT }}
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+  <div></div>
 </template>
-
-<style scoped>
-.signin__container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  height: 100%;
-  padding: var(--p-500) var(--p-400);
-}
-
-.signin__loader {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-}
-
-.signin__container > *:not(:first-child) {
-  margin-top: 40px;
-}
-
-.signin__body {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  justify-content: space-between;
-}
-
-.signin__footer {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  height: 25px;
-}
-
-.signin__footer-text-loading {
-  font-size: var(--fs-300);
-}
-
-.signin__footer-text-error {
-  font-size: var(--fs-250);
-  text-align: center;
-}
-
-.signin__title-desc {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-around;
-}
-
-.signin__title {
-  font-size: var(--fs-500);
-  font-weight: 600;
-  text-align: center;
-}
-
-.signin__desc {
-  font-size: var(--fs-350);
-  font-weight: 400;
-  text-align: center;
-}
-
-.signin__input-container {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  width: 100%;
-}
-
-.signin__input-label {
-  margin-left: 15px;
-  font-size: var(--fs-300);
-  font-weight: 400;
-}
-
-.signin__input-field {
-  padding: var(--p-400);
-  font-size: var(--fs-350);
-  font-weight: 400;
-  color: var(--fg-color);
-  background: var(--debossed-box-color);
-  border: none;
-  border-radius: 10px;
-  box-shadow: var(--debossed-shadow);
-}
-
-.signin__button {
-  width: 100%;
-  height: 2.25rem;
-  font-size: var(--fs-350);
-  font-weight: 600;
-  color: var(--filled-button-fg-color);
-  text-transform: uppercase;
-  background: var(--filled-button-bg-color);
-  border: none;
-  border-radius: 10px;
-}
-
-.signin__button:hover {
-  transition: all 0.5s;
-  transform: scale(1.05, 1.15);
-}
-
-.signin__button--disabled {
-  cursor: not-allowed;
-  background: var(--button-bg-disabled);
-  transform: none;
-}
-
-.signin__button--disabled:hover {
-  transform: none;
-}
-
-@media (max-width: 235px) {
-  .signin__container > *:not(:first-child) {
-    margin-top: 30px;
-  }
-
-  .signin__button {
-    height: 1.75rem;
-  }
-}
-</style>
diff --git a/src/pages/initPageV2.vue b/src/pages/initPageV2.vue
index 7f81a6e4..5dc6667f 100644
--- a/src/pages/initPageV2.vue
+++ b/src/pages/initPageV2.vue
@@ -11,6 +11,10 @@ import { useUserStore } from '@/store/user'
 import { createInitParentConnection } from '@/utils/createParentConnection'
 import emailScheme from '@/utils/emailScheme'
 import { getAuthProvider } from '@/utils/getAuthProvider'
+import {
+  catchupSigninPage,
+  fetchPasswordlessResponseFromSignIn,
+} from '@/utils/redirectUtils'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
 const route = useRoute()
@@ -39,6 +43,7 @@ onUnmounted(() => {
 
 let authProvider: AuthProvider | null = null
 
+let loginSrc = ''
 async function init() {
   initStorage()
   isLoading.value = true
@@ -57,7 +62,7 @@ async function init() {
       )
     } else {
       const parentAppUrl = await parentConnectionInstance.getParentUrl()
-      const loginSrc = await parentConnectionInstance.getLoginSource()
+      loginSrc = await parentConnectionInstance.getLoginSource()
       getStorage().local.setItem('parentAppUrl', parentAppUrl)
       getStorage().local.setItem('loginSrc', loginSrc)
     }
@@ -68,7 +73,11 @@ async function init() {
 
 async function handleSocialLoginRequest(type: SocialLoginType) {
   if (authProvider) {
-    return await user.handleSocialLogin(authProvider, type)
+    const { url, state } = await user.handleSocialLogin(authProvider, type)
+    if (!['rn', 'flutter', 'unity'].includes(loginSrc)) {
+      await catchupSigninPage(state)
+    }
+    return url
   }
 }
 
@@ -77,12 +86,13 @@ async function handlePasswordlessLoginRequest(email: string) {
   if (isEmailValid) {
     const connection = await parentConnection?.promise
     const params = await connection?.getPasswordlessParams()
-    getStorage().local.setItem('CURRENT_LOGIN_INFO', JSON.stringify(params))
-    const authProvider = await getAuthProvider(app.id)
-    return await user.handlePasswordlessLogin(authProvider, email, {
-      withUI: true,
-    })
+    if (!params) {
+      throw new Error('No params found')
+    }
+    return await fetchPasswordlessResponseFromSignIn(params)
   }
 }
 </script>
-<template><div></div></template>
+<template>
+  <div></div>
+</template>
diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index fa9dae58..e03a0eb1 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -23,6 +23,7 @@ import getValidAppMode from '@/utils/getValidAppMode'
 import { getWalletType } from '@/utils/getwalletType'
 import {
   getRequestHandler,
+  requestHandlerExists,
   setRequestHandler,
 } from '@/utils/requestHandlerSingleton'
 import {
@@ -123,15 +124,13 @@ async function getAccountDetails() {
   await initAccountHandler()
 }
 
-async function initKeeper() {
-  const accountHandler = new AccountHandler(
-    userStore.privateKey,
-    rpcStore.selectedRpcConfig?.rpcUrls[0]
-  )
-  try {
+function initKeeper() {
+  if (!requestHandlerExists()) {
+    const accountHandler = new AccountHandler(
+      userStore.privateKey,
+      rpcStore.selectedRpcConfig.rpcUrls[0]
+    )
     setRequestHandler(accountHandler)
-  } catch (e) {
-    // Do nothing
   }
 }
 
@@ -251,7 +250,6 @@ async function getRpcConfig() {
       enabledChainList.value[0] // some time, chain list don't have default chain
     rpcStore.setSelectedRPCConfig(rpcConfig)
     rpcStore.setRpcConfig(rpcConfig)
-    await getRequestHandler().setRpcConfig(rpcConfig)
   } catch (err) {
     console.log({ err })
   }
diff --git a/src/pages/loginRedirect.vue b/src/pages/loginRedirect.vue
index 11326bdd..9edace5f 100644
--- a/src/pages/loginRedirect.vue
+++ b/src/pages/loginRedirect.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { GetInfoOutput } from '@arcana/auth-core'
+import { GetInfoOutput, SocialLoginType } from '@arcana/auth-core'
 import { Core, SecurityQuestionModule } from '@arcana/key-helper'
 import dayjs from 'dayjs'
 import { getUniqueId } from 'json-rpc-engine'
@@ -11,9 +11,9 @@ import type { RedirectParentConnectionApi } from '@/models/Connection'
 import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
 import { getAuthProvider } from '@/utils/getAuthProvider'
 import {
-  handlePasswordlessLogin,
-  handlePasswordlessLoginV2,
-  handleSocialLogin,
+  getStateFromUrl,
+  handleLogin,
+  verifyOpenerPage,
 } from '@/utils/redirectUtils'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
@@ -26,17 +26,26 @@ let channel: BroadcastChannel | null = null
 onMounted(init)
 onUnmounted(cleanup)
 
+const getLoginTypeFromState = (s: string) => {
+  return s.split('-')[0]
+}
 async function init() {
   const storage = getStorage()
-  const parentAppUrl = storage.local.getItem('parentAppUrl')
   const loginSrc = storage.local.getItem('loginSrc')
-  // TODO: Fix this V, throw error n stuff
-  if (!parentAppUrl) {
-    return
-  }
+
+  const isStandalone =
+    loginSrc === 'rn' || loginSrc === 'flutter' || loginSrc === 'unity'
   try {
+    const state = getStateFromUrl(route.fullPath)
+    storage.session.setItem('state', state)
     const connectionToParent =
       await connectToParent<RedirectParentConnectionApi>({}).promise
+    if (
+      !isStandalone &&
+      getLoginTypeFromState(state) !== SocialLoginType.passwordless
+    ) {
+      await verifyOpenerPage(state)
+    }
     const authProvider = await getAuthProvider(`${appId}`)
     if (authProvider.isLoggedIn()) {
       const info = authProvider.getUserInfo()
@@ -73,43 +82,26 @@ async function init() {
       storage.session.setItem(`userInfo`, JSON.stringify(userInfo))
       storage.session.setItem(`isLoggedIn`, JSON.stringify(true))
       const messageId = getUniqueId()
-      if (info.loginType === 'passwordless') {
-        await handlePasswordlessLoginV2(userInfo, connectionToParent).catch(
-          async () => {
-            channel = new BroadcastChannel(`${appId}_login_notification`)
-            await handlePasswordlessLogin(
-              userInfo,
-              messageId,
-              parentAppUrl,
-              connectionToParent,
-              channel
-            )
-          }
-        )
-      } else {
-        if (
-          loginSrc === 'rn' ||
-          loginSrc === 'flutter' ||
-          loginSrc === 'unity'
-        ) {
-          await connectionToParent.goToWallet()
-          return
-        }
-        await handleSocialLogin(
-          userInfo,
-          messageId,
-          parentAppUrl,
-          connectionToParent
-        )
-      }
+      await handleLogin({
+        connection: connectionToParent,
+        userInfo,
+        state,
+        messageId,
+        isStandalone,
+      })
+      storage.local.removeItem('loginSrc')
+      storage.session.removeItem('state')
     } else {
-      await reportError('Could not login, please try again', parentAppUrl)
+      storage.local.removeItem('loginSrc')
+      await reportError('Could not login, please try again')
       return
     }
   } catch (e) {
+    console.log({ e, type: typeof e })
     if (e instanceof Error) {
-      await reportError(e.message, parentAppUrl)
+      await reportError(e.message)
     }
+    await reportError(e as string)
   }
 }
 
@@ -118,11 +110,11 @@ function cleanup() {
     channel.close()
   }
 }
-async function reportError(errorMessage: string, parentUrl: string) {
+async function reportError(errorMessage: string) {
   const connectionToParent = await connectToParent<RedirectParentConnectionApi>(
     {}
   ).promise
-  await connectionToParent.error(errorMessage, parentUrl)
+  await connectionToParent.error(errorMessage)
   return
 }
 </script>
diff --git a/src/pages/profileScreen.vue b/src/pages/profileScreen.vue
index 2e393c70..cc9fb56c 100644
--- a/src/pages/profileScreen.vue
+++ b/src/pages/profileScreen.vue
@@ -97,55 +97,60 @@ function handleShowMFAProceedModal(show: boolean) {
   showMFAProceedModal.value = show
 }
 
-function handleMFASetupClick() {
+async function handleMFASetupClick() {
   cleanExit = false
   const mfaSetupPath = new URL(`mfa/${appStore.id}/setup`, AUTH_URL)
-  mfaWindow = window.open(
-    mfaSetupPath.toString(),
-    '_blank',
-    getWindowFeatures()
-  )
+  if (appStore.standaloneMode == 0) {
+    mfaWindow = window.open(
+      mfaSetupPath.toString(),
+      '_blank',
+      getWindowFeatures()
+    )
 
-  const handler = async (event: MessageEvent) => {
-    if (!event?.data?.status) {
-      return
+    const handler = async (event: MessageEvent) => {
+      if (!event?.data?.status) {
+        return
+      }
+      cleanExit = true
+      const data = event.data
+
+      if (data.status === 'success') {
+        mfaWindow?.close()
+        getStorage().local.setItem(`${user.info.id}-has-mfa`, '1')
+        user.hasMfa = true
+        toast.success('MFA setup completed')
+        window.removeEventListener('message', handler, false)
+        handleShowMFAProceedModal(false)
+        hideLoader()
+      } else if (data.status == 'error') {
+        mfaWindow?.close()
+        window.removeEventListener('message', handler, false)
+        hideLoader()
+        if (data.error !== 'User cancelled the setup') toast.error(data.error)
+      } else {
+        toast.error('Error occured while setting up MFA. Please try again')
+        console.log('Unexpected event')
+      }
     }
-    cleanExit = true
-    const data = event.data
+    window.addEventListener('message', handler, false)
 
-    if (data.status === 'success') {
-      mfaWindow?.close()
-      getStorage().local.setItem(`${user.info.id}-has-mfa`, '1')
-      user.hasMfa = true
-      toast.success('MFA setup completed')
-      window.removeEventListener('message', handler, false)
-      handleShowMFAProceedModal(false)
-      hideLoader()
-    } else if (data.status == 'error') {
-      mfaWindow?.close()
-      window.removeEventListener('message', handler, false)
-      hideLoader()
-      if (data.error !== 'User cancelled the setup') toast.error(data.error)
-    } else {
-      toast.error('Error occured while setting up MFA. Please try again')
-      console.log('Unexpected event')
+    loader.value = {
+      show: true,
+      message: 'Setting up MFA...',
     }
-  }
-  window.addEventListener('message', handler, false)
 
-  loader.value = {
-    show: true,
-    message: 'Setting up MFA...',
+    const id = window.setInterval(() => {
+      if (!cleanExit && mfaWindow?.closed) {
+        console.error('User closed the popup')
+        window.removeEventListener('message', handler, false)
+        hideLoader()
+        clearInterval(id)
+      }
+    }, 500)
+  } else {
+    const c = await useParentConnectionStore().parentConnection?.promise
+    c?.uiEvent('mfa_setup', {})
   }
-
-  const id = window.setInterval(() => {
-    if (!cleanExit && mfaWindow?.closed) {
-      console.error('User closed the popup')
-      window.removeEventListener('message', handler, false)
-      hideLoader()
-      clearInterval(id)
-    }
-  }, 500)
 }
 
 function hideLoader() {
diff --git a/src/pages/signInV2.vue b/src/pages/signInV2.vue
index 77a20957..292cefe0 100644
--- a/src/pages/signInV2.vue
+++ b/src/pages/signInV2.vue
@@ -3,18 +3,17 @@ import type { AuthProvider, GetInfoOutput } from '@arcana/auth-core'
 import { SocialLoginType } from '@arcana/auth-core'
 import { Core, SecurityQuestionModule } from '@arcana/key-helper'
 import type { Connection } from 'penpal'
-import { toRefs, onMounted, ref, computed, onUnmounted } from 'vue'
+import { toRefs, onMounted, ref, onUnmounted } from 'vue'
 import type { Ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
-import OauthLogin from '@/components/oauthLogin.vue'
 import type { ParentConnectionApi } from '@/models/Connection'
 import { useAppStore } from '@/store/app'
 import { useUserStore } from '@/store/user'
 import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
 import { createParentConnection } from '@/utils/createParentConnection'
-import emailScheme from '@/utils/emailScheme'
 import { getAuthProvider } from '@/utils/getAuthProvider'
+import { decodeJSON } from '@/utils/hash'
 import { PasswordlessLoginHandler } from '@/utils/PasswordlessLoginHandler'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
@@ -25,20 +24,8 @@ const app = useAppStore()
 const availableLogins: Ref<SocialLoginType[]> = ref([])
 const isLoading: Ref<boolean> = ref(false)
 let parentConnection: Connection<ParentConnectionApi> | null = null
-let channel: BroadcastChannel | null = null
 initStorage()
 
-const userEmailInput = ref('')
-const passwordlessForm = ref(null)
-const isEmailFocused = ref(false)
-
-const disableSendLinkBtn = computed(() => {
-  return userEmailInput.value.length === 0
-})
-
-const LOGINS_FETCHING_ERROR_TEXT = `No logins configured. If you are the app admin, please configure login
-providers on the developer dashboard.`
-
 enum BearerAuthentication {
   firebase = 'firebase',
 }
@@ -47,16 +34,54 @@ const {
   params: {
     value: { appId },
   },
+  hash,
 } = toRefs(route)
 
+type SocialLogins = Exclude<SocialLoginType, SocialLoginType.passwordless>
 let passwordlessLoginHandler: PasswordlessLoginHandler | null
 
-const initPasswordlessLogin = (email: string) => {
+const parseHashAndSetSettings = () => {
+  if (hash.value) {
+    const settings = decodeJSON(hash.value.substring(1))
+    if (settings.standaloneMode) {
+      app.setStandalone(settings.standaloneMode)
+    }
+    if (settings.theme) {
+      app.setTheme(settings.theme)
+    }
+    if (settings.position) {
+      app.setWalletPosition(settings.position)
+    }
+  }
+}
+
+const LoginState = {
+  passwordless: {
+    success: false,
+    error: '',
+  },
+  social: '',
+}
+
+const initPasswordlessLogin = async (email: string) => {
   if (passwordlessLoginHandler) {
     passwordlessLoginHandler.cancel()
   }
+  const provider = await getAuthProvider(appId as string)
+
   passwordlessLoginHandler = new PasswordlessLoginHandler(email)
   const params = passwordlessLoginHandler.params()
+  const state = `passwordless-${params.sessionId}-${params.setToken}`
+  const response = await provider.loginWithPasswordlessStart({
+    email,
+    kind: 'link',
+    state,
+  })
+  LoginState.passwordless.success = response.success
+  if (!response.success) {
+    LoginState.passwordless.error = response.error ?? "Couldn't start login"
+    throw new Error(response.error)
+  }
   passwordlessLoginHandler.start().then(({ privateKey, email, hasMfa, pk }) => {
     storeUserInfoAndRedirect({
       loginType: SocialLoginType.passwordless,
@@ -74,9 +99,19 @@ const initPasswordlessLogin = (email: string) => {
   return params
 }
 
+const initSocialLogin = async (type: SocialLogins): Promise<string> => {
+  const val = await authProvider?.loginWithSocial(type)
+  if (val) {
+    LoginState.social = val.state
+    return val.url
+  }
+  throw new Error("Couldn't get login url")
+}
+
 const penpalMethods = {
   isLoggedIn: () => user.isLoggedIn,
   initPasswordlessLogin: (email: string) => initPasswordlessLogin(email),
+  initSocialLogin: (type: SocialLogins) => initSocialLogin(type),
   isLoginAvailable: (kind: SocialLoginType) =>
     availableLogins.value.includes(kind),
   getPublicKey: handleGetPublicKey,
@@ -86,9 +121,6 @@ const penpalMethods = {
 
 const cleanup = () => {
   parentConnection?.destroy()
-  if (channel) {
-    channel.close()
-  }
   window.removeEventListener('message', windowEventHandler)
 }
 
@@ -142,37 +174,65 @@ async function storeUserInfoAndRedirect(
   router.push({ name: 'home' })
 }
 
-const channelEventHandler = (ev: MessageEvent) => {
-  if (ev.data?.status === 'LOGIN_INFO') {
-    channel?.postMessage({
-      status: 'LOGIN_INFO_ACK',
-      messageId: ev.data.messageId,
-    })
-    storeUserInfoAndRedirect(ev.data.info)
-  }
-}
-
 const windowEventHandler = (
   ev: MessageEvent<{
     status: string
     messageId: number
     info: GetInfoOutput & { hasMfa?: boolean }
+    state?: string
   }>
 ) => {
   const storage = getStorage()
+  console.log({ ev: ev.data })
   // eslint-disable-next-line no-undef
   if (ev.origin !== process.env.VUE_APP_WALLET_DOMAIN) {
     return
   }
-  if (ev.data?.status === 'LOGIN_INFO') {
-    ev.source?.postMessage(
-      { status: 'LOGIN_INFO_ACK', messageId: ev.data.messageId },
-      { targetOrigin: ev.origin }
-    )
-    storeUserInfoAndRedirect(ev.data.info)
-    if (ev.data.info.hasMfa) {
-      user.hasMfa = true
-      storage.local.setItem(`${ev.data.info.userInfo.id}-has-mfa`, '1')
+  switch (ev.data?.status) {
+    case 'LOGIN_INFO': {
+      ev.source?.postMessage(
+        { status: 'LOGIN_INFO_ACK', messageId: ev.data.messageId },
+        { targetOrigin: ev.origin }
+      )
+      storeUserInfoAndRedirect(ev.data.info)
+      if (ev.data.info.hasMfa) {
+        user.hasMfa = true
+        storage.local.setItem(`${ev.data.info.userInfo.id}-has-mfa`, '1')
+      }
+      break
+    }
+    case 'LOGIN_VERIFY': {
+      ev.source?.postMessage(
+        {
+          status: 'LOGIN_VERIFY_ACK',
+          verified: LoginState.social === ev.data?.state,
+        }, // maybe send public key here
+        { targetOrigin: ev.origin }
+      )
+      break
+    }
+    case 'LOGIN_INIT': {
+      if (ev.data.state) {
+        LoginState.social = ev.data.state
+      }
+      ev.source?.postMessage(
+        {
+          status: 'LOGIN_INIT_ACK',
+        }, // maybe send public key here
+        { targetOrigin: ev.origin }
+      )
+      break
+    }
+    case 'LOGIN_PWDL_INQ': {
+      ev.source?.postMessage(
+        {
+          status: 'LOGIN_PWDL_INQ_RES',
+          error: LoginState.passwordless.error,
+          success: LoginState.passwordless.success,
+        }, // maybe send public key here
+        { targetOrigin: ev.origin }
+      )
+      break
     }
   }
 }
@@ -181,9 +241,8 @@ async function init() {
   isLoading.value = true
   try {
     const storage = getStorage()
-    // channel listener
-    channel = new BroadcastChannel(`${appId}_login_notification`)
-    channel.addEventListener('message', channelEventHandler)
+
+    parseHashAndSetSettings()
 
     // window listener
     window.addEventListener('message', windowEventHandler)
@@ -237,29 +296,11 @@ async function init() {
   }
 }
 
-async function handleSocialLoginRequest(kind: SocialLoginType) {
-  const c = await parentConnection?.promise
-  c?.triggerSocialLogin(kind)
-}
-
 async function handleGetPublicKey(id, verifier) {
   const authProvider = await getAuthProvider(app.id)
   return await authProvider.getPublicKey({ id, verifier })
 }
 
-async function handlePasswordlessLoginRequest(email: string) {
-  const isEmailValid = await emailScheme.isValid(email)
-  if (isEmailValid) {
-    const c = await parentConnection?.promise
-    c?.triggerPasswordlessLogin(email)
-    return
-  }
-}
-
-async function handleSubmit() {
-  handlePasswordlessLoginRequest(userEmailInput.value)
-}
-
 async function handleBearerLoginRequest(
   type: BearerAuthentication,
   _data: unknown
@@ -291,8 +332,8 @@ async function handleBearerLoginRequest(
       const userInfo = {
         loginType: 'firebase',
         hasMfa: false,
-        privateKey: info.privateKey,
-        pk: info.privateKey,
+        privateKey: info.privateKey as string,
+        pk: info.privateKey as string,
         userInfo: {
           id: data.uid,
         },
@@ -305,195 +346,8 @@ async function handleBearerLoginRequest(
       return false
   }
 }
-
-function onEnterPress() {
-  if (passwordlessForm.value.email.checkValidity()) handleSubmit()
-}
 </script>
 
 <template>
-  <div v-if="isLoading" class="signin__loader flex-1">
-    <p>Loading...</p>
-  </div>
-  <div v-else class="flex items-center">
-    <div class="wallet__card rounded-[10px] flex flex-col mb-[10px]">
-      <div class="signin__container">
-        <div class="signin__body flow-container">
-          <div class="signin__title-desc flow-element">
-            <h1 class="signin__title">Welcome!</h1>
-            <p class="signin__desc">
-              You will receive a login link in your email for a password-less
-              sign-in.
-            </p>
-          </div>
-          <form
-            ref="passwordlessForm"
-            class="signin__input-container flow-element"
-            @submit.prevent="handleSubmit"
-          >
-            <label class="signin__input-label">Email</label>
-            <input
-              v-model="userEmailInput"
-              name="email"
-              type="email"
-              class="signin__input-field py-4"
-              placeholder="someone@example.com"
-              required
-              :class="{
-                'outline-black dark:outline-white outline-1 outline':
-                  isEmailFocused,
-              }"
-              @keyup.enter="onEnterPress"
-              @focus="isEmailFocused = true"
-              @blur="isEmailFocused = false"
-            />
-            <input
-              type="submit"
-              value="Send Link"
-              class="signin__button"
-              :class="{ 'signin__button--disabled': disableSendLinkBtn }"
-              :disabled="disableSendLinkBtn"
-            />
-          </form>
-        </div>
-        <div class="signin__footer">
-          <div>
-            <OauthLogin
-              v-if="availableLogins.length"
-              :available-logins="availableLogins"
-              @oauth-click="(type) => handleSocialLoginRequest(type)"
-            />
-            <p v-else class="signin__footer-text-error">
-              {{ LOGINS_FETCHING_ERROR_TEXT }}
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+  <div></div>
 </template>
-
-<style scoped>
-.signin__container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  height: 100%;
-  padding: var(--p-500) var(--p-400);
-}
-
-.signin__loader {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-}
-
-.signin__container > *:not(:first-child) {
-  margin-top: 40px;
-}
-
-.signin__body {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  justify-content: space-between;
-}
-
-.signin__footer {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  height: 25px;
-}
-
-.signin__footer-text-loading {
-  font-size: var(--fs-300);
-}
-
-.signin__footer-text-error {
-  font-size: var(--fs-250);
-  text-align: center;
-}
-
-.signin__title-desc {
-  display: flex;
-  flex-direction: column;
-  justify-content: space-around;
-}
-
-.signin__title {
-  font-size: var(--fs-500);
-  font-weight: 600;
-  text-align: center;
-}
-
-.signin__desc {
-  font-size: var(--fs-350);
-  font-weight: 400;
-  text-align: center;
-}
-
-.signin__input-container {
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  width: 100%;
-}
-
-.signin__input-label {
-  margin-left: 15px;
-  font-size: var(--fs-300);
-  font-weight: 400;
-}
-
-.signin__input-field {
-  padding: var(--p-400);
-  font-size: var(--fs-350);
-  font-weight: 400;
-  color: var(--fg-color);
-  background: var(--debossed-box-color);
-  border: none;
-  border-radius: 10px;
-  box-shadow: var(--debossed-shadow);
-}
-
-.signin__button {
-  width: 100%;
-  height: 2.25rem;
-  font-size: var(--fs-350);
-  font-weight: 600;
-  color: var(--filled-button-fg-color);
-  text-transform: uppercase;
-  background: var(--filled-button-bg-color);
-  border: none;
-  border-radius: 10px;
-}
-
-.signin__button:hover {
-  transition: all 0.5s;
-  transform: scale(1.05, 1.15);
-}
-
-.signin__button--disabled {
-  cursor: not-allowed;
-  background: var(--button-bg-disabled);
-  transform: none;
-}
-
-.signin__button--disabled:hover {
-  transform: none;
-}
-
-@media (max-width: 235px) {
-  .signin__container > *:not(:first-child) {
-    margin-top: 30px;
-  }
-
-  .signin__button {
-    height: 1.75rem;
-  }
-}
-</style>
diff --git a/src/store/app.ts b/src/store/app.ts
index ed90252c..e9ca95f4 100644
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -17,6 +17,7 @@ type AppState = {
   id: string
   name: string
   theme: Theme
+  standaloneMode: 0 | 1 | 2
   parentAppUrl: string | null
   validAppMode: AppMode
   showWallet: boolean
@@ -35,6 +36,7 @@ export const useAppStore = defineStore('app', {
       theme: 'light',
       parentAppUrl: null,
       showWallet: false,
+      standaloneMode: 0,
       expandWallet: true,
       walletPosition: 'right',
       compactMode: false,
@@ -98,6 +100,9 @@ export const useAppStore = defineStore('app', {
     setName(name: string): void {
       this.name = name
     },
+    setStandalone(mode: 0 | 1 | 2): void {
+      this.standaloneMode = mode
+    },
     setParentUrl(url: string): void {
       this.parentAppUrl = url
     },
diff --git a/src/store/user.ts b/src/store/user.ts
index 39de3ed6..fc5341cc 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -41,8 +41,9 @@ export const useUserStore = defineStore('user', {
     async handleSocialLogin(
       authProvider: AuthProvider,
       loginType: LoginType
-    ): Promise<void | string> {
-      return await authProvider.loginWithSocial(loginType)
+    ): Promise<{ url: string; state: string }> {
+      const { url, state } = await authProvider.loginWithSocial(loginType)
+      return { url, state }
     },
 
     async handlePasswordlessLogin(
diff --git a/src/utils/PasswordlessLoginHandler.ts b/src/utils/PasswordlessLoginHandler.ts
index f526ed76..aa5f8a01 100644
--- a/src/utils/PasswordlessLoginHandler.ts
+++ b/src/utils/PasswordlessLoginHandler.ts
@@ -15,7 +15,7 @@ class PasswordlessLoginHandler {
     address: string
   }
   constructor(private email: string) {
-    this.sessionId = uuid()
+    this.sessionId = '_' + Math.random().toString(36).substring(2, 11)
     this.key = getRandomPrivateKey()
     this.timer = undefined
   }
diff --git a/src/utils/getAuthProvider.ts b/src/utils/getAuthProvider.ts
index 1124f23c..9230c4c1 100644
--- a/src/utils/getAuthProvider.ts
+++ b/src/utils/getAuthProvider.ts
@@ -8,7 +8,10 @@ const AUTH_NETWORK = process.env
 
 let authProvider: AuthProvider | null = null
 
-export async function getAuthProvider(appId: string): Promise<AuthProvider> {
+export async function getAuthProvider(
+  appId: string,
+  shouldVerifyState = false
+): Promise<AuthProvider> {
   if (!authProvider) {
     authProvider = await AuthProvider.init({
       appId: appId,
@@ -17,7 +20,9 @@ export async function getAuthProvider(appId: string): Promise<AuthProvider> {
       flow: 'redirect',
       autoRedirect: false,
       debug: true,
+      shouldVerifyState,
     })
   }
+  // authProvider.shouldVerifyState = shouldVerifyState
   return authProvider
 }
diff --git a/src/utils/hash.ts b/src/utils/hash.ts
new file mode 100644
index 00000000..3990b965
--- /dev/null
+++ b/src/utils/hash.ts
@@ -0,0 +1,13 @@
+function atobUTF8(str: string) {
+  return decodeURIComponent(
+    Array.from(window.atob(str), byteToPercent).join('')
+  )
+}
+
+function byteToPercent(b: string) {
+  return `%${`00${b.charCodeAt(0).toString(16)}`.slice(-2)}`
+}
+
+export function decodeJSON(queryString: string) {
+  return JSON.parse(atobUTF8(queryString))
+}
diff --git a/src/utils/redirectUtils.ts b/src/utils/redirectUtils.ts
index 9c5f5ac4..9384e25e 100644
--- a/src/utils/redirectUtils.ts
+++ b/src/utils/redirectUtils.ts
@@ -1,4 +1,4 @@
-import { GetInfoOutput } from '@arcana/auth-core'
+import { GetInfoOutput, SocialLoginType } from '@arcana/auth-core'
 import { AsyncMethodReturns } from 'penpal'
 
 import { RedirectParentConnectionApi } from '@/models/Connection'
@@ -7,77 +7,62 @@ import {
   getCredentialKey,
   setCredential,
 } from '@/utils/PasswordlessLoginHandler'
-import { getStorage } from '@/utils/storageWrapper'
 
 const SOCIAL_TIMEOUT = 5000 // 5s timeout
 const PASSWORDLESS_TIMEOUT = 1500 // 1.5s timeout
 
 const LOGIN_INFO = 'LOGIN_INFO'
 const LOGIN_INFO_ACK = 'LOGIN_INFO_ACK'
+
+const LOGIN_VERIFY = 'LOGIN_VERIFY'
+const LOGIN_VERIFY_ACK = 'LOGIN_VERIFY_ACK'
+
+const LOGIN_INIT = 'LOGIN_INIT'
+const LOGIN_INIT_ACK = 'LOGIN_INIT_ACK'
+
+const LOGIN_PWDL_INQ = 'LOGIN_PWDL_INQ'
+const LOGIN_PWDL_INQ_RES = 'LOGIN_PWDL_INQ_RES'
+
 const MFA_SETUP = 'MFA_SETUP'
 const MFA_SETUP_ACK = 'MFA_SETUP_ACK'
+
 const ACK = [LOGIN_INFO_ACK, MFA_SETUP_ACK]
 
-function contactUsingBroadcastChannel(
-  channel: BroadcastChannel,
-  info: GetInfoOutput,
-  messageId: number
-) {
-  return new Promise((resolve, reject) => {
-    const timer = setTimeout(() => {
-      return reject('bc did not succeed')
-    }, PASSWORDLESS_TIMEOUT)
-    channel.addEventListener(
-      'message',
-      (ev: MessageEvent<{ status: string; messageId: number }>) => {
-        if (
-          ev.data?.status == 'LOGIN_INFO_ACK' &&
-          ev.data?.messageId == messageId
-        ) {
-          clearTimeout(timer)
-          return resolve('ok')
-        }
-      }
-    )
-    channel.postMessage({ status: 'LOGIN_INFO', info, messageId })
-  })
+interface InteractMessage {
+  status: string
+  params: { [k: string]: any }
+  expectedResponseStatus: Array<string>
 }
 
-function contactParentPage(
-  info: GetInfoOutput,
-  messageId: number,
-  status: string
-) {
+const interactWithIframe = <T>(
+  input: InteractMessage,
+  domain = process.env.VUE_APP_WALLET_DOMAIN
+): Promise<T> => {
   return new Promise((resolve, reject) => {
     setTimeout(() => {
       return reject('request timed out')
     }, SOCIAL_TIMEOUT)
     try {
       const frameLength = window.parent.opener.frames.length
-      window.addEventListener(
-        'message',
-        (ev: MessageEvent<{ status: string; messageId: number }>) => {
-          if (ev.origin !== process.env.VUE_APP_WALLET_DOMAIN) {
-            return
-          }
-
-          if (
-            ACK.includes(ev.data?.status) &&
-            ev.data?.messageId == messageId
-          ) {
-            return resolve('ok')
-          }
+      const listener = (ev: MessageEvent<T & { status: string }>) => {
+        if (ev.origin !== domain) {
+          return
         }
-      )
+
+        if (input.expectedResponseStatus.includes(ev.data.status)) {
+          window.removeEventListener('message', listener)
+          resolve(ev.data)
+        }
+      }
+      window.addEventListener('message', listener)
       for (let i = 0; i < frameLength; i++) {
         try {
           window.parent.opener.frames[i].postMessage(
             {
-              status,
-              info,
-              messageId: messageId,
+              status: input.status,
+              ...input.params,
             },
-            process.env.VUE_APP_WALLET_DOMAIN
+            domain
           )
         } catch (e) {
           // Intentionally ignoring errors
@@ -90,20 +75,84 @@ function contactParentPage(
   })
 }
 
+const fetchPasswordlessResponseFromSignIn = async ({
+  sessionId,
+  setToken,
+}: {
+  sessionId: string
+  setToken: string
+}) => {
+  const state = `passwordless-${sessionId}-${setToken}`
+  const data = await interactWithIframe<{
+    status: string
+    error: string | null
+    success: boolean
+  }>({
+    status: LOGIN_PWDL_INQ,
+    params: {
+      state,
+    },
+    expectedResponseStatus: [LOGIN_PWDL_INQ_RES],
+  })
+
+  const { error = null, success = false } = data
+  if (success) {
+    return 'ok'
+  } else {
+    return Promise.reject(error)
+  }
+}
+
+const catchupSigninPage = async (state: string) => {
+  return interactWithIframe<void>({
+    status: LOGIN_INIT,
+    params: {
+      state,
+    },
+    expectedResponseStatus: [LOGIN_INIT_ACK],
+  })
+}
+
+const verifyOpenerPage = async (state: string) => {
+  const data = await interactWithIframe<{ verified: boolean }>({
+    status: LOGIN_VERIFY,
+    params: {
+      state,
+    },
+    expectedResponseStatus: [LOGIN_VERIFY_ACK],
+  })
+  if (data?.verified) {
+    return 'ok'
+  } else {
+    return Promise.reject('not ok')
+  }
+}
+
+const contactParentPage = async (
+  info: GetInfoOutput,
+  messageId: number,
+  status: string
+) => {
+  const data = await interactWithIframe<{ messageId: number }>({
+    status,
+    params: {
+      messageId,
+      info,
+    },
+    expectedResponseStatus: ACK,
+  })
+  if (data.messageId == messageId) {
+    return 'ok'
+  }
+}
+
 async function handlePasswordlessLoginV2(
   info: GetInfoOutput & { hasMfa?: boolean; pk?: string },
+  state: string,
   connection: AsyncMethodReturns<RedirectParentConnectionApi>
 ) {
-  const storage = getStorage()
-  const params = storage.local.getItem('CURRENT_LOGIN_INFO')
-  if (!params) {
-    console.log('params not found in local storage')
-    throw new Error('No passwordless login init')
-  }
-  storage.local.removeItem('CURRENT_LOGIN_INFO')
-  const data = JSON.parse(params)
-
-  const publicKey = await getCredentialKey(data.sessionId)
+  const [, sessionId, setToken] = state.split('-')
+  const publicKey = await getCredentialKey(sessionId)
   const dataToEncrypt = {
     privateKey: info.privateKey,
     pk: info.pk,
@@ -112,49 +161,73 @@ async function handlePasswordlessLoginV2(
   if (info.hasMfa) {
     ciphertext = `${ciphertext}:has-mfa`
   }
-  await setCredential(data.setToken, data.sessionId, ciphertext)
+  await setCredential(setToken, sessionId, ciphertext)
   connection.replyTo()
 }
 
 async function handleSocialLogin(
   info: GetInfoOutput,
   messageId: number,
-  parentAppUrl: string,
   connection: AsyncMethodReturns<RedirectParentConnectionApi>
 ) {
   try {
     await contactParentPage(info, messageId, LOGIN_INFO)
-    connection.replyTo(parentAppUrl)
+    connection.replyTo()
   } catch (e) {
     console.log('A very unexpected error occurred', e)
-    connection.error(
-      'Could not login, an unexpected error occurred',
-      parentAppUrl
-    )
+    connection.error('Could not login, an unexpected error occurred')
   }
 }
 
-async function handlePasswordlessLogin(
-  info: GetInfoOutput,
-  messageId: number,
-  parentAppUrl: string,
-  connection: AsyncMethodReturns<RedirectParentConnectionApi>,
-  channel: BroadcastChannel
-) {
-  try {
-    await contactUsingBroadcastChannel(channel, info, messageId)
-    connection.replyTo(parentAppUrl)
-  } catch (e) {
-    const url = new URL(parentAppUrl)
-    url.hash = 'fLR=y'
-    connection.redirect(url.toString())
+const getStateFromUrl = (u: string) => {
+  let val = ''
+  const url = new URL(decodeURIComponent(u), process.env.VUE_APP_WALLET_DOMAIN)
+  const queryParams = url.searchParams
+  const hashParams = new URLSearchParams(url.hash.substring(1))
+  const key = 'state'
+  val = hashParams.get(key) ?? ''
+  if (!val) {
+    val = queryParams.get(key) ?? ''
+  }
+
+  return val
+}
+
+type HandleLoginParams = {
+  isStandalone: boolean
+  userInfo: GetInfoOutput & {
+    hasMfa?: boolean
+    pk?: string
+  }
+  state: string
+  connection: AsyncMethodReturns<RedirectParentConnectionApi>
+  messageId: number
+}
+
+const handleLogin = async ({
+  isStandalone,
+  userInfo,
+  state,
+  connection,
+  messageId,
+}: HandleLoginParams) => {
+  if (userInfo.loginType === SocialLoginType.passwordless) {
+    await handlePasswordlessLoginV2(userInfo, state, connection)
+  } else {
+    if (isStandalone) {
+      await connection.goToWallet()
+      return
+    }
+    await handleSocialLogin(userInfo, messageId, connection)
   }
 }
 export {
-  handlePasswordlessLogin,
-  handlePasswordlessLoginV2,
-  handleSocialLogin,
+  catchupSigninPage,
+  fetchPasswordlessResponseFromSignIn,
+  handleLogin,
   contactParentPage,
+  getStateFromUrl,
+  verifyOpenerPage,
   MFA_SETUP,
   LOGIN_INFO,
   MFA_SETUP_ACK,
diff --git a/src/utils/requestHandlerSingleton.ts b/src/utils/requestHandlerSingleton.ts
index b9bfd547..97b12fef 100644
--- a/src/utils/requestHandlerSingleton.ts
+++ b/src/utils/requestHandlerSingleton.ts
@@ -1,7 +1,11 @@
 import { AccountHandler } from '@/utils/accountHandler'
 import { RequestHandler } from '@/utils/requestHandler'
 
-let requestHandler: RequestHandler | null
+let requestHandler: RequestHandler | null = null
+
+const requestHandlerExists = () => {
+  return requestHandler != null
+}
 
 const setRequestHandler = (accountHandler: AccountHandler) => {
   if (!requestHandler) {
@@ -25,4 +29,9 @@ const deleteRequestHandler = () => {
   requestHandler = null
 }
 
-export { setRequestHandler, getRequestHandler, deleteRequestHandler }
+export {
+  requestHandlerExists,
+  setRequestHandler,
+  getRequestHandler,
+  deleteRequestHandler,
+}
diff --git a/src/utils/requestManagement.ts b/src/utils/requestManagement.ts
index 2ffafacb..724389e2 100644
--- a/src/utils/requestManagement.ts
+++ b/src/utils/requestManagement.ts
@@ -67,10 +67,15 @@ async function watchRequestQueue(keeper) {
         ) {
           connectionInstance.closePopup()
         } else if (!pendingRequestCount && method && PERMISSIONS[method]) {
-          appStore.compactMode = false
-          if (appStore.expandedByRequest) {
-            appStore.expandedByRequest = false
-            appStore.expandWallet = false
+          if (appStore.standaloneMode == 1) {
+            appStore.expandWallet = true
+            appStore.compactMode = false
+          } else {
+            appStore.compactMode = false
+            if (appStore.expandedByRequest) {
+              appStore.expandedByRequest = false
+              appStore.expandWallet = false
+            }
           }
         }
       }
@@ -78,7 +83,7 @@ async function watchRequestQueue(keeper) {
         appStore.compactMode = false
         if (appStore.expandedByRequest) {
           appStore.expandedByRequest = false
-          appStore.expandWallet = false
+          appStore.expandWallet = appStore.standaloneMode !== 0
         }
       }
     },

From 02cde88d872f22163fae57cbe36c1f9c21ab300f Mon Sep 17 00:00:00 2001
From: makylfang <makyl@newfang.io>
Date: Thu, 8 Jun 2023 10:46:58 +0400
Subject: [PATCH 120/153] Fix duplicate function, removed console.logs (#349)

---
 src/pages/backCompat/signIn.vue |  1 -
 src/pages/loginRedirect.vue     |  1 -
 src/pages/signInV2.vue          |  1 -
 src/utils/redirectUtils.ts      | 16 ----------------
 4 files changed, 19 deletions(-)

diff --git a/src/pages/backCompat/signIn.vue b/src/pages/backCompat/signIn.vue
index 292cefe0..fa9d2ae8 100644
--- a/src/pages/backCompat/signIn.vue
+++ b/src/pages/backCompat/signIn.vue
@@ -183,7 +183,6 @@ const windowEventHandler = (
   }>
 ) => {
   const storage = getStorage()
-  console.log({ ev: ev.data })
   // eslint-disable-next-line no-undef
   if (ev.origin !== process.env.VUE_APP_WALLET_DOMAIN) {
     return
diff --git a/src/pages/loginRedirect.vue b/src/pages/loginRedirect.vue
index 5d6c12c9..693eb340 100644
--- a/src/pages/loginRedirect.vue
+++ b/src/pages/loginRedirect.vue
@@ -96,7 +96,6 @@ async function init() {
       return
     }
   } catch (e) {
-    console.log({ e, type: typeof e })
     if (e instanceof Error) {
       await reportError(e.message)
     }
diff --git a/src/pages/signInV2.vue b/src/pages/signInV2.vue
index 292cefe0..fa9d2ae8 100644
--- a/src/pages/signInV2.vue
+++ b/src/pages/signInV2.vue
@@ -183,7 +183,6 @@ const windowEventHandler = (
   }>
 ) => {
   const storage = getStorage()
-  console.log({ ev: ev.data })
   // eslint-disable-next-line no-undef
   if (ev.origin !== process.env.VUE_APP_WALLET_DOMAIN) {
     return
diff --git a/src/utils/redirectUtils.ts b/src/utils/redirectUtils.ts
index 0554dab7..3e99f4d6 100644
--- a/src/utils/redirectUtils.ts
+++ b/src/utils/redirectUtils.ts
@@ -234,22 +234,6 @@ const handleLogin = async ({
   }
 }
 
-const getStateFromUrl = (u: string) => {
-  let val = ''
-  console.log({ u })
-  const url = new URL(decodeURIComponent(u), process.env.VUE_APP_WALLET_DOMAIN)
-  console.log({ url })
-  const queryParams = url.searchParams
-  const hashParams = new URLSearchParams(url.hash.substring(1))
-  const key = 'state'
-  val = hashParams.get(key) ?? ''
-  if (!val) {
-    val = queryParams.get(key) ?? ''
-  }
-
-  console.log({ val })
-  return val
-}
 export {
   catchupSigninPage,
   fetchPasswordlessResponseFromSignIn,

From 45e9d4b6f3ddbdae3a51a6fe75f0b8e511dc40fc Mon Sep 17 00:00:00 2001
From: makylfang <makyl@newfang.io>
Date: Thu, 8 Jun 2023 10:56:48 +0400
Subject: [PATCH 121/153] Removing code added due to merge conflict (#350)

---
 src/utils/redirectUtils.ts | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/utils/redirectUtils.ts b/src/utils/redirectUtils.ts
index 3e99f4d6..935fb8fd 100644
--- a/src/utils/redirectUtils.ts
+++ b/src/utils/redirectUtils.ts
@@ -42,18 +42,6 @@ const interactWithIframe = <T>(
     setTimeout(() => {
       return reject('request timed out')
     }, SOCIAL_TIMEOUT)
-    const listener = (
-      ev: MessageEvent<{ status: string; messageId: number }>
-    ) => {
-      if (ev.origin !== process.env.VUE_APP_WALLET_DOMAIN) {
-        return
-      }
-
-      if (ACK.includes(ev.data?.status) && ev.data?.messageId == messageId) {
-        window.removeEventListener('message', listener)
-        return resolve('ok')
-      }
-    }
     try {
       const frameLength = window.parent.opener.frames.length
       const listener = (ev: MessageEvent<T & { status: string }>) => {

From b1cf6cd06eeddd2d98b8ceb2b195d3ec7a375aa0 Mon Sep 17 00:00:00 2001
From: makylfang <makyl@newfang.io>
Date: Thu, 8 Jun 2023 13:57:19 +0400
Subject: [PATCH 122/153] Fixing multiple emit of connect event (#351)

---
 package.json                   |  2 +-
 src/models/Connection.ts       |  2 +-
 src/pages/loggedInView.vue     |  5 +----
 src/utils/requestHandler.ts    | 12 ++++++++++++
 src/utils/requestManagement.ts |  4 ++--
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index a118c8d9..e215943f 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@arcana/auth": "^0.1.3",
-    "@arcana/auth-core": "^1.0.0-beta.8",
+    "@arcana/auth-core": "1.0.0-beta.8",
     "@arcana/key-helper": "^1.0.0-beta.7",
     "@ethereumjs/tx": "^3.4.0",
     "@fontsource/montserrat": "^4.5.14",
diff --git a/src/models/Connection.ts b/src/models/Connection.ts
index aeecb48c..2060491b 100644
--- a/src/models/Connection.ts
+++ b/src/models/Connection.ts
@@ -42,7 +42,7 @@ function requirePermission(
 
 type ProviderEvent =
   | {
-      chainId: number
+      chainId: string | number
     }
   | string[]
   | string
diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index e03a0eb1..e7b69f75 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -74,10 +74,7 @@ onMounted(async () => {
         chainId: selectedChainId,
         ...rpcConfig,
       })
-      const parentConnectionInstance = await parentConnection.promise
-      parentConnectionInstance.onEvent('connect', {
-        chainId: selectedChainId,
-      })
+      await requestHandler.sendConnect()
       watchRequestQueue(requestHandler)
     }
   } catch (e) {
diff --git a/src/utils/requestHandler.ts b/src/utils/requestHandler.ts
index 2aa6de80..56793111 100644
--- a/src/utils/requestHandler.ts
+++ b/src/utils/requestHandler.ts
@@ -19,6 +19,7 @@ import type { Connection } from 'penpal'
 
 import { ParentConnectionApi, ProviderEvent } from '@/models/Connection'
 import { AccountHandler } from '@/utils/accountHandler'
+import { toHex } from '@/utils/toHex'
 
 interface RpcConfig {
   rpcUrls: string[]
@@ -34,8 +35,19 @@ interface RpcConfig {
 class RequestHandler {
   private handler?: JsonRpcEngine
   private connection?: Connection<ParentConnectionApi> | null
+  private connectSent = false
   constructor(private accountHandler: AccountHandler) {}
 
+  public async sendConnect() {
+    if (!this.connectSent) {
+      this.connectSent = true
+      const chainId = await this.accountHandler.getChainId()
+      this.emitEvent('connect', {
+        chainId: toHex(chainId.toString(16)),
+      })
+    }
+  }
+
   public async setRpcConfig(c: RpcConfig) {
     try {
       this.handler = this.initRpcEngine(c)
diff --git a/src/utils/requestManagement.ts b/src/utils/requestManagement.ts
index 724389e2..49782e69 100644
--- a/src/utils/requestManagement.ts
+++ b/src/utils/requestManagement.ts
@@ -364,8 +364,8 @@ async function processRequest({ request, isPermissionGranted }, keeper) {
             chainId: rpcStore.selectedRpcConfig?.chainId,
           })
         }
-      } catch (error) {
-        console.error({ error })
+      } catch (err) {
+        console.error({ err })
       }
     }
   } else {

From ea50d078f5ccc3cdd4ca4a833759c87bf38bf378 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 9 Jun 2023 12:42:35 +0530
Subject: [PATCH 123/153] Update MFA setup for firebase

---
 src/pages/MFARequiredScreen.vue | 101 ++++++++++++++++---------------
 src/pages/MFASetup.vue          |  59 +++++++++++++-----
 src/pages/profileScreen.vue     | 103 +++++++++++++++++---------------
 3 files changed, 153 insertions(+), 110 deletions(-)

diff --git a/src/pages/MFARequiredScreen.vue b/src/pages/MFARequiredScreen.vue
index 73694af2..5aac5e86 100644
--- a/src/pages/MFARequiredScreen.vue
+++ b/src/pages/MFARequiredScreen.vue
@@ -24,56 +24,63 @@ let mfaWindow: Window | null
 const storage = getStorage()
 
 async function handleProceed() {
-  cleanExit = false
-  const mfaSetupPath = new URL(`mfa/${appStore.id}/setup`, AUTH_URL)
-  if (appStore.standaloneMode == 0) {
-    mfaWindow = window.open(
-      mfaSetupPath.toString(),
-      '_blank',
-      getWindowFeatures()
-    )
-    const handler = async (event: MessageEvent) => {
-      if (!event?.data?.status) {
-        return
-      }
-      cleanExit = true
-      const data = event.data
+  const { loginType } = JSON.parse(
+    storage.session.getItem('userInfo') as string
+  )
+  if (loginType === 'firebase') {
+    router.push({ name: 'MFASetup', params: { appId: appStore.id } })
+  } else {
+    cleanExit = false
+    const mfaSetupPath = new URL(`mfa/${appStore.id}/setup`, AUTH_URL)
+    if (appStore.standaloneMode == 0) {
+      mfaWindow = window.open(
+        mfaSetupPath.toString(),
+        '_blank',
+        getWindowFeatures()
+      )
+      const handler = async (event: MessageEvent) => {
+        if (!event?.data?.status) {
+          return
+        }
+        cleanExit = true
+        const data = event.data
 
-      if (data.status === 'success') {
-        mfaWindow?.close()
-        storage.local.setItem(`${user.info.id}-has-mfa`, '1')
-        user.hasMfa = true
-        toast.success('MFA setup completed')
-        window.removeEventListener('message', handler, false)
-        hideLoader()
-        router.push({ name: 'home' })
-      } else if (data.status == 'error') {
-        mfaWindow?.close()
-        window.removeEventListener('message', handler, false)
-        hideLoader()
-        if (data.error !== 'User cancelled the setup') toast.error(data.error)
-      } else {
-        toast.error('Error occured while setting up MFA. Please try again')
-        console.log('Unexpected event')
+        if (data.status === 'success') {
+          mfaWindow?.close()
+          storage.local.setItem(`${user.info.id}-has-mfa`, '1')
+          user.hasMfa = true
+          toast.success('MFA setup completed')
+          window.removeEventListener('message', handler, false)
+          hideLoader()
+          router.push({ name: 'home' })
+        } else if (data.status == 'error') {
+          mfaWindow?.close()
+          window.removeEventListener('message', handler, false)
+          hideLoader()
+          if (data.error !== 'User cancelled the setup') toast.error(data.error)
+        } else {
+          toast.error('Error occured while setting up MFA. Please try again')
+          console.log('Unexpected event')
+        }
       }
-    }
-    window.addEventListener('message', handler, false)
-    loader.value = {
-      show: true,
-      message: 'Setting up MFA...',
-    }
-
-    const id = window.setInterval(() => {
-      if (!cleanExit && mfaWindow?.closed) {
-        console.error('User closed the popup')
-        window.removeEventListener('message', handler, false)
-        hideLoader()
-        clearInterval(id)
+      window.addEventListener('message', handler, false)
+      loader.value = {
+        show: true,
+        message: 'Setting up MFA...',
       }
-    }, 500)
-  } else {
-    const c = await useParentConnectionStore().parentConnection?.promise
-    c?.uiEvent('mfa_setup', {})
+
+      const id = window.setInterval(() => {
+        if (!cleanExit && mfaWindow?.closed) {
+          console.error('User closed the popup')
+          window.removeEventListener('message', handler, false)
+          hideLoader()
+          clearInterval(id)
+        }
+      }, 500)
+    } else {
+      const c = await useParentConnectionStore().parentConnection?.promise
+      c?.uiEvent('mfa_setup', {})
+    }
   }
 }
 
diff --git a/src/pages/MFASetup.vue b/src/pages/MFASetup.vue
index 25664003..102c34f5 100644
--- a/src/pages/MFASetup.vue
+++ b/src/pages/MFASetup.vue
@@ -6,7 +6,7 @@ import {
 } from '@arcana/key-helper'
 import { connectToParent, type AsyncMethodReturns } from 'penpal'
 import { ref, onBeforeMount, type Ref } from 'vue'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { useToast } from 'vue-toastification'
 
 import AppLoader from '@/components/AppLoader.vue'
@@ -21,6 +21,7 @@ type CustomObject = {
 }
 
 const route = useRoute()
+const router = useRouter()
 const toast = useToast()
 const loader = ref({
   show: false,
@@ -50,12 +51,30 @@ const storage = getStorage()
 document.documentElement.classList.add('dark')
 
 let connectionToParent: AsyncMethodReturns<RedirectParentConnectionApi>
+let loginInfo
 
 onBeforeMount(async () => {
-  const dkgShare = JSON.parse(storage.local.getItem('pk') as string)
-  connectionToParent = await connectToParent<RedirectParentConnectionApi>({})
-    .promise
-  if (new Date() < new Date(dkgShare.exp)) {
+  const loginInfoSession = storage.session.getItem('userInfo')
+  if (loginInfoSession) {
+    loginInfo = JSON.parse(loginInfoSession)
+  }
+  let dkgShare
+  if (loginInfo) {
+    dkgShare = {
+      pk: loginInfo.pk,
+      id: loginInfo.userInfo.id,
+    }
+  } else {
+    dkgShare = JSON.parse(storage.local.getItem('pk') as string)
+  }
+  if (loginInfo?.loginType !== 'firebase') {
+    connectionToParent = await connectToParent<RedirectParentConnectionApi>({})
+      .promise
+  }
+  if (
+    loginInfo?.loginType === 'firebase' ||
+    new Date() < new Date(dkgShare.exp)
+  ) {
     const core = new Core(
       dkgShare.pk,
       dkgShare.id,
@@ -226,10 +245,15 @@ async function handlePinProceed() {
     }
     try {
       await createShare(pinToEncryptMFAShare.value)
-      const dkgShare = JSON.parse(storage.local.getItem('pk') as string)
-      storage.local.setItem(`${dkgShare.id}-has-mfa`, '1')
-      storage.local.removeItem('pk')
+      if (loginInfo?.loginType !== 'firebase') {
+        const dkgShare = JSON.parse(storage.local.getItem('pk') as string)
+        storage.local.setItem(`${dkgShare.id}-has-mfa`, '1')
+        storage.local.removeItem('pk')
+      }
     } catch (e) {
+      if (loginInfo?.loginType === 'firebase') {
+        return toast.error(e as string)
+      }
       // eslint-disable-next-line no-undef
       return connectionToParent.error(e, process.env.VUE_APP_WALLET_DOMAIN)
     }
@@ -243,11 +267,17 @@ async function handlePinProceed() {
 }
 
 async function handleDone() {
+  if (loginInfo?.loginType === 'firebase') {
+    return router.push({ name: 'home' })
+  }
   // eslint-disable-next-line no-undef
   return connectionToParent.replyTo(process.env.VUE_APP_WALLET_DOMAIN)
 }
 
 function handleCancel() {
+  if (loginInfo?.loginType === 'firebase') {
+    return router.back()
+  }
   return connectionToParent.error(
     'User cancelled the setup',
     // eslint-disable-next-line no-undef
@@ -300,14 +330,14 @@ function handlePinBack() {
     >
       <AppLoader :message="loader.message" />
     </div>
-    <h2 class="font-bold text-lg uppercase m-8">RECOVERY METHOD 2: PIN</h2>
+    <h2 class="font-bold text-lg uppercase m-4">RECOVERY METHOD 2: PIN</h2>
     <hr />
-    <div class="m-8 text-sm text-gray-100">
+    <div class="m-4 text-sm text-gray-100">
       Enter a 6 digit, alphanumeric pin that you can use to retrieve your wallet
       if you move to a new device or browser.
     </div>
     <form
-      class="flex flex-col mt-6 gap-4 px-8 pb-8"
+      class="flex flex-col mt-6 gap-4 px-4 pb-8"
       @submit.prevent="handlePinProceed"
     >
       <div class="flex flex-col gap-1">
@@ -361,14 +391,11 @@ function handlePinBack() {
   </div>
   <div v-else class="card w-full max-w-[40rem] mx-auto h-max min-h-max">
     <div class="overflow-y-auto">
-      <h2 class="font-bold text-lg uppercase my-4 mx-8">
+      <h2 class="font-bold text-base uppercase m-4">
         RECOVERY METHOD 1: Security Questions
       </h2>
       <hr />
-      <form
-        class="flex flex-col py-4 px-8 gap-6"
-        @submit.prevent="handleSubmit"
-      >
+      <form class="flex flex-col p-4 gap-6" @submit.prevent="handleSubmit">
         <div
           v-for="i in totalQuestions"
           :key="`Security-Question-${i}`"
diff --git a/src/pages/profileScreen.vue b/src/pages/profileScreen.vue
index cc9fb56c..401b1140 100644
--- a/src/pages/profileScreen.vue
+++ b/src/pages/profileScreen.vue
@@ -2,7 +2,7 @@
 import type { Connection } from 'penpal'
 import { storeToRefs } from 'pinia'
 import { ref, toRefs, watch } from 'vue'
-import { onBeforeRouteLeave } from 'vue-router'
+import { onBeforeRouteLeave, useRouter } from 'vue-router'
 import { useToast } from 'vue-toastification'
 
 import AppLoader from '@/components/AppLoader.vue'
@@ -23,6 +23,7 @@ import { getWindowFeatures } from '@/utils/popupProps'
 import { getStorage } from '@/utils/storageWrapper'
 
 const user = useUserStore()
+const router = useRouter()
 const appStore = useAppStore()
 const toast = useToast()
 const rpcStore = useRpcStore()
@@ -98,58 +99,66 @@ function handleShowMFAProceedModal(show: boolean) {
 }
 
 async function handleMFASetupClick() {
-  cleanExit = false
-  const mfaSetupPath = new URL(`mfa/${appStore.id}/setup`, AUTH_URL)
-  if (appStore.standaloneMode == 0) {
-    mfaWindow = window.open(
-      mfaSetupPath.toString(),
-      '_blank',
-      getWindowFeatures()
-    )
+  const { loginType } = JSON.parse(
+    getStorage().session.getItem('userInfo') as string
+  )
+  if (loginType === 'firebase') {
+    modalStore.setShowModal(false)
+    router.push({ name: 'MFASetup', params: { appId: appStore.id } })
+  } else {
+    cleanExit = false
+    const mfaSetupPath = new URL(`mfa/${appStore.id}/setup`, AUTH_URL)
+    if (appStore.standaloneMode == 0) {
+      mfaWindow = window.open(
+        mfaSetupPath.toString(),
+        '_blank',
+        getWindowFeatures()
+      )
+
+      const handler = async (event: MessageEvent) => {
+        if (!event?.data?.status) {
+          return
+        }
+        cleanExit = true
+        const data = event.data
 
-    const handler = async (event: MessageEvent) => {
-      if (!event?.data?.status) {
-        return
+        if (data.status === 'success') {
+          mfaWindow?.close()
+          getStorage().local.setItem(`${user.info.id}-has-mfa`, '1')
+          user.hasMfa = true
+          toast.success('MFA setup completed')
+          window.removeEventListener('message', handler, false)
+          handleShowMFAProceedModal(false)
+          hideLoader()
+        } else if (data.status == 'error') {
+          mfaWindow?.close()
+          window.removeEventListener('message', handler, false)
+          hideLoader()
+          if (data.error !== 'User cancelled the setup') toast.error(data.error)
+        } else {
+          toast.error('Error occured while setting up MFA. Please try again')
+          console.log('Unexpected event')
+        }
       }
-      cleanExit = true
-      const data = event.data
+      window.addEventListener('message', handler, false)
 
-      if (data.status === 'success') {
-        mfaWindow?.close()
-        getStorage().local.setItem(`${user.info.id}-has-mfa`, '1')
-        user.hasMfa = true
-        toast.success('MFA setup completed')
-        window.removeEventListener('message', handler, false)
-        handleShowMFAProceedModal(false)
-        hideLoader()
-      } else if (data.status == 'error') {
-        mfaWindow?.close()
-        window.removeEventListener('message', handler, false)
-        hideLoader()
-        if (data.error !== 'User cancelled the setup') toast.error(data.error)
-      } else {
-        toast.error('Error occured while setting up MFA. Please try again')
-        console.log('Unexpected event')
+      loader.value = {
+        show: true,
+        message: 'Setting up MFA...',
       }
-    }
-    window.addEventListener('message', handler, false)
 
-    loader.value = {
-      show: true,
-      message: 'Setting up MFA...',
+      const id = window.setInterval(() => {
+        if (!cleanExit && mfaWindow?.closed) {
+          console.error('User closed the popup')
+          window.removeEventListener('message', handler, false)
+          hideLoader()
+          clearInterval(id)
+        }
+      }, 500)
+    } else {
+      const c = await useParentConnectionStore().parentConnection?.promise
+      c?.uiEvent('mfa_setup', {})
     }
-
-    const id = window.setInterval(() => {
-      if (!cleanExit && mfaWindow?.closed) {
-        console.error('User closed the popup')
-        window.removeEventListener('message', handler, false)
-        hideLoader()
-        clearInterval(id)
-      }
-    }, 500)
-  } else {
-    const c = await useParentConnectionStore().parentConnection?.promise
-    c?.uiEvent('mfa_setup', {})
   }
 }
 

From 7d4b3886a237448ead1948439bf2e8340dd2561f Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 9 Jun 2023 13:23:33 +0530
Subject: [PATCH 124/153] Add mfa restore screen

---
 src/pages/MFARestoreScreen.vue | 71 +++++++++++++++++++++++++++++++---
 src/pages/signInV2.vue         | 25 +++++++++++-
 2 files changed, 89 insertions(+), 7 deletions(-)

diff --git a/src/pages/MFARestoreScreen.vue b/src/pages/MFARestoreScreen.vue
index 1568f520..d44e10d8 100644
--- a/src/pages/MFARestoreScreen.vue
+++ b/src/pages/MFARestoreScreen.vue
@@ -3,7 +3,7 @@ import { Core, SecurityQuestionModule } from '@arcana/key-helper'
 import { getUniqueId } from 'json-rpc-engine'
 import { connectToParent } from 'penpal'
 import { ref, onBeforeMount, onUnmounted, type Ref } from 'vue'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { useToast } from 'vue-toastification'
 
 import AppLoader from '@/components/AppLoader.vue'
@@ -11,11 +11,13 @@ import PinBasedRecoveryModal from '@/components/PinBasedRecoveryModal.vue'
 import SecurityQuestionRecoveryModal from '@/components/SecurityQuestionRecoveryModal.vue'
 import type { RedirectParentConnectionApi } from '@/models/Connection'
 import { useModalStore } from '@/store/modal'
+import { useUserStore } from '@/store/user'
 import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
 import { handleLogin } from '@/utils/redirectUtils'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
 const modalStore = useModalStore()
+const user = useUserStore()
 const toast = useToast()
 const recoveryMethod = ref('')
 const securityQuestionModule = new SecurityQuestionModule(3)
@@ -35,11 +37,13 @@ document.documentElement.classList.add('dark')
 let core: Core
 let dkgShare: {
   pk: string
-  exp: string
+  exp?: string
   id: string
 }
+let userInfoSession
 let channel: BroadcastChannel
 const route = useRoute()
+const router = useRouter()
 const appId = route.params.appId as string
 initStorage(appId)
 const storage = getStorage()
@@ -49,7 +53,18 @@ onBeforeMount(async () => {
     show: true,
     message: 'Loading metadata...',
   }
-  dkgShare = JSON.parse(storage.local.getItem('pk') as string)
+  const localSession = storage.session.getItem('userInfo')
+  if (localSession) {
+    userInfoSession = JSON.parse(localSession)
+  }
+  if (userInfoSession?.loginType === 'firebase') {
+    dkgShare = {
+      id: userInfoSession.userInfo.id,
+      pk: userInfoSession.pk,
+    }
+  } else {
+    dkgShare = JSON.parse(storage.local.getItem('pk') as string)
+  }
   core = new Core(
     dkgShare.pk,
     dkgShare.id,
@@ -88,7 +103,12 @@ async function handleAnswerBasedRecovery(ev) {
       answers: ev.answers,
     })
     const key = await core.getKey(reconstructedShare)
-    returnToParent(key)
+    if (userInfoSession?.loginType === 'firebase') {
+      await handleLocalRecovery(key)
+      router.push({ name: 'home' })
+    } else {
+      returnToParent(key)
+    }
   } catch (e) {
     console.error(e)
     toast.error('Incorrect answers')
@@ -100,6 +120,40 @@ async function handleAnswerBasedRecovery(ev) {
   }
 }
 
+async function handleLocalRecovery(key: string) {
+  const userInfo = userInfoSession
+  userInfo.privateKey = key
+  storage.session.setItem('userInfo', JSON.stringify(userInfo))
+  storage.session.setItem('isLoggedIn', JSON.stringify(true))
+  user.setUserInfo(userInfo)
+  user.setLoginStatus(true)
+  if (!userInfo.hasMfa && userInfo.pk) {
+    const core = new Core(
+      userInfo.pk,
+      userInfo.userInfo.id,
+      `${appId}`,
+      GATEWAY_URL,
+      AUTH_NETWORK === 'dev'
+    )
+    const securityQuestionModule = new SecurityQuestionModule(3)
+    securityQuestionModule.init(core)
+    const isEnabled = await securityQuestionModule.isEnabled()
+    user.hasMfa = isEnabled
+  }
+  if (userInfo.hasMfa) {
+    user.hasMfa = true
+    storage.local.setItem(`${user.info.id}-has-mfa`, '1')
+  }
+  const loginCount = storage.local.getItem(
+    `${userInfo.userInfo.id}-login-count`
+  )
+  const newLoginCount = loginCount ? Number(loginCount) + 1 : 1
+  storage.local.setItem(
+    `${userInfo.userInfo.id}-login-count`,
+    String(newLoginCount)
+  )
+}
+
 async function handlePinBasedRecovery(ev: any) {
   loader.value = {
     show: true,
@@ -111,7 +165,12 @@ async function handlePinBasedRecovery(ev: any) {
       password: ev.password,
     })
     const key = await core.getKey(reconstructedShare)
-    returnToParent(key)
+    if (userInfoSession?.loginType === 'firebase') {
+      await handleLocalRecovery(key)
+      router.push({ name: 'home' })
+    } else {
+      returnToParent(key)
+    }
   } catch (e) {
     console.error(e)
     toast.error('Incorrect Pin')
@@ -165,7 +224,7 @@ onUnmounted(() => {
 
 <template>
   <div
-    class="card w-full max-w-[40rem] m-auto h-max min-h-max overflow-y-auto p-8"
+    class="card w-full max-w-[40rem] m-auto h-max min-h-max overflow-y-auto p-4"
   >
     <div
       v-show="loader.show"
diff --git a/src/pages/signInV2.vue b/src/pages/signInV2.vue
index fa9d2ae8..e5c2c8bc 100644
--- a/src/pages/signInV2.vue
+++ b/src/pages/signInV2.vue
@@ -139,9 +139,32 @@ async function fetchAvailableLogins(authProvider: AuthProvider) {
 }
 
 async function storeUserInfoAndRedirect(
-  userInfo: GetInfoOutput & { hasMfa?: boolean; pk?: string }
+  userInfo: GetInfoOutput & {
+    hasMfa?: boolean
+    pk?: string
+  }
 ) {
   const storage = getStorage()
+  if ((userInfo.loginType as string) === 'firebase') {
+    try {
+      const core = new Core(
+        userInfo.pk as string,
+        userInfo.userInfo.id,
+        `${appId}`,
+        GATEWAY_URL,
+        AUTH_NETWORK === 'dev'
+      )
+      await core.init()
+    } catch (e) {
+      app.expandWallet = true
+      app.showWallet = true
+      storage.session.setItem('userInfo', JSON.stringify(userInfo))
+      return router.push({
+        name: 'MFARestore',
+        params: { appId: appId as string },
+      })
+    }
+  }
   storage.session.setItem('userInfo', JSON.stringify(userInfo))
   storage.session.setItem('isLoggedIn', JSON.stringify(true))
   user.setUserInfo(userInfo)

From 45216e4afb5b9bfd7587af4e620072567a70acde Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 9 Jun 2023 13:26:00 +0530
Subject: [PATCH 125/153] Add handler for email

---
 src/pages/profileScreen.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/profileScreen.vue b/src/pages/profileScreen.vue
index 401b1140..85081934 100644
--- a/src/pages/profileScreen.vue
+++ b/src/pages/profileScreen.vue
@@ -203,7 +203,7 @@ watch(
       <div class="flex flex-col">
         <span class="text-sm text-gray-100">Email ID</span>
         <span class="text-lg font-bold">
-          {{ email }}
+          {{ email || 'Not available' }}
         </span>
       </div>
       <div class="flex flex-col">

From 88a4644b054f1b6fccb9dc94329d12b2363669f0 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 9 Jun 2023 15:33:13 +0530
Subject: [PATCH 126/153] Add extra state variable to handle opening of wallet
 on restore using firebase

---
 src/App.vue                    |  2 +-
 src/pages/MFARestoreScreen.vue |  5 +++++
 src/pages/signInV2.vue         | 10 +++++++---
 src/store/app.ts               | 14 ++++++++++----
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e7903ef5..9080eb3c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -118,7 +118,7 @@ function canShowCollapseButton() {
 <template>
   <div v-if="sdkVersion === 'v3'" class="flex flex-col h-full">
     <div
-      v-show="expandWallet"
+      v-show="expandWallet || app.expandRestoreScreen"
       class="flex flex-col h-full bg-white-300 dark:bg-black-300 overflow-hidden"
     >
       <div class="flex justify-center mt-2 mb-2">
diff --git a/src/pages/MFARestoreScreen.vue b/src/pages/MFARestoreScreen.vue
index d44e10d8..4d8b5dbf 100644
--- a/src/pages/MFARestoreScreen.vue
+++ b/src/pages/MFARestoreScreen.vue
@@ -10,6 +10,7 @@ import AppLoader from '@/components/AppLoader.vue'
 import PinBasedRecoveryModal from '@/components/PinBasedRecoveryModal.vue'
 import SecurityQuestionRecoveryModal from '@/components/SecurityQuestionRecoveryModal.vue'
 import type { RedirectParentConnectionApi } from '@/models/Connection'
+import { useAppStore } from '@/store/app'
 import { useModalStore } from '@/store/modal'
 import { useUserStore } from '@/store/user'
 import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
@@ -19,6 +20,7 @@ import { getStorage, initStorage } from '@/utils/storageWrapper'
 const modalStore = useModalStore()
 const user = useUserStore()
 const toast = useToast()
+const app = useAppStore()
 const recoveryMethod = ref('')
 const securityQuestionModule = new SecurityQuestionModule(3)
 let questions: Ref<
@@ -152,6 +154,9 @@ async function handleLocalRecovery(key: string) {
     `${userInfo.userInfo.id}-login-count`,
     String(newLoginCount)
   )
+  app.expandWallet = true
+  app.compactMode = false
+  app.expandRestoreScreen = false
 }
 
 async function handlePinBasedRecovery(ev: any) {
diff --git a/src/pages/signInV2.vue b/src/pages/signInV2.vue
index e5c2c8bc..6524ce1c 100644
--- a/src/pages/signInV2.vue
+++ b/src/pages/signInV2.vue
@@ -9,6 +9,7 @@ import { useRoute, useRouter } from 'vue-router'
 
 import type { ParentConnectionApi } from '@/models/Connection'
 import { useAppStore } from '@/store/app'
+import { useParentConnectionStore } from '@/store/parentConnection'
 import { useUserStore } from '@/store/user'
 import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
 import { createParentConnection } from '@/utils/createParentConnection'
@@ -21,6 +22,7 @@ const route = useRoute()
 const router = useRouter()
 const user = useUserStore()
 const app = useAppStore()
+const parentConnectionStore = useParentConnectionStore()
 const availableLogins: Ref<SocialLoginType[]> = ref([])
 const isLoading: Ref<boolean> = ref(false)
 let parentConnection: Connection<ParentConnectionApi> | null = null
@@ -156,13 +158,14 @@ async function storeUserInfoAndRedirect(
       )
       await core.init()
     } catch (e) {
-      app.expandWallet = true
-      app.showWallet = true
       storage.session.setItem('userInfo', JSON.stringify(userInfo))
-      return router.push({
+      router.push({
         name: 'MFARestore',
         params: { appId: appId as string },
       })
+      app.showWallet = true
+      app.expandRestoreScreen = true
+      return
     }
   }
   storage.session.setItem('userInfo', JSON.stringify(userInfo))
@@ -300,6 +303,7 @@ async function init() {
       parentConnection = createParentConnection({
         ...penpalMethods,
       })
+      parentConnectionStore.setParentConnection(parentConnection)
 
       const parentConnectionInstance = await parentConnection.promise
 
diff --git a/src/store/app.ts b/src/store/app.ts
index e9ca95f4..79df84e6 100644
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -21,6 +21,7 @@ type AppState = {
   parentAppUrl: string | null
   validAppMode: AppMode
   showWallet: boolean
+  expandRestoreScreen: boolean
   expandWallet: boolean
   walletPosition: WalletPosition
   appLogo: AppLogo
@@ -38,6 +39,7 @@ export const useAppStore = defineStore('app', {
       showWallet: false,
       standaloneMode: 0,
       expandWallet: true,
+      expandRestoreScreen: false,
       walletPosition: 'right',
       compactMode: false,
       sdkVersion: null,
@@ -49,6 +51,7 @@ export const useAppStore = defineStore('app', {
       expandWallet,
       walletPosition,
       compactMode,
+      expandRestoreScreen,
     }) => {
       return function getCompatibleStyles() {
         const requestStore = useRequestStore()
@@ -56,7 +59,7 @@ export const useAppStore = defineStore('app', {
         const style: Partial<CSSStyleDeclaration> = {}
 
         style.height = showWallet
-          ? expandWallet
+          ? expandWallet || expandRestoreScreen
             ? compactMode
               ? requestStore.pendingRequest?.request.method ===
                 'eth_sendTransaction'
@@ -66,7 +69,7 @@ export const useAppStore = defineStore('app', {
             : '40px'
           : '0'
         style.width = showWallet
-          ? expandWallet
+          ? expandWallet || expandRestoreScreen
             ? mobileViewport
               ? '100%'
               : '360px'
@@ -75,12 +78,15 @@ export const useAppStore = defineStore('app', {
         style.right =
           walletPosition === 'right' && !mobileViewport ? '30px' : ''
         style.left = walletPosition === 'left' && !mobileViewport ? '30px' : ''
-        style.bottom = expandWallet && !mobileViewport ? '30px' : '0'
+        style.bottom =
+          (expandWallet || expandRestoreScreen) && !mobileViewport
+            ? '30px'
+            : '0'
         style.transition = 'all 300ms ease-in-out'
         style.position = 'fixed'
         style.overflow = 'hidden'
         style.borderRadius = mobileViewport ? '0' : '10px'
-        if (!compactMode && !expandWallet) {
+        if (!compactMode && !expandWallet && !expandRestoreScreen) {
           style.borderBottomLeftRadius = '0'
           style.borderBottomRightRadius = '0'
           style.borderTopRightRadius = '5px'

From d256a909bd1547d303682852f8bf01298c7ad0ba Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 9 Jun 2023 16:00:15 +0530
Subject: [PATCH 127/153] Update condition to util , isInAppLogin

---
 src/pages/MFARequiredScreen.vue |  3 ++-
 src/pages/MFARestoreScreen.vue  |  7 ++++---
 src/pages/MFASetup.vue          | 13 +++++++------
 src/pages/profileScreen.vue     |  3 ++-
 src/utils/isInAppLogin.ts       |  6 ++++++
 5 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 src/utils/isInAppLogin.ts

diff --git a/src/pages/MFARequiredScreen.vue b/src/pages/MFARequiredScreen.vue
index 5aac5e86..e1855f8b 100644
--- a/src/pages/MFARequiredScreen.vue
+++ b/src/pages/MFARequiredScreen.vue
@@ -8,6 +8,7 @@ import { useAppStore } from '@/store/app'
 import { useParentConnectionStore } from '@/store/parentConnection'
 import { useUserStore } from '@/store/user'
 import { AUTH_URL, DOCS_URL } from '@/utils/constants'
+import { isInAppLogin } from '@/utils/isInAppLogin'
 import { getWindowFeatures } from '@/utils/popupProps'
 import { getStorage } from '@/utils/storageWrapper'
 
@@ -27,7 +28,7 @@ async function handleProceed() {
   const { loginType } = JSON.parse(
     storage.session.getItem('userInfo') as string
   )
-  if (loginType === 'firebase') {
+  if (isInAppLogin(loginType)) {
     router.push({ name: 'MFASetup', params: { appId: appStore.id } })
   } else {
     cleanExit = false
diff --git a/src/pages/MFARestoreScreen.vue b/src/pages/MFARestoreScreen.vue
index 4d8b5dbf..ced7277d 100644
--- a/src/pages/MFARestoreScreen.vue
+++ b/src/pages/MFARestoreScreen.vue
@@ -14,6 +14,7 @@ import { useAppStore } from '@/store/app'
 import { useModalStore } from '@/store/modal'
 import { useUserStore } from '@/store/user'
 import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
+import { isInAppLogin } from '@/utils/isInAppLogin'
 import { handleLogin } from '@/utils/redirectUtils'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
@@ -59,7 +60,7 @@ onBeforeMount(async () => {
   if (localSession) {
     userInfoSession = JSON.parse(localSession)
   }
-  if (userInfoSession?.loginType === 'firebase') {
+  if (isInAppLogin(userInfoSession?.loginType)) {
     dkgShare = {
       id: userInfoSession.userInfo.id,
       pk: userInfoSession.pk,
@@ -105,7 +106,7 @@ async function handleAnswerBasedRecovery(ev) {
       answers: ev.answers,
     })
     const key = await core.getKey(reconstructedShare)
-    if (userInfoSession?.loginType === 'firebase') {
+    if (isInAppLogin(userInfoSession?.loginType)) {
       await handleLocalRecovery(key)
       router.push({ name: 'home' })
     } else {
@@ -170,7 +171,7 @@ async function handlePinBasedRecovery(ev: any) {
       password: ev.password,
     })
     const key = await core.getKey(reconstructedShare)
-    if (userInfoSession?.loginType === 'firebase') {
+    if (isInAppLogin(userInfoSession?.loginType)) {
       await handleLocalRecovery(key)
       router.push({ name: 'home' })
     } else {
diff --git a/src/pages/MFASetup.vue b/src/pages/MFASetup.vue
index 102c34f5..ace71cf7 100644
--- a/src/pages/MFASetup.vue
+++ b/src/pages/MFASetup.vue
@@ -14,6 +14,7 @@ import SearchQuestion from '@/components/SearchQuestion.vue'
 import { RedirectParentConnectionApi } from '@/models/Connection'
 import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
 import { getImage } from '@/utils/getImage'
+import { isInAppLogin } from '@/utils/isInAppLogin'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
 type CustomObject = {
@@ -67,12 +68,12 @@ onBeforeMount(async () => {
   } else {
     dkgShare = JSON.parse(storage.local.getItem('pk') as string)
   }
-  if (loginInfo?.loginType !== 'firebase') {
+  if (!isInAppLogin(loginInfo?.loginType)) {
     connectionToParent = await connectToParent<RedirectParentConnectionApi>({})
       .promise
   }
   if (
-    loginInfo?.loginType === 'firebase' ||
+    isInAppLogin(loginInfo?.loginType) ||
     new Date() < new Date(dkgShare.exp)
   ) {
     const core = new Core(
@@ -245,13 +246,13 @@ async function handlePinProceed() {
     }
     try {
       await createShare(pinToEncryptMFAShare.value)
-      if (loginInfo?.loginType !== 'firebase') {
+      if (!isInAppLogin(loginInfo?.loginType)) {
         const dkgShare = JSON.parse(storage.local.getItem('pk') as string)
         storage.local.setItem(`${dkgShare.id}-has-mfa`, '1')
         storage.local.removeItem('pk')
       }
     } catch (e) {
-      if (loginInfo?.loginType === 'firebase') {
+      if (isInAppLogin(loginInfo?.loginType)) {
         return toast.error(e as string)
       }
       // eslint-disable-next-line no-undef
@@ -267,7 +268,7 @@ async function handlePinProceed() {
 }
 
 async function handleDone() {
-  if (loginInfo?.loginType === 'firebase') {
+  if (isInAppLogin(loginInfo?.loginType)) {
     return router.push({ name: 'home' })
   }
   // eslint-disable-next-line no-undef
@@ -275,7 +276,7 @@ async function handleDone() {
 }
 
 function handleCancel() {
-  if (loginInfo?.loginType === 'firebase') {
+  if (isInAppLogin(loginInfo?.loginType)) {
     return router.back()
   }
   return connectionToParent.error(
diff --git a/src/pages/profileScreen.vue b/src/pages/profileScreen.vue
index 85081934..f4da4319 100644
--- a/src/pages/profileScreen.vue
+++ b/src/pages/profileScreen.vue
@@ -19,6 +19,7 @@ import { AUTH_URL } from '@/utils/constants'
 import { downloadFile } from '@/utils/downloadFile'
 import { getAuthProvider } from '@/utils/getAuthProvider'
 import { getImage } from '@/utils/getImage'
+import { isInAppLogin } from '@/utils/isInAppLogin'
 import { getWindowFeatures } from '@/utils/popupProps'
 import { getStorage } from '@/utils/storageWrapper'
 
@@ -102,7 +103,7 @@ async function handleMFASetupClick() {
   const { loginType } = JSON.parse(
     getStorage().session.getItem('userInfo') as string
   )
-  if (loginType === 'firebase') {
+  if (isInAppLogin(loginType)) {
     modalStore.setShowModal(false)
     router.push({ name: 'MFASetup', params: { appId: appStore.id } })
   } else {
diff --git a/src/utils/isInAppLogin.ts b/src/utils/isInAppLogin.ts
new file mode 100644
index 00000000..64824145
--- /dev/null
+++ b/src/utils/isInAppLogin.ts
@@ -0,0 +1,6 @@
+const inAppLoginTypes = ['firebase']
+
+export function isInAppLogin(loginType?: string) {
+  if (!loginType) return false
+  return inAppLoginTypes.includes(loginType)
+}

From 22b444e9441c62754ef3933702464d3707c3192d Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Fri, 9 Jun 2023 17:02:41 +0530
Subject: [PATCH 128/153] Convert list to set

---
 src/utils/isInAppLogin.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/isInAppLogin.ts b/src/utils/isInAppLogin.ts
index 64824145..05a1c86e 100644
--- a/src/utils/isInAppLogin.ts
+++ b/src/utils/isInAppLogin.ts
@@ -1,6 +1,6 @@
-const inAppLoginTypes = ['firebase']
+const inAppLoginTypes = new Set(['firebase'])
 
 export function isInAppLogin(loginType?: string) {
   if (!loginType) return false
-  return inAppLoginTypes.includes(loginType)
+  return inAppLoginTypes.has(loginType)
 }

From e6145ff30445ade5b9d45a07e4a847ae3ca3dc46 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 12 Jun 2023 14:30:49 +0530
Subject: [PATCH 129/153] Fix name issue

---
 src/components/WalletHeader.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/WalletHeader.vue b/src/components/WalletHeader.vue
index 9c4cd4ca..921af585 100644
--- a/src/components/WalletHeader.vue
+++ b/src/components/WalletHeader.vue
@@ -66,10 +66,11 @@ watch(
           class="w-xl h-xl"
           onerror="this.style.display='none'"
         />
-        <div class="flex flex-col">
-          <span class="font-bold text-lg max-w-20 overflow-hidde">{{
-            appStore.name
-          }}</span>
+        <div class="flex flex-col items-start">
+          <span
+            class="font-bold text-lg max-w-[200px] overflow-hidden text-ellipsis whitespace-nowrap"
+            >{{ appStore.name }}</span
+          >
           <img
             :src="getImage('secured-by-arcana.svg')"
             class="h-3 select-none"

From 69c68339a83dc8301d5ae345970f06df212b673a Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 12 Jun 2023 15:28:35 +0530
Subject: [PATCH 130/153] Show assets

---
 src/components/AssetsView.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/AssetsView.vue b/src/components/AssetsView.vue
index ee395a09..7b061341 100644
--- a/src/components/AssetsView.vue
+++ b/src/components/AssetsView.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ethers } from 'ethers'
-import { onMounted, reactive, onBeforeUnmount, ref, watch } from 'vue'
+import { onMounted, onBeforeUnmount, ref, watch, type Ref } from 'vue'
 
 import type { Asset, AssetContract } from '@/models/Asset'
 import AddTokenScreen from '@/pages/AddTokenScreen.vue'
@@ -16,7 +16,7 @@ import { getIconAsset } from '@/utils/useImage'
 
 const userStore = useUserStore()
 const rpcStore = useRpcStore()
-const assets: Asset[] = reactive([])
+const assets: Ref<Asset[]> = ref([])
 const modalStore = useModalStore()
 const showModal = ref(false)
 let assetsPolling
@@ -57,10 +57,10 @@ function fetchNativeAsset() {
 }
 
 async function getAssetsBalance() {
-  const assets = [fetchNativeAsset()]
+  assets.value = [fetchNativeAsset()]
   const storedAssetContracts = fetchStoredAssetContracts()
   storedAssetContracts.forEach((contract) => {
-    assets.push({
+    assets.value.push({
       address: contract.address,
       name: contract.name || contract.symbol,
       symbol: contract.symbol,
@@ -75,7 +75,9 @@ async function getAssetsBalance() {
         walletAddress: userStore.walletAddress,
         contractAddress: contract.address,
       })
-      const asset = assets.find((asset) => asset.address === contract.address)
+      const asset = assets.value.find(
+        (asset) => asset.address === contract.address
+      )
       if (asset) {
         asset.balance = formatTokenDecimals(balance, contract.decimals)
       }
@@ -86,7 +88,7 @@ async function getAssetsBalance() {
 }
 
 function updateAssetsBalance() {
-  assets.forEach(async (asset) => {
+  assets.value.forEach(async (asset) => {
     if (asset.address !== 'native') {
       const balance = await getTokenBalance({
         walletAddress: userStore.walletAddress,

From f0b1e3f3a1f09e036aa9fe0c0af7b302d1362019 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 12 Jun 2023 16:24:23 +0530
Subject: [PATCH 131/153] Show app name on hover

---
 src/components/WalletHeader.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/WalletHeader.vue b/src/components/WalletHeader.vue
index 921af585..e3b196a5 100644
--- a/src/components/WalletHeader.vue
+++ b/src/components/WalletHeader.vue
@@ -69,6 +69,7 @@ watch(
         <div class="flex flex-col items-start">
           <span
             class="font-bold text-lg max-w-[200px] overflow-hidden text-ellipsis whitespace-nowrap"
+            :title="appStore.name"
             >{{ appStore.name }}</span
           >
           <img

From 20ac55c04658e0b6ea2a8fd7fcd35d16c98c1f0a Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Mon, 12 Jun 2023 17:52:18 +0530
Subject: [PATCH 132/153] Grow wallet on hover

---
 src/App.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 9080eb3c..46f25568 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -145,7 +145,7 @@ function canShowCollapseButton() {
     </div>
     <div
       v-show="showWalletButton"
-      class="relative h-[50vh] mt-[50vh] bg-white-300 rounded-t-sm dark:bg-black-300"
+      class="relative h-[50vh] mt-[50vh] bg-white-300 rounded-t-sm dark:bg-black-300 transition-all duration-500 hover:h-[100vh] hover:mt-0"
       style="z-index: 999"
       :class="{
         'notification-animation': requestStore.areRequestsPendingForApproval,
@@ -271,8 +271,8 @@ body {
   }
 
   40% {
-    height: 85vh;
-    margin-top: 15vh;
+    height: 100vh;
+    margin-top: 0;
   }
 
   100% {

From 28a2fe06adae277c9e2bd8262bda04df3d15bc88 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 13 Jun 2023 12:53:35 +0530
Subject: [PATCH 133/153] Add logs for debugging

---
 src/pages/MFASetup.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pages/MFASetup.vue b/src/pages/MFASetup.vue
index ace71cf7..de924003 100644
--- a/src/pages/MFASetup.vue
+++ b/src/pages/MFASetup.vue
@@ -55,6 +55,10 @@ let connectionToParent: AsyncMethodReturns<RedirectParentConnectionApi>
 let loginInfo
 
 onBeforeMount(async () => {
+  console.log({
+    loginInfoSession: storage.session.getItem('userInfo'),
+    dkgShare: storage.local.getItem('pk'),
+  })
   const loginInfoSession = storage.session.getItem('userInfo')
   if (loginInfoSession) {
     loginInfo = JSON.parse(loginInfoSession)

From 9840b88160e65198bfc8ed3021f25c338801f870 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 13 Jun 2023 12:58:21 +0530
Subject: [PATCH 134/153] Empty commit


From e1b50aab930d4c2f0e1823c6bb8c20dde2447d7c Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Tue, 13 Jun 2023 15:01:41 +0530
Subject: [PATCH 135/153] Remove exp comparison

---
 src/pages/MFASetup.vue | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/pages/MFASetup.vue b/src/pages/MFASetup.vue
index de924003..a456dc89 100644
--- a/src/pages/MFASetup.vue
+++ b/src/pages/MFASetup.vue
@@ -55,10 +55,6 @@ let connectionToParent: AsyncMethodReturns<RedirectParentConnectionApi>
 let loginInfo
 
 onBeforeMount(async () => {
-  console.log({
-    loginInfoSession: storage.session.getItem('userInfo'),
-    dkgShare: storage.local.getItem('pk'),
-  })
   const loginInfoSession = storage.session.getItem('userInfo')
   if (loginInfoSession) {
     loginInfo = JSON.parse(loginInfoSession)
@@ -76,23 +72,20 @@ onBeforeMount(async () => {
     connectionToParent = await connectToParent<RedirectParentConnectionApi>({})
       .promise
   }
-  if (
-    isInAppLogin(loginInfo?.loginType) ||
-    new Date() < new Date(dkgShare.exp)
-  ) {
-    const core = new Core(
-      dkgShare.pk,
-      dkgShare.id,
-      String(route.params.appId),
-      GATEWAY_URL,
-      AUTH_NETWORK === 'dev'
-    )
+  const core = new Core(
+    dkgShare.pk,
+    dkgShare.id,
+    String(route.params.appId),
+    GATEWAY_URL,
+    AUTH_NETWORK === 'dev'
+  )
+  try {
     await core.init()
-    securityQuestionModule.init(core)
-    globalQuestions.value = await securityQuestionModule.getGlobalQuestions()
-  } else {
-    toast.error('Share expired. Please login again to continue')
+  } catch (e) {
+    toast.error(e as string)
   }
+  securityQuestionModule.init(core)
+  globalQuestions.value = await securityQuestionModule.getGlobalQuestions()
 })
 
 function addSelectedQuestion(index: number, value: any) {

From 5d19d388427576641af9df93a06dda94e4e91cc5 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 14 Jun 2023 15:59:06 +0530
Subject: [PATCH 136/153] Upgrade vue packages

---
 package-lock.json | 1888 ++++++++++++++++++++++++++++++++++++++++-----
 package.json      |    5 +-
 2 files changed, 1706 insertions(+), 187 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4ec2063a..d88c4fc2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "@arcana/auth": "^0.1.3",
-        "@arcana/auth-core": "^1.0.0-beta.8",
+        "@arcana/auth-core": "1.0.0-beta.8",
         "@arcana/key-helper": "^1.0.0-beta.7",
         "@ethereumjs/tx": "^3.4.0",
         "@fontsource/montserrat": "^4.5.14",
@@ -38,12 +38,12 @@
         "pinia": "^2.0.12",
         "stream-browserify": "^3.0.0",
         "uuid": "^9.0.0",
-        "vue": "^3.2.13",
+        "vue": "^3.3.4",
         "vue-class-component": "^8.0.0-0",
         "vue-gtag": "^2.0.1",
         "vue-json-viewer": "^3.0.4",
         "vue-qrious": "^3.1.0",
-        "vue-router": "^4.0.14",
+        "vue-router": "^4.2.2",
         "vue-slider-component": "^4.1.0-beta.2",
         "vue-toastification": "^2.0.0-rc.5",
         "vue3-popper": "^1.5.0",
@@ -59,6 +59,7 @@
         "@vue/cli-plugin-eslint": "~5.0.0",
         "@vue/cli-plugin-typescript": "~5.0.0",
         "@vue/cli-service": "~5.0.0",
+        "@vue/devtools": "^6.5.0",
         "@vue/eslint-config-prettier": "^7.0.0",
         "@vue/eslint-config-typescript": "^9.1.0",
         "autoprefixer": "^10.4.8",
@@ -694,9 +695,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
-      "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
+      "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1936,6 +1937,60 @@
         "postcss-selector-parser": "^6.0.10"
       }
     },
+    "node_modules/@electron/get": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.14.1.tgz",
+      "integrity": "sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "env-paths": "^2.2.0",
+        "fs-extra": "^8.1.0",
+        "got": "^9.6.0",
+        "progress": "^2.0.3",
+        "semver": "^6.2.0",
+        "sumchecker": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      },
+      "optionalDependencies": {
+        "global-agent": "^3.0.0",
+        "global-tunnel-ng": "^2.7.1"
+      }
+    },
+    "node_modules/@electron/get/node_modules/fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/@electron/get/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@electron/get/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/@eslint/eslintrc": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
@@ -2835,8 +2890,7 @@
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.14",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-      "dev": true
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.17",
@@ -3302,6 +3356,21 @@
       "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
       "dev": true
     },
+    "node_modules/@sindresorhus/is": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
+      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
+      "dev": true
+    },
     "node_modules/@soda/friendly-errors-webpack-plugin": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz",
@@ -3398,6 +3467,18 @@
       "resolved": "https://registry.npmjs.org/@stablelib/base64/-/base64-1.0.1.tgz",
       "integrity": "sha512-1bnPQqSxSuc3Ii6MhBysoWCg58j97aUjuCSZrGSmDxNqtytIi0k8utUenAwTZN4V5mXXYGsVUI9zeBqy+jBOSQ=="
     },
+    "node_modules/@szmarczak/http-timer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
+      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+      "dev": true,
+      "dependencies": {
+        "defer-to-connect": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@tootallnate/once": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
@@ -3462,6 +3543,21 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/cookie": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
+      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
+      "dev": true
+    },
+    "node_modules/@types/cors": {
+      "version": "2.8.13",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
+      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/debug": {
       "version": "4.1.7",
       "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
@@ -3668,6 +3764,16 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "5.33.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz",
@@ -4427,49 +4533,49 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
-      "integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz",
+      "integrity": "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==",
       "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/shared": "3.2.37",
+        "@babel/parser": "^7.21.3",
+        "@vue/shared": "3.3.4",
         "estree-walker": "^2.0.2",
-        "source-map": "^0.6.1"
+        "source-map-js": "^1.0.2"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz",
-      "integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz",
+      "integrity": "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==",
       "dependencies": {
-        "@vue/compiler-core": "3.2.37",
-        "@vue/shared": "3.2.37"
+        "@vue/compiler-core": "3.3.4",
+        "@vue/shared": "3.3.4"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz",
-      "integrity": "sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==",
-      "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.37",
-        "@vue/compiler-dom": "3.2.37",
-        "@vue/compiler-ssr": "3.2.37",
-        "@vue/reactivity-transform": "3.2.37",
-        "@vue/shared": "3.2.37",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz",
+      "integrity": "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==",
+      "dependencies": {
+        "@babel/parser": "^7.20.15",
+        "@vue/compiler-core": "3.3.4",
+        "@vue/compiler-dom": "3.3.4",
+        "@vue/compiler-ssr": "3.3.4",
+        "@vue/reactivity-transform": "3.3.4",
+        "@vue/shared": "3.3.4",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7",
+        "magic-string": "^0.30.0",
         "postcss": "^8.1.10",
-        "source-map": "^0.6.1"
+        "source-map-js": "^1.0.2"
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz",
-      "integrity": "sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz",
+      "integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==",
       "dependencies": {
-        "@vue/compiler-dom": "3.2.37",
-        "@vue/shared": "3.2.37"
+        "@vue/compiler-dom": "3.3.4",
+        "@vue/shared": "3.3.4"
       }
     },
     "node_modules/@vue/component-compiler-utils": {
@@ -4536,10 +4642,34 @@
       "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
       "dev": true
     },
+    "node_modules/@vue/devtools": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@vue/devtools/-/devtools-6.5.0.tgz",
+      "integrity": "sha512-PlXwf1k5LABNayF71QSfmRL0sRIcBR5HKjrsmGf+raILJ5h32/MRbzA0UpfS/fudCyRgi8F7W5KC1wLRfkTxPQ==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "electron": "^21.0.1",
+        "express": "^4.17.1",
+        "ip": "^1.1.5",
+        "socket.io": "^4.4.0",
+        "socket.io-client": "^4.4.1",
+        "utf-8-validate": "^5.0.9"
+      },
+      "bin": {
+        "vue-devtools": "bin.js"
+      }
+    },
     "node_modules/@vue/devtools-api": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.2.1.tgz",
-      "integrity": "sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ=="
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.0.tgz",
+      "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q=="
+    },
+    "node_modules/@vue/devtools/node_modules/ip": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
+      "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==",
+      "dev": true
     },
     "node_modules/@vue/eslint-config-prettier": {
       "version": "7.0.0",
@@ -4574,60 +4704,60 @@
       }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz",
-      "integrity": "sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.4.tgz",
+      "integrity": "sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==",
       "dependencies": {
-        "@vue/shared": "3.2.37"
+        "@vue/shared": "3.3.4"
       }
     },
     "node_modules/@vue/reactivity-transform": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz",
-      "integrity": "sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz",
+      "integrity": "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==",
       "dependencies": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.37",
-        "@vue/shared": "3.2.37",
+        "@babel/parser": "^7.20.15",
+        "@vue/compiler-core": "3.3.4",
+        "@vue/shared": "3.3.4",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7"
+        "magic-string": "^0.30.0"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz",
-      "integrity": "sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.4.tgz",
+      "integrity": "sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==",
       "dependencies": {
-        "@vue/reactivity": "3.2.37",
-        "@vue/shared": "3.2.37"
+        "@vue/reactivity": "3.3.4",
+        "@vue/shared": "3.3.4"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz",
-      "integrity": "sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz",
+      "integrity": "sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==",
       "dependencies": {
-        "@vue/runtime-core": "3.2.37",
-        "@vue/shared": "3.2.37",
-        "csstype": "^2.6.8"
+        "@vue/runtime-core": "3.3.4",
+        "@vue/shared": "3.3.4",
+        "csstype": "^3.1.1"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.37.tgz",
-      "integrity": "sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.4.tgz",
+      "integrity": "sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==",
       "dependencies": {
-        "@vue/compiler-ssr": "3.2.37",
-        "@vue/shared": "3.2.37"
+        "@vue/compiler-ssr": "3.3.4",
+        "@vue/shared": "3.3.4"
       },
       "peerDependencies": {
-        "vue": "3.2.37"
+        "vue": "3.3.4"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
-      "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
+      "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="
     },
     "node_modules/@vue/vue-loader-v15": {
       "name": "vue-loader",
@@ -5504,6 +5634,15 @@
         }
       ]
     },
+    "node_modules/base64id": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
+      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
+      "dev": true,
+      "engines": {
+        "node": "^4.5.0 || >= 5.9"
+      }
+    },
     "node_modules/batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
@@ -5732,6 +5871,13 @@
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "dev": true
     },
+    "node_modules/boolean": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
+      "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -5917,6 +6063,15 @@
         "ieee754": "^1.2.1"
       }
     },
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -5966,6 +6121,57 @@
         "node": ">= 10"
       }
     },
+    "node_modules/cacheable-request": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
+      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
+      "dev": true,
+      "dependencies": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^3.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^4.1.0",
+        "responselike": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cacheable-request/node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cacheable-request/node_modules/lowercase-keys": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cacheable-request/node_modules/normalize-url": {
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
+      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -6454,6 +6660,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/clone-response": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
+      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
+      "dev": true,
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -6567,6 +6785,24 @@
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
+    "node_modules/config-chain": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "ini": "^1.3.4",
+        "proto-list": "~1.2.1"
+      }
+    },
+    "node_modules/config-chain/node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/connect-history-api-fallback": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
@@ -6740,6 +6976,19 @@
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
       "dev": true
     },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "dev": true,
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/cosmiconfig": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
@@ -7179,9 +7428,9 @@
       }
     },
     "node_modules/csstype": {
-      "version": "2.6.20",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz",
-      "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
+      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
     },
     "node_modules/dashdash": {
       "version": "1.14.1",
@@ -7252,6 +7501,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==",
+      "dev": true,
+      "dependencies": {
+        "mimic-response": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/deep-extend": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
@@ -7365,6 +7626,12 @@
         "node": ">=0.8"
       }
     },
+    "node_modules/defer-to-connect": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
+      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
+      "dev": true
+    },
     "node_modules/define-lazy-prop": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
@@ -7665,6 +7932,12 @@
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "dev": true
     },
+    "node_modules/duplexer3": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz",
+      "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==",
+      "dev": true
+    },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -7722,12 +7995,36 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
+    "node_modules/electron": {
+      "version": "21.4.4",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-21.4.4.tgz",
+      "integrity": "sha512-N5O7y7Gtt7mDgkJLkW49ETiT8M3myZ9tNIEvGTKhpBduX4WdgMj6c3hYeYBD6XW7SvbRkWEQaTl25RNday8Xpw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@electron/get": "^1.14.1",
+        "@types/node": "^16.11.26",
+        "extract-zip": "^2.0.1"
+      },
+      "bin": {
+        "electron": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      }
+    },
     "node_modules/electron-to-chromium": {
       "version": "1.4.224",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.224.tgz",
       "integrity": "sha512-dOujC5Yzj0nOVE23iD5HKqrRSDj2SD7RazpZS/b/WX85MtO6/LzKDF4TlYZTBteB+7fvSg5JpWh0sN7fImNF8w==",
       "dev": true
     },
+    "node_modules/electron/node_modules/@types/node": {
+      "version": "16.18.36",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.36.tgz",
+      "integrity": "sha512-8egDX8dE50XyXWH6C6PRCNkTP106DuUrvdrednFouDSmCi7IOvrqr0frznfZaHifHH/3aq/7a7v9N4wdXMqhBQ==",
+      "dev": true
+    },
     "node_modules/elliptic": {
       "version": "6.5.4",
       "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
@@ -7789,6 +8086,100 @@
         "once": "^1.4.0"
       }
     },
+    "node_modules/engine.io": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
+      "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
+      "dev": true,
+      "dependencies": {
+        "@types/cookie": "^0.4.1",
+        "@types/cors": "^2.8.12",
+        "@types/node": ">=10.0.0",
+        "accepts": "~1.3.4",
+        "base64id": "2.0.0",
+        "cookie": "~0.4.1",
+        "cors": "~2.8.5",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.0.3",
+        "ws": "~8.11.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/engine.io-client": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.4.0.tgz",
+      "integrity": "sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g==",
+      "dev": true,
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.0.3",
+        "ws": "~8.11.0",
+        "xmlhttprequest-ssl": "~2.0.0"
+      }
+    },
+    "node_modules/engine.io-client/node_modules/ws": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/engine.io-parser": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.7.tgz",
+      "integrity": "sha512-P+jDFbvK6lE3n1OL+q9KuzdOFWkkZ/cMV9gol/SbVfpyqfvrfrFTOFJ6fQm2VC3PZHlU3QPhVwmbsCnauHF2MQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/engine.io/node_modules/cookie": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/engine.io/node_modules/ws": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/enhanced-resolve": {
       "version": "5.10.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
@@ -7932,6 +8323,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/es6-object-assign": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
@@ -9155,6 +9553,41 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "dev": true
     },
+    "node_modules/extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "extract-zip": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "optionalDependencies": {
+        "@types/yauzl": "^2.9.1"
+      }
+    },
+    "node_modules/extract-zip/node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -9250,6 +9683,15 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "dev": true,
+      "dependencies": {
+        "pend": "~1.2.0"
+      }
+    },
     "node_modules/figures": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
@@ -9835,6 +10277,40 @@
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "dev": true
     },
+    "node_modules/global-agent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
+      "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "boolean": "^3.0.1",
+        "es6-error": "^4.1.1",
+        "matcher": "^3.0.0",
+        "roarr": "^2.15.3",
+        "semver": "^7.3.2",
+        "serialize-error": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=10.0"
+      }
+    },
+    "node_modules/global-agent/node_modules/semver": {
+      "version": "7.5.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
+      "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/global-modules": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
@@ -9879,6 +10355,22 @@
         "which": "bin/which"
       }
     },
+    "node_modules/global-tunnel-ng": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz",
+      "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "encodeurl": "^1.0.2",
+        "lodash": "^4.17.10",
+        "npm-conf": "^1.1.3",
+        "tunnel": "^0.0.6"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -9888,6 +10380,22 @@
         "node": ">=4"
       }
     },
+    "node_modules/globalthis": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/globby": {
       "version": "11.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
@@ -9968,6 +10476,28 @@
         "delegate": "^3.1.2"
       }
     },
+    "node_modules/got": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
+      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
+      "dev": true,
+      "dependencies": {
+        "@sindresorhus/is": "^0.14.0",
+        "@szmarczak/http-timer": "^1.1.2",
+        "cacheable-request": "^6.0.0",
+        "decompress-response": "^3.3.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^4.1.0",
+        "lowercase-keys": "^1.0.1",
+        "mimic-response": "^1.0.1",
+        "p-cancelable": "^1.0.0",
+        "to-readable-stream": "^1.0.0",
+        "url-parse-lax": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
     "node_modules/graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -11178,6 +11708,12 @@
         "node": ">=4"
       }
     },
+    "node_modules/json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==",
+      "dev": true
+    },
     "node_modules/json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -11306,6 +11842,15 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/keyv": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
+      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+      "dev": true,
+      "dependencies": {
+        "json-buffer": "3.0.0"
+      }
+    },
     "node_modules/kind-of": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -11930,6 +12475,15 @@
       "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
       "dev": true
     },
+    "node_modules/lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -11943,11 +12497,14 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
+      "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
       "dependencies": {
-        "sourcemap-codec": "^1.4.8"
+        "@jridgewell/sourcemap-codec": "^1.4.13"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/make-dir": {
@@ -12107,6 +12664,32 @@
       "integrity": "sha512-oEacRUVeTJ5D5hW1UYd2qExYI0oELdYK72k1TKGvIeYJIbqQWAz476NAc7LNixSySUhcNl++d02DvX0ccDk9/w==",
       "dev": true
     },
+    "node_modules/matcher": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
+      "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "escape-string-regexp": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/matcher/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/mathml-tag-names": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
@@ -12316,6 +12899,15 @@
         "node": ">=6"
       }
     },
+    "node_modules/mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
@@ -12968,6 +13560,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/npm-conf": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
+      "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "config-chain": "^1.1.11",
+        "pify": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/npm-run-all": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
@@ -13458,6 +14064,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/p-cancelable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
+      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -13707,6 +14322,12 @@
         "node": ">=0.12"
       }
     },
+    "node_modules/pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "dev": true
+    },
     "node_modules/penpal": {
       "version": "6.2.2",
       "resolved": "https://registry.npmjs.org/penpal/-/penpal-6.2.2.tgz",
@@ -14580,6 +15201,15 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/prepend-http": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+      "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/prettier": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
@@ -14798,6 +15428,13 @@
       "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz",
       "integrity": "sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA=="
     },
+    "node_modules/proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -15388,6 +16025,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==",
+      "dev": true,
+      "dependencies": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
     "node_modules/restore-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
@@ -15461,6 +16107,31 @@
         "rlp": "bin/rlp"
       }
     },
+    "node_modules/roarr": {
+      "version": "2.15.4",
+      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
+      "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "boolean": "^3.0.1",
+        "detect-node": "^2.0.4",
+        "globalthis": "^1.0.1",
+        "json-stringify-safe": "^5.0.1",
+        "semver-compare": "^1.0.0",
+        "sprintf-js": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/roarr/node_modules/sprintf-js": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+      "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/run-con": {
       "version": "1.2.11",
       "resolved": "https://registry.npmjs.org/run-con/-/run-con-1.2.11.tgz",
@@ -15707,6 +16378,13 @@
         "semver": "bin/semver.js"
       }
     },
+    "node_modules/semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
+      "dev": true,
+      "optional": true
+    },
     "node_modules/send": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
@@ -15761,6 +16439,35 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
+    "node_modules/serialize-error": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
+      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "type-fest": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/serialize-error/node_modules/type-fest": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/serialize-javascript": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
@@ -16002,6 +16709,81 @@
         "npm": ">= 3.0.0"
       }
     },
+    "node_modules/socket.io": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.2.tgz",
+      "integrity": "sha512-Vp+lSks5k0dewYTfwgPT9UeGGd+ht7sCpB7p0e83VgO4X/AHYWhXITMrNk/pg8syY2bpx23ptClCQuHhqi2BgQ==",
+      "dev": true,
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "base64id": "~2.0.0",
+        "debug": "~4.3.2",
+        "engine.io": "~6.4.2",
+        "socket.io-adapter": "~2.5.2",
+        "socket.io-parser": "~4.2.4"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/socket.io-adapter": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
+      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
+      "dev": true,
+      "dependencies": {
+        "ws": "~8.11.0"
+      }
+    },
+    "node_modules/socket.io-adapter/node_modules/ws": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io-client": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.6.2.tgz",
+      "integrity": "sha512-OwWrMbbA8wSqhBAR0yoPK6EdQLERQAYjXb3A0zLpgxfM1ZGLKoxHx8gVmCHA6pcclRX5oA/zvQf7bghAS11jRA==",
+      "dev": true,
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.2",
+        "engine.io-client": "~6.4.0",
+        "socket.io-parser": "~4.2.4"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/socket.io-parser": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
+      "dev": true,
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/sockjs": {
       "version": "0.3.24",
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
@@ -16054,6 +16836,7 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16076,11 +16859,6 @@
         "source-map": "^0.6.0"
       }
     },
-    "node_modules/sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
-    },
     "node_modules/spdx-correct": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
@@ -16739,6 +17517,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/sumchecker": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
+      "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0"
+      },
+      "engines": {
+        "node": ">= 8.0"
+      }
+    },
     "node_modules/superstruct": {
       "version": "0.16.5",
       "resolved": "https://registry.npmjs.org/superstruct/-/superstruct-0.16.5.tgz",
@@ -17215,6 +18005,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/to-readable-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
+      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -17434,6 +18233,16 @@
         "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
       }
     },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -17637,6 +18446,31 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/url-parse-lax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+      "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==",
+      "dev": true,
+      "dependencies": {
+        "prepend-http": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/utf-8-validate": {
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz",
+      "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==",
+      "devOptional": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "node-gyp-build": "^4.3.0"
+      },
+      "engines": {
+        "node": ">=6.14.2"
+      }
+    },
     "node_modules/utf8": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz",
@@ -17723,15 +18557,15 @@
       }
     },
     "node_modules/vue": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz",
-      "integrity": "sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",
+      "integrity": "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==",
       "dependencies": {
-        "@vue/compiler-dom": "3.2.37",
-        "@vue/compiler-sfc": "3.2.37",
-        "@vue/runtime-dom": "3.2.37",
-        "@vue/server-renderer": "3.2.37",
-        "@vue/shared": "3.2.37"
+        "@vue/compiler-dom": "3.3.4",
+        "@vue/compiler-sfc": "3.3.4",
+        "@vue/runtime-dom": "3.3.4",
+        "@vue/server-renderer": "3.3.4",
+        "@vue/shared": "3.3.4"
       }
     },
     "node_modules/vue-class-component": {
@@ -17973,11 +18807,11 @@
       "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
     },
     "node_modules/vue-router": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.3.tgz",
-      "integrity": "sha512-XvK81bcYglKiayT7/vYAg/f36ExPC4t90R/HIpzrZ5x+17BOWptXLCrEPufGgZeuq68ww4ekSIMBZY1qdUdfjA==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.2.tgz",
+      "integrity": "sha512-cChBPPmAflgBGmy3tBsjeoe3f3VOSG6naKyY5pjtrqLGbNEXdzCigFUHgBvp9e3ysAtFtEx7OLqcSDh/1Cq2TQ==",
       "dependencies": {
-        "@vue/devtools-api": "^6.1.4"
+        "@vue/devtools-api": "^6.5.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/posva"
@@ -18726,6 +19560,15 @@
         }
       }
     },
+    "node_modules/xmlhttprequest-ssl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz",
+      "integrity": "sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -18786,6 +19629,16 @@
         "node": ">=10"
       }
     },
+    "node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dev": true,
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
     "node_modules/yorkie": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/yorkie/-/yorkie-2.0.0.tgz",
@@ -19373,9 +20226,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.21.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
-      "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
+      "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.18.6",
@@ -20203,6 +21056,51 @@
       "dev": true,
       "requires": {}
     },
+    "@electron/get": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.14.1.tgz",
+      "integrity": "sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "env-paths": "^2.2.0",
+        "fs-extra": "^8.1.0",
+        "global-agent": "^3.0.0",
+        "global-tunnel-ng": "^2.7.1",
+        "got": "^9.6.0",
+        "progress": "^2.0.3",
+        "semver": "^6.2.0",
+        "sumchecker": "^3.0.1"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "jsonfile": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+          "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        },
+        "universalify": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+          "dev": true
+        }
+      }
+    },
     "@eslint/eslintrc": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
@@ -20761,8 +21659,7 @@
     "@jridgewell/sourcemap-codec": {
       "version": "1.4.14",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-      "dev": true
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
     },
     "@jridgewell/trace-mapping": {
       "version": "0.3.17",
@@ -21121,6 +22018,18 @@
       "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
       "dev": true
     },
+    "@sindresorhus/is": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
+      "dev": true
+    },
+    "@socket.io/component-emitter": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
+      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
+      "dev": true
+    },
     "@soda/friendly-errors-webpack-plugin": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz",
@@ -21195,6 +22104,15 @@
       "resolved": "https://registry.npmjs.org/@stablelib/base64/-/base64-1.0.1.tgz",
       "integrity": "sha512-1bnPQqSxSuc3Ii6MhBysoWCg58j97aUjuCSZrGSmDxNqtytIi0k8utUenAwTZN4V5mXXYGsVUI9zeBqy+jBOSQ=="
     },
+    "@szmarczak/http-timer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
+      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+      "dev": true,
+      "requires": {
+        "defer-to-connect": "^1.0.1"
+      }
+    },
     "@tootallnate/once": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
@@ -21253,6 +22171,21 @@
         "@types/node": "*"
       }
     },
+    "@types/cookie": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
+      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
+      "dev": true
+    },
+    "@types/cors": {
+      "version": "2.8.13",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
+      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/debug": {
       "version": "4.1.7",
       "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
@@ -21459,6 +22392,16 @@
         "@types/node": "*"
       }
     },
+    "@types/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@typescript-eslint/eslint-plugin": {
       "version": "5.33.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz",
@@ -21979,49 +22922,49 @@
       }
     },
     "@vue/compiler-core": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
-      "integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz",
+      "integrity": "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==",
       "requires": {
-        "@babel/parser": "^7.16.4",
-        "@vue/shared": "3.2.37",
+        "@babel/parser": "^7.21.3",
+        "@vue/shared": "3.3.4",
         "estree-walker": "^2.0.2",
-        "source-map": "^0.6.1"
+        "source-map-js": "^1.0.2"
       }
     },
     "@vue/compiler-dom": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz",
-      "integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz",
+      "integrity": "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==",
       "requires": {
-        "@vue/compiler-core": "3.2.37",
-        "@vue/shared": "3.2.37"
+        "@vue/compiler-core": "3.3.4",
+        "@vue/shared": "3.3.4"
       }
     },
     "@vue/compiler-sfc": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz",
-      "integrity": "sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==",
-      "requires": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.37",
-        "@vue/compiler-dom": "3.2.37",
-        "@vue/compiler-ssr": "3.2.37",
-        "@vue/reactivity-transform": "3.2.37",
-        "@vue/shared": "3.2.37",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz",
+      "integrity": "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==",
+      "requires": {
+        "@babel/parser": "^7.20.15",
+        "@vue/compiler-core": "3.3.4",
+        "@vue/compiler-dom": "3.3.4",
+        "@vue/compiler-ssr": "3.3.4",
+        "@vue/reactivity-transform": "3.3.4",
+        "@vue/shared": "3.3.4",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7",
+        "magic-string": "^0.30.0",
         "postcss": "^8.1.10",
-        "source-map": "^0.6.1"
+        "source-map-js": "^1.0.2"
       }
     },
     "@vue/compiler-ssr": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz",
-      "integrity": "sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz",
+      "integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==",
       "requires": {
-        "@vue/compiler-dom": "3.2.37",
-        "@vue/shared": "3.2.37"
+        "@vue/compiler-dom": "3.3.4",
+        "@vue/shared": "3.3.4"
       }
     },
     "@vue/component-compiler-utils": {
@@ -22081,10 +23024,33 @@
         }
       }
     },
+    "@vue/devtools": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@vue/devtools/-/devtools-6.5.0.tgz",
+      "integrity": "sha512-PlXwf1k5LABNayF71QSfmRL0sRIcBR5HKjrsmGf+raILJ5h32/MRbzA0UpfS/fudCyRgi8F7W5KC1wLRfkTxPQ==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.3",
+        "electron": "^21.0.1",
+        "express": "^4.17.1",
+        "ip": "^1.1.5",
+        "socket.io": "^4.4.0",
+        "socket.io-client": "^4.4.1",
+        "utf-8-validate": "^5.0.9"
+      },
+      "dependencies": {
+        "ip": {
+          "version": "1.1.8",
+          "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
+          "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==",
+          "dev": true
+        }
+      }
+    },
     "@vue/devtools-api": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.2.1.tgz",
-      "integrity": "sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ=="
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.0.tgz",
+      "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q=="
     },
     "@vue/eslint-config-prettier": {
       "version": "7.0.0",
@@ -22106,57 +23072,57 @@
       }
     },
     "@vue/reactivity": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz",
-      "integrity": "sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.4.tgz",
+      "integrity": "sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==",
       "requires": {
-        "@vue/shared": "3.2.37"
+        "@vue/shared": "3.3.4"
       }
     },
     "@vue/reactivity-transform": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz",
-      "integrity": "sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz",
+      "integrity": "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==",
       "requires": {
-        "@babel/parser": "^7.16.4",
-        "@vue/compiler-core": "3.2.37",
-        "@vue/shared": "3.2.37",
+        "@babel/parser": "^7.20.15",
+        "@vue/compiler-core": "3.3.4",
+        "@vue/shared": "3.3.4",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.25.7"
+        "magic-string": "^0.30.0"
       }
     },
     "@vue/runtime-core": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz",
-      "integrity": "sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.4.tgz",
+      "integrity": "sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==",
       "requires": {
-        "@vue/reactivity": "3.2.37",
-        "@vue/shared": "3.2.37"
+        "@vue/reactivity": "3.3.4",
+        "@vue/shared": "3.3.4"
       }
     },
     "@vue/runtime-dom": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz",
-      "integrity": "sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz",
+      "integrity": "sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==",
       "requires": {
-        "@vue/runtime-core": "3.2.37",
-        "@vue/shared": "3.2.37",
-        "csstype": "^2.6.8"
+        "@vue/runtime-core": "3.3.4",
+        "@vue/shared": "3.3.4",
+        "csstype": "^3.1.1"
       }
     },
     "@vue/server-renderer": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.37.tgz",
-      "integrity": "sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.4.tgz",
+      "integrity": "sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==",
       "requires": {
-        "@vue/compiler-ssr": "3.2.37",
-        "@vue/shared": "3.2.37"
+        "@vue/compiler-ssr": "3.3.4",
+        "@vue/shared": "3.3.4"
       }
     },
     "@vue/shared": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
-      "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
+      "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="
     },
     "@vue/vue-loader-v15": {
       "version": "npm:vue-loader@15.10.0",
@@ -22842,6 +23808,12 @@
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
+    "base64id": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
+      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
+      "dev": true
+    },
     "batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
@@ -23034,6 +24006,13 @@
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "dev": true
     },
+    "boolean": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
+      "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
+      "dev": true,
+      "optional": true
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -23168,6 +24147,12 @@
         "ieee754": "^1.2.1"
       }
     },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+      "dev": true
+    },
     "buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -23211,6 +24196,44 @@
         "unique-filename": "^1.1.1"
       }
     },
+    "cacheable-request": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
+      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
+      "dev": true,
+      "requires": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^3.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^4.1.0",
+        "responselike": "^1.0.2"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "lowercase-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+          "dev": true
+        },
+        "normalize-url": {
+          "version": "4.5.1",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
+          "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
+          "dev": true
+        }
+      }
+    },
     "call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -23568,6 +24591,15 @@
         }
       }
     },
+    "clone-response": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
+      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
     "color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -23668,6 +24700,26 @@
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
+    "config-chain": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "ini": "^1.3.4",
+        "proto-list": "~1.2.1"
+      },
+      "dependencies": {
+        "ini": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "connect-history-api-fallback": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
@@ -23789,6 +24841,16 @@
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
       "dev": true
     },
+    "cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "dev": true,
+      "requires": {
+        "object-assign": "^4",
+        "vary": "^1"
+      }
+    },
     "cosmiconfig": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
@@ -24105,9 +25167,9 @@
       }
     },
     "csstype": {
-      "version": "2.6.20",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz",
-      "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA=="
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
+      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
     },
     "dashdash": {
       "version": "1.14.1",
@@ -24160,6 +25222,15 @@
         }
       }
     },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
     "deep-extend": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
@@ -24244,6 +25315,12 @@
         }
       }
     },
+    "defer-to-connect": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
+      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
+      "dev": true
+    },
     "define-lazy-prop": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
@@ -24486,6 +25563,12 @@
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "dev": true
     },
+    "duplexer3": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz",
+      "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==",
+      "dev": true
+    },
     "eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -24533,6 +25616,25 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
+    "electron": {
+      "version": "21.4.4",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-21.4.4.tgz",
+      "integrity": "sha512-N5O7y7Gtt7mDgkJLkW49ETiT8M3myZ9tNIEvGTKhpBduX4WdgMj6c3hYeYBD6XW7SvbRkWEQaTl25RNday8Xpw==",
+      "dev": true,
+      "requires": {
+        "@electron/get": "^1.14.1",
+        "@types/node": "^16.11.26",
+        "extract-zip": "^2.0.1"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "16.18.36",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.36.tgz",
+          "integrity": "sha512-8egDX8dE50XyXWH6C6PRCNkTP106DuUrvdrednFouDSmCi7IOvrqr0frznfZaHifHH/3aq/7a7v9N4wdXMqhBQ==",
+          "dev": true
+        }
+      }
+    },
     "electron-to-chromium": {
       "version": "1.4.224",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.224.tgz",
@@ -24596,6 +25698,67 @@
         "once": "^1.4.0"
       }
     },
+    "engine.io": {
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
+      "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
+      "dev": true,
+      "requires": {
+        "@types/cookie": "^0.4.1",
+        "@types/cors": "^2.8.12",
+        "@types/node": ">=10.0.0",
+        "accepts": "~1.3.4",
+        "base64id": "2.0.0",
+        "cookie": "~0.4.1",
+        "cors": "~2.8.5",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.0.3",
+        "ws": "~8.11.0"
+      },
+      "dependencies": {
+        "cookie": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+          "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+          "dev": true
+        },
+        "ws": {
+          "version": "8.11.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+          "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+          "dev": true,
+          "requires": {}
+        }
+      }
+    },
+    "engine.io-client": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.4.0.tgz",
+      "integrity": "sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g==",
+      "dev": true,
+      "requires": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.0.3",
+        "ws": "~8.11.0",
+        "xmlhttprequest-ssl": "~2.0.0"
+      },
+      "dependencies": {
+        "ws": {
+          "version": "8.11.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+          "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+          "dev": true,
+          "requires": {}
+        }
+      }
+    },
+    "engine.io-parser": {
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.7.tgz",
+      "integrity": "sha512-P+jDFbvK6lE3n1OL+q9KuzdOFWkkZ/cMV9gol/SbVfpyqfvrfrFTOFJ6fQm2VC3PZHlU3QPhVwmbsCnauHF2MQ==",
+      "dev": true
+    },
     "enhanced-resolve": {
       "version": "5.10.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
@@ -24714,6 +25877,13 @@
         "is-symbol": "^1.0.2"
       }
     },
+    "es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+      "dev": true,
+      "optional": true
+    },
     "es6-object-assign": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
@@ -25668,6 +26838,29 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "dev": true
     },
+    "extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "requires": {
+        "@types/yauzl": "^2.9.1",
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        }
+      }
+    },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -25750,6 +26943,15 @@
         "websocket-driver": ">=0.5.1"
       }
     },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "dev": true,
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
     "figures": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
@@ -26169,6 +27371,33 @@
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "dev": true
     },
+    "global-agent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
+      "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "boolean": "^3.0.1",
+        "es6-error": "^4.1.1",
+        "matcher": "^3.0.0",
+        "roarr": "^2.15.3",
+        "semver": "^7.3.2",
+        "serialize-error": "^7.0.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.5.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
+          "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
     "global-modules": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
@@ -26206,12 +27435,35 @@
         }
       }
     },
+    "global-tunnel-ng": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz",
+      "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "encodeurl": "^1.0.2",
+        "lodash": "^4.17.10",
+        "npm-conf": "^1.1.3",
+        "tunnel": "^0.0.6"
+      }
+    },
     "globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true
     },
+    "globalthis": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "define-properties": "^1.1.3"
+      }
+    },
     "globby": {
       "version": "11.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
@@ -26276,6 +27528,25 @@
         "delegate": "^3.1.2"
       }
     },
+    "got": {
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
+      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
+      "dev": true,
+      "requires": {
+        "@sindresorhus/is": "^0.14.0",
+        "@szmarczak/http-timer": "^1.1.2",
+        "cacheable-request": "^6.0.0",
+        "decompress-response": "^3.3.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^4.1.0",
+        "lowercase-keys": "^1.0.1",
+        "mimic-response": "^1.0.1",
+        "p-cancelable": "^1.0.0",
+        "to-readable-stream": "^1.0.0",
+        "url-parse-lax": "^3.0.0"
+      }
+    },
     "graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -27133,6 +28404,12 @@
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true
     },
+    "json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==",
+      "dev": true
+    },
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -27240,6 +28517,15 @@
         "readable-stream": "^3.6.0"
       }
     },
+    "keyv": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
+      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+      "dev": true,
+      "requires": {
+        "json-buffer": "3.0.0"
+      }
+    },
     "kind-of": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -27720,6 +29006,12 @@
         }
       }
     },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+      "dev": true
+    },
     "lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -27730,11 +29022,11 @@
       }
     },
     "magic-string": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
+      "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
       "requires": {
-        "sourcemap-codec": "^1.4.8"
+        "@jridgewell/sourcemap-codec": "^1.4.13"
       }
     },
     "make-dir": {
@@ -27862,6 +29154,25 @@
       "integrity": "sha512-oEacRUVeTJ5D5hW1UYd2qExYI0oELdYK72k1TKGvIeYJIbqQWAz476NAc7LNixSySUhcNl++d02DvX0ccDk9/w==",
       "dev": true
     },
+    "matcher": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
+      "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "escape-string-regexp": "^4.0.0"
+      },
+      "dependencies": {
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "mathml-tag-names": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
@@ -28023,6 +29334,12 @@
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true
     },
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true
+    },
     "min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
@@ -28510,6 +29827,17 @@
       "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
       "dev": true
     },
+    "npm-conf": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
+      "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "config-chain": "^1.1.11",
+        "pify": "^3.0.0"
+      }
+    },
     "npm-run-all": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
@@ -28873,6 +30201,12 @@
         }
       }
     },
+    "p-cancelable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
+      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
+      "dev": true
+    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -29076,6 +30410,12 @@
         "sha.js": "^2.4.8"
       }
     },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "dev": true
+    },
     "penpal": {
       "version": "6.2.2",
       "resolved": "https://registry.npmjs.org/penpal/-/penpal-6.2.2.tgz",
@@ -29614,6 +30954,12 @@
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
+    "prepend-http": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+      "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==",
+      "dev": true
+    },
     "prettier": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
@@ -29777,6 +31123,13 @@
       "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz",
       "integrity": "sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA=="
     },
+    "proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
+      "dev": true,
+      "optional": true
+    },
     "proxy-addr": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -30245,6 +31598,15 @@
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
+    "responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==",
+      "dev": true,
+      "requires": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
     "restore-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
@@ -30299,6 +31661,30 @@
         "bn.js": "^5.2.0"
       }
     },
+    "roarr": {
+      "version": "2.15.4",
+      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
+      "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "boolean": "^3.0.1",
+        "detect-node": "^2.0.4",
+        "globalthis": "^1.0.1",
+        "json-stringify-safe": "^5.0.1",
+        "semver-compare": "^1.0.0",
+        "sprintf-js": "^1.1.2"
+      },
+      "dependencies": {
+        "sprintf-js": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+          "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "run-con": {
       "version": "1.2.11",
       "resolved": "https://registry.npmjs.org/run-con/-/run-con-1.2.11.tgz",
@@ -30476,6 +31862,13 @@
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "dev": true
     },
+    "semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
+      "dev": true,
+      "optional": true
+    },
     "send": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
@@ -30528,6 +31921,25 @@
         }
       }
     },
+    "serialize-error": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
+      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "type-fest": "^0.13.1"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+          "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "serialize-javascript": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
@@ -30724,6 +32136,60 @@
       "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
       "dev": true
     },
+    "socket.io": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.2.tgz",
+      "integrity": "sha512-Vp+lSks5k0dewYTfwgPT9UeGGd+ht7sCpB7p0e83VgO4X/AHYWhXITMrNk/pg8syY2bpx23ptClCQuHhqi2BgQ==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.4",
+        "base64id": "~2.0.0",
+        "debug": "~4.3.2",
+        "engine.io": "~6.4.2",
+        "socket.io-adapter": "~2.5.2",
+        "socket.io-parser": "~4.2.4"
+      }
+    },
+    "socket.io-adapter": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
+      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
+      "dev": true,
+      "requires": {
+        "ws": "~8.11.0"
+      },
+      "dependencies": {
+        "ws": {
+          "version": "8.11.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
+          "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
+          "dev": true,
+          "requires": {}
+        }
+      }
+    },
+    "socket.io-client": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.6.2.tgz",
+      "integrity": "sha512-OwWrMbbA8wSqhBAR0yoPK6EdQLERQAYjXb3A0zLpgxfM1ZGLKoxHx8gVmCHA6pcclRX5oA/zvQf7bghAS11jRA==",
+      "dev": true,
+      "requires": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.2",
+        "engine.io-client": "~6.4.0",
+        "socket.io-parser": "~4.2.4"
+      }
+    },
+    "socket.io-parser": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
+      "dev": true,
+      "requires": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
+      }
+    },
     "sockjs": {
       "version": "0.3.24",
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
@@ -30767,7 +32233,8 @@
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
     },
     "source-map-js": {
       "version": "1.0.2",
@@ -30784,11 +32251,6 @@
         "source-map": "^0.6.0"
       }
     },
-    "sourcemap-codec": {
-      "version": "1.4.8",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
-    },
     "spdx-correct": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
@@ -31285,6 +32747,15 @@
         "postcss-value-parser": "^4.1.0"
       }
     },
+    "sumchecker": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
+      "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.0"
+      }
+    },
     "superstruct": {
       "version": "0.16.5",
       "resolved": "https://registry.npmjs.org/superstruct/-/superstruct-0.16.5.tgz",
@@ -31637,6 +33108,12 @@
       "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
       "dev": true
     },
+    "to-readable-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
+      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
+      "dev": true
+    },
     "to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -31802,6 +33279,13 @@
         "tslib": "^1.8.1"
       }
     },
+    "tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "dev": true,
+      "optional": true
+    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -31946,6 +33430,24 @@
         "punycode": "^2.1.0"
       }
     },
+    "url-parse-lax": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+      "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==",
+      "dev": true,
+      "requires": {
+        "prepend-http": "^2.0.0"
+      }
+    },
+    "utf-8-validate": {
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz",
+      "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==",
+      "devOptional": true,
+      "requires": {
+        "node-gyp-build": "^4.3.0"
+      }
+    },
     "utf8": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz",
@@ -32020,15 +33522,15 @@
       }
     },
     "vue": {
-      "version": "3.2.37",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz",
-      "integrity": "sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",
+      "integrity": "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==",
       "requires": {
-        "@vue/compiler-dom": "3.2.37",
-        "@vue/compiler-sfc": "3.2.37",
-        "@vue/runtime-dom": "3.2.37",
-        "@vue/server-renderer": "3.2.37",
-        "@vue/shared": "3.2.37"
+        "@vue/compiler-dom": "3.3.4",
+        "@vue/compiler-sfc": "3.3.4",
+        "@vue/runtime-dom": "3.3.4",
+        "@vue/server-renderer": "3.3.4",
+        "@vue/shared": "3.3.4"
       }
     },
     "vue-class-component": {
@@ -32205,11 +33707,11 @@
       }
     },
     "vue-router": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.3.tgz",
-      "integrity": "sha512-XvK81bcYglKiayT7/vYAg/f36ExPC4t90R/HIpzrZ5x+17BOWptXLCrEPufGgZeuq68ww4ekSIMBZY1qdUdfjA==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.2.tgz",
+      "integrity": "sha512-cChBPPmAflgBGmy3tBsjeoe3f3VOSG6naKyY5pjtrqLGbNEXdzCigFUHgBvp9e3ysAtFtEx7OLqcSDh/1Cq2TQ==",
       "requires": {
-        "@vue/devtools-api": "^6.1.4"
+        "@vue/devtools-api": "^6.5.0"
       }
     },
     "vue-slider-component": {
@@ -32759,6 +34261,12 @@
       "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
       "requires": {}
     },
+    "xmlhttprequest-ssl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz",
+      "integrity": "sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==",
+      "dev": true
+    },
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -32804,6 +34312,16 @@
       "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true
     },
+    "yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "dev": true,
+      "requires": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    },
     "yorkie": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/yorkie/-/yorkie-2.0.0.tgz",
diff --git a/package.json b/package.json
index e215943f..89bee60c 100644
--- a/package.json
+++ b/package.json
@@ -47,12 +47,12 @@
     "pinia": "^2.0.12",
     "stream-browserify": "^3.0.0",
     "uuid": "^9.0.0",
-    "vue": "^3.2.13",
+    "vue": "^3.3.4",
     "vue-class-component": "^8.0.0-0",
     "vue-gtag": "^2.0.1",
     "vue-json-viewer": "^3.0.4",
     "vue-qrious": "^3.1.0",
-    "vue-router": "^4.0.14",
+    "vue-router": "^4.2.2",
     "vue-slider-component": "^4.1.0-beta.2",
     "vue-toastification": "^2.0.0-rc.5",
     "vue3-popper": "^1.5.0",
@@ -68,6 +68,7 @@
     "@vue/cli-plugin-eslint": "~5.0.0",
     "@vue/cli-plugin-typescript": "~5.0.0",
     "@vue/cli-service": "~5.0.0",
+    "@vue/devtools": "^6.5.0",
     "@vue/eslint-config-prettier": "^7.0.0",
     "@vue/eslint-config-typescript": "^9.1.0",
     "autoprefixer": "^10.4.8",

From 1db95b79cdc37b1c45d6ce6fb22ae06eebac697b Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 14 Jun 2023 15:59:54 +0530
Subject: [PATCH 137/153] Handle duplicate parent connection instance

---
 src/pages/loggedInView.vue | 46 ++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index e7b69f75..07b2db68 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -158,15 +158,17 @@ function connectToParent() {
     appStore,
     getRequestHandler()
   )
-  parentConnection = createParentConnection({
-    isLoggedIn: () => userStore.isLoggedIn,
-    sendRequest,
-    getPublicKey: handleGetPublicKey,
-    triggerLogout: handleLogout,
-    getUserInfo,
-    expandWallet: () => (appStore.expandWallet = true),
-  })
-  parentConnectionStore.setParentConnection(parentConnection)
+  if (!parentConnectionStore.parentConnection) {
+    parentConnection = createParentConnection({
+      isLoggedIn: () => userStore.isLoggedIn,
+      sendRequest,
+      getPublicKey: handleGetPublicKey,
+      triggerLogout: handleLogout,
+      getUserInfo,
+      expandWallet: () => (appStore.expandWallet = true),
+    })
+    parentConnectionStore.setParentConnection(parentConnection)
+  }
 }
 
 async function setTheme() {
@@ -254,17 +256,23 @@ async function getRpcConfig() {
 
 async function getRpcConfigFromParent() {
   try {
-    const parentConnectionInstance = await parentConnection.promise
-    const rpcConfig = await parentConnectionInstance.getRpcConfig()
-    if (rpcConfig) {
-      const chainId = Number(rpcConfig.chainId)
-      const chainToBeSet = enabledChainList.value.find(
-        (chain) => chain.chainId === chainId
-      )
-      if (chainToBeSet) {
-        rpcStore.setSelectedRPCConfig(chainToBeSet)
-        rpcStore.setRpcConfig(chainToBeSet)
+    const parentConnectionInstance = await parentConnectionStore
+      .parentConnection?.promise
+    if (parentConnectionInstance) {
+      const rpcConfig = await parentConnectionInstance.getRpcConfig()
+      console.log({ rpcConfig })
+      if (rpcConfig) {
+        const chainId = Number(rpcConfig.chainId)
+        const chainToBeSet = enabledChainList.value.find(
+          (chain) => chain.chainId === chainId
+        )
+        if (chainToBeSet) {
+          rpcStore.setSelectedRPCConfig(chainToBeSet)
+          rpcStore.setRpcConfig(chainToBeSet)
+        }
       }
+    } else {
+      console.error('parent connection not initialized')
     }
   } catch (err) {
     console.log({ err })

From 5ff6ef7470f5d09af3032967aee22318596a718b Mon Sep 17 00:00:00 2001
From: shaloo <5890484+shaloo@users.noreply.github.com>
Date: Wed, 14 Jun 2023 18:19:04 +0530
Subject: [PATCH 138/153] Fix: #AR-6193 readme update

---
 README.md | 48 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 049f74c0..4551f222 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,30 @@
-# wallet-ui
+<p align="center">
+<a href="#start"><img height="30rem" src="https://raw.githubusercontent.com/arcana-network/branding/main/an_logo_light_temp.png"/></a>
+<h2 align="center"> <a href="https://arcana.network/">Arcana Wallet UI </a></h2>
+</p>
+<br/>
+<p id="banner" align="center">
+<br/>
+<a title="MIT License" href="https://github.com/arcana-network/license/blob/main/LICENSE.md"><img src="https://img.shields.io/badge/license-MIT-blue"/></a>
+<a title="Beta release" href="https://github.com/arcana-network/wallet-ui/releases"><img src="https://img.shields.io/github/v/release/arcana-network/wallet-ui?style=flat-square&color=28A745"/></a>
+<a title="Twitter" href="https://twitter.com/ArcanaNetwork"><img alt="Twitter URL" src="https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Ftwitter.com%2FArcanaNetwork"/></a>
+<a title="CodeCov" href="https://codecov.io/gh/arcana-network/wallet-ui">
+ <img src="https://codecov.io/gh/arcana-network/wallet-ui/branch/dev/graph/badge.svg?token=KmdjEs3enL"/></a>
+</p><p id="start" align="center">
+<a href="https://docs.beta.arcana.network/"><img src="https://raw.githubusercontent.com/arcana-network/branding/main/an_banner_docs.png" alt="Arcana Wallet UI"/></a>
+</p>
 
-Arcana's embedded Web3 wallet implementation.
+# Arcana Wallet UI
 
-This is a Vue app written in TypeScript and styled with Tailwind CSS.
+The Arcana wallet is a non-custodial, embedded Web3 wallet that is instantly available to authenticated users of Web3 apps that use the [Arcana Auth SDK](https://github.com/arcana-network/auth). Web3 app developers must install and integrate the Auth SDK to enable users to sign blockchain transactions. Users do not have to install any software to access the Arcana Wallet UI.
 
-## Installation
+Developers can also choose to disable the Arcana Wallet UI and plug in a custom wallet UI for their apps using the white-labeled Auth feature.
+
+This repo contains Aracna Wallet UI implementation. It is a Vue app written in TypeScript and styled with Tailwind CSS.
+
+**Note:**  Arcana Wallet UI is NOT a standalone wallet. It is part of the Arcana Auth SDK.
+
+## 📋 Installation
 
 Use the Node version listed in the [.nvmrc](./.nvmrc) file.
 
@@ -17,20 +37,24 @@ Use the Node version listed in the [.nvmrc](./.nvmrc) file.
 
 If you are using VS Code, see the recommended [settings](./.vscode/settings.json) and [extensions](./.vscode/extensions.json).
 
-## Usage
+## 📒 Usage
+
+To use Arcana Wallet UI in a Web3 app, follow the instructions [here](https://docs.arcana.network/quick-start/index.html) to register the app with Arcana Network, configure the chains and social login settings and install, and integrate the app with the Arcana Auth SDK.
+
+## 📚 Documentation
 
-To use Arcana's Web3 wallet in an external dapp, follow the instructions for initializing [`@arcana/auth`](https://github.com/arcana-network/auth) SDK.
+Check out [Arcana Auth documentation](https://docs.arcana.network/) and use the [Auth SDK Quick Start Guide](https://docs.arcana.network/quick-start/index.html) to integrate any Web3 app and enable the Arcana Wallet UI. See [Arcana Wallet User Guide](https://docs.arcana.network/user-guides/wallet-ui/index.html) for usage details.
 
-## Support
+## 💡 Support
 
-For any support or integration related queries, contact [Arcana's support team](mailto:support@arcana.network).
+For any support or integration-related queries, contact [Arcana Support Team](mailto:support@arcana.network).
 
-## Contributing Guide
+## 🤝 Contributing
 
-We welcome all contributions to this repository from the community. Read our [contributing guide](https://github.com/arcana-network/license/blob/main/CONTRIBUTING.md) to learn about our development process, how to propose bug fixes and improvements, and the code of conduct that we expect the participants to adhere to.
+We welcome all contributions to the Arcana Auth product and Wallet UI from the community. Read our [contributing guide](https://github.com/arcana-network/license/blob/main/CONTRIBUTING.md) to learn about the our development process, how to propose bug fixes and improvements, and the code of conduct that we expect the participants to adhere to. Refer to the build and test section of this readme for details on how to test and validate your changes to the Wallet UI code before submitting your contributions.
 
-## License
+## ℹ️ License
 
-This public repository of Arcana Network is shared and distributed under the [MIT License](https://fossa.com/blog/open-source-licenses-101-mit-license/).
+Arcana Wallet UI is distributed under the [MIT License](https://fossa.com/blog/open-source-licenses-101-mit-license/).
 
 For details see [Arcana License](https://github.com/arcana-network/license/blob/main/LICENSE.md).

From b6d800c33f6f252b2ad954ff0a91a4d6c851d7b3 Mon Sep 17 00:00:00 2001
From: Shrinath Prabhu <shrinathprabhu.123@gmail.com>
Date: Wed, 14 Jun 2023 21:32:07 +0530
Subject: [PATCH 139/153] Revert "hotfix handle duplicate parent connection"

---
 package-lock.json          | 1888 ++++--------------------------------
 package.json               |    5 +-
 src/pages/loggedInView.vue |   46 +-
 3 files changed, 206 insertions(+), 1733 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d88c4fc2..4ec2063a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "@arcana/auth": "^0.1.3",
-        "@arcana/auth-core": "1.0.0-beta.8",
+        "@arcana/auth-core": "^1.0.0-beta.8",
         "@arcana/key-helper": "^1.0.0-beta.7",
         "@ethereumjs/tx": "^3.4.0",
         "@fontsource/montserrat": "^4.5.14",
@@ -38,12 +38,12 @@
         "pinia": "^2.0.12",
         "stream-browserify": "^3.0.0",
         "uuid": "^9.0.0",
-        "vue": "^3.3.4",
+        "vue": "^3.2.13",
         "vue-class-component": "^8.0.0-0",
         "vue-gtag": "^2.0.1",
         "vue-json-viewer": "^3.0.4",
         "vue-qrious": "^3.1.0",
-        "vue-router": "^4.2.2",
+        "vue-router": "^4.0.14",
         "vue-slider-component": "^4.1.0-beta.2",
         "vue-toastification": "^2.0.0-rc.5",
         "vue3-popper": "^1.5.0",
@@ -59,7 +59,6 @@
         "@vue/cli-plugin-eslint": "~5.0.0",
         "@vue/cli-plugin-typescript": "~5.0.0",
         "@vue/cli-service": "~5.0.0",
-        "@vue/devtools": "^6.5.0",
         "@vue/eslint-config-prettier": "^7.0.0",
         "@vue/eslint-config-typescript": "^9.1.0",
         "autoprefixer": "^10.4.8",
@@ -695,9 +694,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
-      "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==",
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
+      "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1937,60 +1936,6 @@
         "postcss-selector-parser": "^6.0.10"
       }
     },
-    "node_modules/@electron/get": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.14.1.tgz",
-      "integrity": "sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "env-paths": "^2.2.0",
-        "fs-extra": "^8.1.0",
-        "got": "^9.6.0",
-        "progress": "^2.0.3",
-        "semver": "^6.2.0",
-        "sumchecker": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      },
-      "optionalDependencies": {
-        "global-agent": "^3.0.0",
-        "global-tunnel-ng": "^2.7.1"
-      }
-    },
-    "node_modules/@electron/get/node_modules/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=6 <7 || >=8"
-      }
-    },
-    "node_modules/@electron/get/node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-      "dev": true,
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@electron/get/node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
     "node_modules/@eslint/eslintrc": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
@@ -2890,7 +2835,8 @@
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.14",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.17",
@@ -3356,21 +3302,6 @@
       "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
       "dev": true
     },
-    "node_modules/@sindresorhus/is": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@socket.io/component-emitter": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
-      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
-      "dev": true
-    },
     "node_modules/@soda/friendly-errors-webpack-plugin": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz",
@@ -3467,18 +3398,6 @@
       "resolved": "https://registry.npmjs.org/@stablelib/base64/-/base64-1.0.1.tgz",
       "integrity": "sha512-1bnPQqSxSuc3Ii6MhBysoWCg58j97aUjuCSZrGSmDxNqtytIi0k8utUenAwTZN4V5mXXYGsVUI9zeBqy+jBOSQ=="
     },
-    "node_modules/@szmarczak/http-timer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-      "dev": true,
-      "dependencies": {
-        "defer-to-connect": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/@tootallnate/once": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
@@ -3543,21 +3462,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
-      "dev": true
-    },
-    "node_modules/@types/cors": {
-      "version": "2.8.13",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
-      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/debug": {
       "version": "4.1.7",
       "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
@@ -3764,16 +3668,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@typescript-eslint/eslint-plugin": {
       "version": "5.33.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz",
@@ -4533,49 +4427,49 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz",
-      "integrity": "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
+      "integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
       "dependencies": {
-        "@babel/parser": "^7.21.3",
-        "@vue/shared": "3.3.4",
+        "@babel/parser": "^7.16.4",
+        "@vue/shared": "3.2.37",
         "estree-walker": "^2.0.2",
-        "source-map-js": "^1.0.2"
+        "source-map": "^0.6.1"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz",
-      "integrity": "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz",
+      "integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==",
       "dependencies": {
-        "@vue/compiler-core": "3.3.4",
-        "@vue/shared": "3.3.4"
+        "@vue/compiler-core": "3.2.37",
+        "@vue/shared": "3.2.37"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz",
-      "integrity": "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==",
-      "dependencies": {
-        "@babel/parser": "^7.20.15",
-        "@vue/compiler-core": "3.3.4",
-        "@vue/compiler-dom": "3.3.4",
-        "@vue/compiler-ssr": "3.3.4",
-        "@vue/reactivity-transform": "3.3.4",
-        "@vue/shared": "3.3.4",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz",
+      "integrity": "sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==",
+      "dependencies": {
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.37",
+        "@vue/compiler-dom": "3.2.37",
+        "@vue/compiler-ssr": "3.2.37",
+        "@vue/reactivity-transform": "3.2.37",
+        "@vue/shared": "3.2.37",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.0",
+        "magic-string": "^0.25.7",
         "postcss": "^8.1.10",
-        "source-map-js": "^1.0.2"
+        "source-map": "^0.6.1"
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz",
-      "integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz",
+      "integrity": "sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==",
       "dependencies": {
-        "@vue/compiler-dom": "3.3.4",
-        "@vue/shared": "3.3.4"
+        "@vue/compiler-dom": "3.2.37",
+        "@vue/shared": "3.2.37"
       }
     },
     "node_modules/@vue/component-compiler-utils": {
@@ -4642,34 +4536,10 @@
       "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
       "dev": true
     },
-    "node_modules/@vue/devtools": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@vue/devtools/-/devtools-6.5.0.tgz",
-      "integrity": "sha512-PlXwf1k5LABNayF71QSfmRL0sRIcBR5HKjrsmGf+raILJ5h32/MRbzA0UpfS/fudCyRgi8F7W5KC1wLRfkTxPQ==",
-      "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "electron": "^21.0.1",
-        "express": "^4.17.1",
-        "ip": "^1.1.5",
-        "socket.io": "^4.4.0",
-        "socket.io-client": "^4.4.1",
-        "utf-8-validate": "^5.0.9"
-      },
-      "bin": {
-        "vue-devtools": "bin.js"
-      }
-    },
     "node_modules/@vue/devtools-api": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.0.tgz",
-      "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q=="
-    },
-    "node_modules/@vue/devtools/node_modules/ip": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
-      "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==",
-      "dev": true
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.2.1.tgz",
+      "integrity": "sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ=="
     },
     "node_modules/@vue/eslint-config-prettier": {
       "version": "7.0.0",
@@ -4704,60 +4574,60 @@
       }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.4.tgz",
-      "integrity": "sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz",
+      "integrity": "sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==",
       "dependencies": {
-        "@vue/shared": "3.3.4"
+        "@vue/shared": "3.2.37"
       }
     },
     "node_modules/@vue/reactivity-transform": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz",
-      "integrity": "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz",
+      "integrity": "sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==",
       "dependencies": {
-        "@babel/parser": "^7.20.15",
-        "@vue/compiler-core": "3.3.4",
-        "@vue/shared": "3.3.4",
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.37",
+        "@vue/shared": "3.2.37",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.0"
+        "magic-string": "^0.25.7"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.4.tgz",
-      "integrity": "sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz",
+      "integrity": "sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==",
       "dependencies": {
-        "@vue/reactivity": "3.3.4",
-        "@vue/shared": "3.3.4"
+        "@vue/reactivity": "3.2.37",
+        "@vue/shared": "3.2.37"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz",
-      "integrity": "sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz",
+      "integrity": "sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==",
       "dependencies": {
-        "@vue/runtime-core": "3.3.4",
-        "@vue/shared": "3.3.4",
-        "csstype": "^3.1.1"
+        "@vue/runtime-core": "3.2.37",
+        "@vue/shared": "3.2.37",
+        "csstype": "^2.6.8"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.4.tgz",
-      "integrity": "sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.37.tgz",
+      "integrity": "sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==",
       "dependencies": {
-        "@vue/compiler-ssr": "3.3.4",
-        "@vue/shared": "3.3.4"
+        "@vue/compiler-ssr": "3.2.37",
+        "@vue/shared": "3.2.37"
       },
       "peerDependencies": {
-        "vue": "3.3.4"
+        "vue": "3.2.37"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-      "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
+      "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
     },
     "node_modules/@vue/vue-loader-v15": {
       "name": "vue-loader",
@@ -5634,15 +5504,6 @@
         }
       ]
     },
-    "node_modules/base64id": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
-      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
-      "dev": true,
-      "engines": {
-        "node": "^4.5.0 || >= 5.9"
-      }
-    },
     "node_modules/batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
@@ -5871,13 +5732,6 @@
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "dev": true
     },
-    "node_modules/boolean": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
-      "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -6063,15 +5917,6 @@
         "ieee754": "^1.2.1"
       }
     },
-    "node_modules/buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -6121,57 +5966,6 @@
         "node": ">= 10"
       }
     },
-    "node_modules/cacheable-request": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-      "dev": true,
-      "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^3.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^4.1.0",
-        "responselike": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cacheable-request/node_modules/normalize-url": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-      "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -6660,18 +6454,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/clone-response": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-      "dev": true,
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -6785,24 +6567,6 @@
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
-    "node_modules/config-chain": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
-      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "ini": "^1.3.4",
-        "proto-list": "~1.2.1"
-      }
-    },
-    "node_modules/config-chain/node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/connect-history-api-fallback": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
@@ -6976,19 +6740,6 @@
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
       "dev": true
     },
-    "node_modules/cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
-      "dev": true,
-      "dependencies": {
-        "object-assign": "^4",
-        "vary": "^1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/cosmiconfig": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
@@ -7428,9 +7179,9 @@
       }
     },
     "node_modules/csstype": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
+      "version": "2.6.20",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz",
+      "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA=="
     },
     "node_modules/dashdash": {
       "version": "1.14.1",
@@ -7501,18 +7252,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==",
-      "dev": true,
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/deep-extend": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
@@ -7626,12 +7365,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/defer-to-connect": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
-      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
-      "dev": true
-    },
     "node_modules/define-lazy-prop": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
@@ -7932,12 +7665,6 @@
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "dev": true
     },
-    "node_modules/duplexer3": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz",
-      "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==",
-      "dev": true
-    },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -7995,36 +7722,12 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
-    "node_modules/electron": {
-      "version": "21.4.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-21.4.4.tgz",
-      "integrity": "sha512-N5O7y7Gtt7mDgkJLkW49ETiT8M3myZ9tNIEvGTKhpBduX4WdgMj6c3hYeYBD6XW7SvbRkWEQaTl25RNday8Xpw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "@electron/get": "^1.14.1",
-        "@types/node": "^16.11.26",
-        "extract-zip": "^2.0.1"
-      },
-      "bin": {
-        "electron": "cli.js"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      }
-    },
     "node_modules/electron-to-chromium": {
       "version": "1.4.224",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.224.tgz",
       "integrity": "sha512-dOujC5Yzj0nOVE23iD5HKqrRSDj2SD7RazpZS/b/WX85MtO6/LzKDF4TlYZTBteB+7fvSg5JpWh0sN7fImNF8w==",
       "dev": true
     },
-    "node_modules/electron/node_modules/@types/node": {
-      "version": "16.18.36",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.36.tgz",
-      "integrity": "sha512-8egDX8dE50XyXWH6C6PRCNkTP106DuUrvdrednFouDSmCi7IOvrqr0frznfZaHifHH/3aq/7a7v9N4wdXMqhBQ==",
-      "dev": true
-    },
     "node_modules/elliptic": {
       "version": "6.5.4",
       "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
@@ -8086,100 +7789,6 @@
         "once": "^1.4.0"
       }
     },
-    "node_modules/engine.io": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
-      "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
-      "dev": true,
-      "dependencies": {
-        "@types/cookie": "^0.4.1",
-        "@types/cors": "^2.8.12",
-        "@types/node": ">=10.0.0",
-        "accepts": "~1.3.4",
-        "base64id": "2.0.0",
-        "cookie": "~0.4.1",
-        "cors": "~2.8.5",
-        "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.3",
-        "ws": "~8.11.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/engine.io-client": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.4.0.tgz",
-      "integrity": "sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g==",
-      "dev": true,
-      "dependencies": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.3",
-        "ws": "~8.11.0",
-        "xmlhttprequest-ssl": "~2.0.0"
-      }
-    },
-    "node_modules/engine.io-client/node_modules/ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/engine.io-parser": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.7.tgz",
-      "integrity": "sha512-P+jDFbvK6lE3n1OL+q9KuzdOFWkkZ/cMV9gol/SbVfpyqfvrfrFTOFJ6fQm2VC3PZHlU3QPhVwmbsCnauHF2MQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/engine.io/node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/engine.io/node_modules/ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/enhanced-resolve": {
       "version": "5.10.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
@@ -8323,13 +7932,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/es6-object-assign": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
@@ -9553,41 +9155,6 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "dev": true
     },
-    "node_modules/extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      },
-      "bin": {
-        "extract-zip": "cli.js"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      },
-      "optionalDependencies": {
-        "@types/yauzl": "^2.9.1"
-      }
-    },
-    "node_modules/extract-zip/node_modules/get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-      "dev": true,
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -9683,15 +9250,6 @@
         "node": ">=0.8.0"
       }
     },
-    "node_modules/fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-      "dev": true,
-      "dependencies": {
-        "pend": "~1.2.0"
-      }
-    },
     "node_modules/figures": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
@@ -10277,40 +9835,6 @@
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "dev": true
     },
-    "node_modules/global-agent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
-      "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "boolean": "^3.0.1",
-        "es6-error": "^4.1.1",
-        "matcher": "^3.0.0",
-        "roarr": "^2.15.3",
-        "semver": "^7.3.2",
-        "serialize-error": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=10.0"
-      }
-    },
-    "node_modules/global-agent/node_modules/semver": {
-      "version": "7.5.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
-      "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/global-modules": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
@@ -10355,22 +9879,6 @@
         "which": "bin/which"
       }
     },
-    "node_modules/global-tunnel-ng": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz",
-      "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "encodeurl": "^1.0.2",
-        "lodash": "^4.17.10",
-        "npm-conf": "^1.1.3",
-        "tunnel": "^0.0.6"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -10380,22 +9888,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/globby": {
       "version": "11.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
@@ -10476,28 +9968,6 @@
         "delegate": "^3.1.2"
       }
     },
-    "node_modules/got": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-      "dev": true,
-      "dependencies": {
-        "@sindresorhus/is": "^0.14.0",
-        "@szmarczak/http-timer": "^1.1.2",
-        "cacheable-request": "^6.0.0",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^4.1.0",
-        "lowercase-keys": "^1.0.1",
-        "mimic-response": "^1.0.1",
-        "p-cancelable": "^1.0.0",
-        "to-readable-stream": "^1.0.0",
-        "url-parse-lax": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
     "node_modules/graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -11708,12 +11178,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==",
-      "dev": true
-    },
     "node_modules/json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -11842,15 +11306,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/keyv": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
-      "dev": true,
-      "dependencies": {
-        "json-buffer": "3.0.0"
-      }
-    },
     "node_modules/kind-of": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -12475,15 +11930,6 @@
       "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
       "dev": true
     },
-    "node_modules/lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -12497,14 +11943,11 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
-      "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
+      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.13"
-      },
-      "engines": {
-        "node": ">=12"
+        "sourcemap-codec": "^1.4.8"
       }
     },
     "node_modules/make-dir": {
@@ -12664,32 +12107,6 @@
       "integrity": "sha512-oEacRUVeTJ5D5hW1UYd2qExYI0oELdYK72k1TKGvIeYJIbqQWAz476NAc7LNixSySUhcNl++d02DvX0ccDk9/w==",
       "dev": true
     },
-    "node_modules/matcher": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
-      "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "escape-string-regexp": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/matcher/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/mathml-tag-names": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
@@ -12899,15 +12316,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
@@ -13560,20 +12968,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/npm-conf": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
-      "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "config-chain": "^1.1.11",
-        "pify": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/npm-run-all": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
@@ -14064,15 +13458,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/p-cancelable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -14322,12 +13707,6 @@
         "node": ">=0.12"
       }
     },
-    "node_modules/pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-      "dev": true
-    },
     "node_modules/penpal": {
       "version": "6.2.2",
       "resolved": "https://registry.npmjs.org/penpal/-/penpal-6.2.2.tgz",
@@ -15201,15 +14580,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/prepend-http": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-      "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/prettier": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
@@ -15428,13 +14798,6 @@
       "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz",
       "integrity": "sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA=="
     },
-    "node_modules/proto-list": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
-      "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -16025,15 +15388,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==",
-      "dev": true,
-      "dependencies": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
     "node_modules/restore-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
@@ -16107,31 +15461,6 @@
         "rlp": "bin/rlp"
       }
     },
-    "node_modules/roarr": {
-      "version": "2.15.4",
-      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
-      "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "boolean": "^3.0.1",
-        "detect-node": "^2.0.4",
-        "globalthis": "^1.0.1",
-        "json-stringify-safe": "^5.0.1",
-        "semver-compare": "^1.0.0",
-        "sprintf-js": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/roarr/node_modules/sprintf-js": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-      "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/run-con": {
       "version": "1.2.11",
       "resolved": "https://registry.npmjs.org/run-con/-/run-con-1.2.11.tgz",
@@ -16378,13 +15707,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/semver-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
-      "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/send": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
@@ -16439,35 +15761,6 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
-    "node_modules/serialize-error": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
-      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "type-fest": "^0.13.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/serialize-error/node_modules/type-fest": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
-      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/serialize-javascript": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
@@ -16709,81 +16002,6 @@
         "npm": ">= 3.0.0"
       }
     },
-    "node_modules/socket.io": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.2.tgz",
-      "integrity": "sha512-Vp+lSks5k0dewYTfwgPT9UeGGd+ht7sCpB7p0e83VgO4X/AHYWhXITMrNk/pg8syY2bpx23ptClCQuHhqi2BgQ==",
-      "dev": true,
-      "dependencies": {
-        "accepts": "~1.3.4",
-        "base64id": "~2.0.0",
-        "debug": "~4.3.2",
-        "engine.io": "~6.4.2",
-        "socket.io-adapter": "~2.5.2",
-        "socket.io-parser": "~4.2.4"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/socket.io-adapter": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
-      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
-      "dev": true,
-      "dependencies": {
-        "ws": "~8.11.0"
-      }
-    },
-    "node_modules/socket.io-adapter/node_modules/ws": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-      "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/socket.io-client": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.6.2.tgz",
-      "integrity": "sha512-OwWrMbbA8wSqhBAR0yoPK6EdQLERQAYjXb3A0zLpgxfM1ZGLKoxHx8gVmCHA6pcclRX5oA/zvQf7bghAS11jRA==",
-      "dev": true,
-      "dependencies": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.2",
-        "engine.io-client": "~6.4.0",
-        "socket.io-parser": "~4.2.4"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/socket.io-parser": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
-      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
-      "dev": true,
-      "dependencies": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
     "node_modules/sockjs": {
       "version": "0.3.24",
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
@@ -16836,7 +16054,6 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16859,6 +16076,11 @@
         "source-map": "^0.6.0"
       }
     },
+    "node_modules/sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
+    },
     "node_modules/spdx-correct": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
@@ -17517,18 +16739,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/sumchecker": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
-      "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^4.1.0"
-      },
-      "engines": {
-        "node": ">= 8.0"
-      }
-    },
     "node_modules/superstruct": {
       "version": "0.16.5",
       "resolved": "https://registry.npmjs.org/superstruct/-/superstruct-0.16.5.tgz",
@@ -18005,15 +17215,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/to-readable-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -18233,16 +17434,6 @@
         "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
       }
     },
-    "node_modules/tunnel": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
-      }
-    },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -18446,31 +17637,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/url-parse-lax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-      "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==",
-      "dev": true,
-      "dependencies": {
-        "prepend-http": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/utf-8-validate": {
-      "version": "5.0.10",
-      "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz",
-      "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==",
-      "devOptional": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "node-gyp-build": "^4.3.0"
-      },
-      "engines": {
-        "node": ">=6.14.2"
-      }
-    },
     "node_modules/utf8": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz",
@@ -18557,15 +17723,15 @@
       }
     },
     "node_modules/vue": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",
-      "integrity": "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz",
+      "integrity": "sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==",
       "dependencies": {
-        "@vue/compiler-dom": "3.3.4",
-        "@vue/compiler-sfc": "3.3.4",
-        "@vue/runtime-dom": "3.3.4",
-        "@vue/server-renderer": "3.3.4",
-        "@vue/shared": "3.3.4"
+        "@vue/compiler-dom": "3.2.37",
+        "@vue/compiler-sfc": "3.2.37",
+        "@vue/runtime-dom": "3.2.37",
+        "@vue/server-renderer": "3.2.37",
+        "@vue/shared": "3.2.37"
       }
     },
     "node_modules/vue-class-component": {
@@ -18807,11 +17973,11 @@
       "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
     },
     "node_modules/vue-router": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.2.tgz",
-      "integrity": "sha512-cChBPPmAflgBGmy3tBsjeoe3f3VOSG6naKyY5pjtrqLGbNEXdzCigFUHgBvp9e3ysAtFtEx7OLqcSDh/1Cq2TQ==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.3.tgz",
+      "integrity": "sha512-XvK81bcYglKiayT7/vYAg/f36ExPC4t90R/HIpzrZ5x+17BOWptXLCrEPufGgZeuq68ww4ekSIMBZY1qdUdfjA==",
       "dependencies": {
-        "@vue/devtools-api": "^6.5.0"
+        "@vue/devtools-api": "^6.1.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/posva"
@@ -19560,15 +18726,6 @@
         }
       }
     },
-    "node_modules/xmlhttprequest-ssl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz",
-      "integrity": "sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -19629,16 +18786,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-      "dev": true,
-      "dependencies": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
     "node_modules/yorkie": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/yorkie/-/yorkie-2.0.0.tgz",
@@ -20226,9 +19373,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz",
-      "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q=="
+      "version": "7.21.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
+      "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.18.6",
@@ -21056,51 +20203,6 @@
       "dev": true,
       "requires": {}
     },
-    "@electron/get": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.14.1.tgz",
-      "integrity": "sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "env-paths": "^2.2.0",
-        "fs-extra": "^8.1.0",
-        "global-agent": "^3.0.0",
-        "global-tunnel-ng": "^2.7.1",
-        "got": "^9.6.0",
-        "progress": "^2.0.3",
-        "semver": "^6.2.0",
-        "sumchecker": "^3.0.1"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
-        "universalify": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-          "dev": true
-        }
-      }
-    },
     "@eslint/eslintrc": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
@@ -21659,7 +20761,8 @@
     "@jridgewell/sourcemap-codec": {
       "version": "1.4.14",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "dev": true
     },
     "@jridgewell/trace-mapping": {
       "version": "0.3.17",
@@ -22018,18 +21121,6 @@
       "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
       "dev": true
     },
-    "@sindresorhus/is": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
-      "dev": true
-    },
-    "@socket.io/component-emitter": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
-      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==",
-      "dev": true
-    },
     "@soda/friendly-errors-webpack-plugin": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz",
@@ -22104,15 +21195,6 @@
       "resolved": "https://registry.npmjs.org/@stablelib/base64/-/base64-1.0.1.tgz",
       "integrity": "sha512-1bnPQqSxSuc3Ii6MhBysoWCg58j97aUjuCSZrGSmDxNqtytIi0k8utUenAwTZN4V5mXXYGsVUI9zeBqy+jBOSQ=="
     },
-    "@szmarczak/http-timer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-      "dev": true,
-      "requires": {
-        "defer-to-connect": "^1.0.1"
-      }
-    },
     "@tootallnate/once": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
@@ -22171,21 +21253,6 @@
         "@types/node": "*"
       }
     },
-    "@types/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
-      "dev": true
-    },
-    "@types/cors": {
-      "version": "2.8.13",
-      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz",
-      "integrity": "sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@types/debug": {
       "version": "4.1.7",
       "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
@@ -22392,16 +21459,6 @@
         "@types/node": "*"
       }
     },
-    "@types/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@typescript-eslint/eslint-plugin": {
       "version": "5.33.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz",
@@ -22922,49 +21979,49 @@
       }
     },
     "@vue/compiler-core": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz",
-      "integrity": "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz",
+      "integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==",
       "requires": {
-        "@babel/parser": "^7.21.3",
-        "@vue/shared": "3.3.4",
+        "@babel/parser": "^7.16.4",
+        "@vue/shared": "3.2.37",
         "estree-walker": "^2.0.2",
-        "source-map-js": "^1.0.2"
+        "source-map": "^0.6.1"
       }
     },
     "@vue/compiler-dom": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz",
-      "integrity": "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz",
+      "integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==",
       "requires": {
-        "@vue/compiler-core": "3.3.4",
-        "@vue/shared": "3.3.4"
+        "@vue/compiler-core": "3.2.37",
+        "@vue/shared": "3.2.37"
       }
     },
     "@vue/compiler-sfc": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz",
-      "integrity": "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==",
-      "requires": {
-        "@babel/parser": "^7.20.15",
-        "@vue/compiler-core": "3.3.4",
-        "@vue/compiler-dom": "3.3.4",
-        "@vue/compiler-ssr": "3.3.4",
-        "@vue/reactivity-transform": "3.3.4",
-        "@vue/shared": "3.3.4",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz",
+      "integrity": "sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==",
+      "requires": {
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.37",
+        "@vue/compiler-dom": "3.2.37",
+        "@vue/compiler-ssr": "3.2.37",
+        "@vue/reactivity-transform": "3.2.37",
+        "@vue/shared": "3.2.37",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.0",
+        "magic-string": "^0.25.7",
         "postcss": "^8.1.10",
-        "source-map-js": "^1.0.2"
+        "source-map": "^0.6.1"
       }
     },
     "@vue/compiler-ssr": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz",
-      "integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz",
+      "integrity": "sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==",
       "requires": {
-        "@vue/compiler-dom": "3.3.4",
-        "@vue/shared": "3.3.4"
+        "@vue/compiler-dom": "3.2.37",
+        "@vue/shared": "3.2.37"
       }
     },
     "@vue/component-compiler-utils": {
@@ -23024,33 +22081,10 @@
         }
       }
     },
-    "@vue/devtools": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@vue/devtools/-/devtools-6.5.0.tgz",
-      "integrity": "sha512-PlXwf1k5LABNayF71QSfmRL0sRIcBR5HKjrsmGf+raILJ5h32/MRbzA0UpfS/fudCyRgi8F7W5KC1wLRfkTxPQ==",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "^7.0.3",
-        "electron": "^21.0.1",
-        "express": "^4.17.1",
-        "ip": "^1.1.5",
-        "socket.io": "^4.4.0",
-        "socket.io-client": "^4.4.1",
-        "utf-8-validate": "^5.0.9"
-      },
-      "dependencies": {
-        "ip": {
-          "version": "1.1.8",
-          "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
-          "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==",
-          "dev": true
-        }
-      }
-    },
     "@vue/devtools-api": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.0.tgz",
-      "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q=="
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.2.1.tgz",
+      "integrity": "sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ=="
     },
     "@vue/eslint-config-prettier": {
       "version": "7.0.0",
@@ -23072,57 +22106,57 @@
       }
     },
     "@vue/reactivity": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.4.tgz",
-      "integrity": "sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz",
+      "integrity": "sha512-/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A==",
       "requires": {
-        "@vue/shared": "3.3.4"
+        "@vue/shared": "3.2.37"
       }
     },
     "@vue/reactivity-transform": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz",
-      "integrity": "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz",
+      "integrity": "sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==",
       "requires": {
-        "@babel/parser": "^7.20.15",
-        "@vue/compiler-core": "3.3.4",
-        "@vue/shared": "3.3.4",
+        "@babel/parser": "^7.16.4",
+        "@vue/compiler-core": "3.2.37",
+        "@vue/shared": "3.2.37",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.0"
+        "magic-string": "^0.25.7"
       }
     },
     "@vue/runtime-core": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.4.tgz",
-      "integrity": "sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz",
+      "integrity": "sha512-JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ==",
       "requires": {
-        "@vue/reactivity": "3.3.4",
-        "@vue/shared": "3.3.4"
+        "@vue/reactivity": "3.2.37",
+        "@vue/shared": "3.2.37"
       }
     },
     "@vue/runtime-dom": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz",
-      "integrity": "sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.37.tgz",
+      "integrity": "sha512-HimKdh9BepShW6YozwRKAYjYQWg9mQn63RGEiSswMbW+ssIht1MILYlVGkAGGQbkhSh31PCdoUcfiu4apXJoPw==",
       "requires": {
-        "@vue/runtime-core": "3.3.4",
-        "@vue/shared": "3.3.4",
-        "csstype": "^3.1.1"
+        "@vue/runtime-core": "3.2.37",
+        "@vue/shared": "3.2.37",
+        "csstype": "^2.6.8"
       }
     },
     "@vue/server-renderer": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.4.tgz",
-      "integrity": "sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.37.tgz",
+      "integrity": "sha512-kLITEJvaYgZQ2h47hIzPh2K3jG8c1zCVbp/o/bzQOyvzaKiCquKS7AaioPI28GNxIsE/zSx+EwWYsNxDCX95MA==",
       "requires": {
-        "@vue/compiler-ssr": "3.3.4",
-        "@vue/shared": "3.3.4"
+        "@vue/compiler-ssr": "3.2.37",
+        "@vue/shared": "3.2.37"
       }
     },
     "@vue/shared": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
-      "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz",
+      "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="
     },
     "@vue/vue-loader-v15": {
       "version": "npm:vue-loader@15.10.0",
@@ -23808,12 +22842,6 @@
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
-    "base64id": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
-      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
-      "dev": true
-    },
     "batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
@@ -24006,13 +23034,6 @@
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "dev": true
     },
-    "boolean": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
-      "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
-      "dev": true,
-      "optional": true
-    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -24147,12 +23168,6 @@
         "ieee754": "^1.2.1"
       }
     },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-      "dev": true
-    },
     "buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -24196,44 +23211,6 @@
         "unique-filename": "^1.1.1"
       }
     },
-    "cacheable-request": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-      "dev": true,
-      "requires": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^3.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^4.1.0",
-        "responselike": "^1.0.2"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "lowercase-keys": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-          "dev": true
-        },
-        "normalize-url": {
-          "version": "4.5.1",
-          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
-          "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==",
-          "dev": true
-        }
-      }
-    },
     "call-bind": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
@@ -24591,15 +23568,6 @@
         }
       }
     },
-    "clone-response": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-      "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-      "dev": true,
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
     "color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -24700,26 +23668,6 @@
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true
     },
-    "config-chain": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
-      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "ini": "^1.3.4",
-        "proto-list": "~1.2.1"
-      },
-      "dependencies": {
-        "ini": {
-          "version": "1.3.8",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-          "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "connect-history-api-fallback": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
@@ -24841,16 +23789,6 @@
       "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
       "dev": true
     },
-    "cors": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
-      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
-      "dev": true,
-      "requires": {
-        "object-assign": "^4",
-        "vary": "^1"
-      }
-    },
     "cosmiconfig": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
@@ -25167,9 +24105,9 @@
       }
     },
     "csstype": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
+      "version": "2.6.20",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz",
+      "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA=="
     },
     "dashdash": {
       "version": "1.14.1",
@@ -25222,15 +24160,6 @@
         }
       }
     },
-    "decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==",
-      "dev": true,
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
     "deep-extend": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
@@ -25315,12 +24244,6 @@
         }
       }
     },
-    "defer-to-connect": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
-      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
-      "dev": true
-    },
     "define-lazy-prop": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
@@ -25563,12 +24486,6 @@
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "dev": true
     },
-    "duplexer3": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz",
-      "integrity": "sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==",
-      "dev": true
-    },
     "eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@@ -25616,25 +24533,6 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
-    "electron": {
-      "version": "21.4.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-21.4.4.tgz",
-      "integrity": "sha512-N5O7y7Gtt7mDgkJLkW49ETiT8M3myZ9tNIEvGTKhpBduX4WdgMj6c3hYeYBD6XW7SvbRkWEQaTl25RNday8Xpw==",
-      "dev": true,
-      "requires": {
-        "@electron/get": "^1.14.1",
-        "@types/node": "^16.11.26",
-        "extract-zip": "^2.0.1"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "16.18.36",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.36.tgz",
-          "integrity": "sha512-8egDX8dE50XyXWH6C6PRCNkTP106DuUrvdrednFouDSmCi7IOvrqr0frznfZaHifHH/3aq/7a7v9N4wdXMqhBQ==",
-          "dev": true
-        }
-      }
-    },
     "electron-to-chromium": {
       "version": "1.4.224",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.224.tgz",
@@ -25698,67 +24596,6 @@
         "once": "^1.4.0"
       }
     },
-    "engine.io": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
-      "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
-      "dev": true,
-      "requires": {
-        "@types/cookie": "^0.4.1",
-        "@types/cors": "^2.8.12",
-        "@types/node": ">=10.0.0",
-        "accepts": "~1.3.4",
-        "base64id": "2.0.0",
-        "cookie": "~0.4.1",
-        "cors": "~2.8.5",
-        "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.3",
-        "ws": "~8.11.0"
-      },
-      "dependencies": {
-        "cookie": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-          "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
-          "dev": true
-        },
-        "ws": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-          "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-          "dev": true,
-          "requires": {}
-        }
-      }
-    },
-    "engine.io-client": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.4.0.tgz",
-      "integrity": "sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g==",
-      "dev": true,
-      "requires": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.1",
-        "engine.io-parser": "~5.0.3",
-        "ws": "~8.11.0",
-        "xmlhttprequest-ssl": "~2.0.0"
-      },
-      "dependencies": {
-        "ws": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-          "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-          "dev": true,
-          "requires": {}
-        }
-      }
-    },
-    "engine.io-parser": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.7.tgz",
-      "integrity": "sha512-P+jDFbvK6lE3n1OL+q9KuzdOFWkkZ/cMV9gol/SbVfpyqfvrfrFTOFJ6fQm2VC3PZHlU3QPhVwmbsCnauHF2MQ==",
-      "dev": true
-    },
     "enhanced-resolve": {
       "version": "5.10.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
@@ -25877,13 +24714,6 @@
         "is-symbol": "^1.0.2"
       }
     },
-    "es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "dev": true,
-      "optional": true
-    },
     "es6-object-assign": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
@@ -26838,29 +25668,6 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
       "dev": true
     },
-    "extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "dev": true,
-      "requires": {
-        "@types/yauzl": "^2.9.1",
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        }
-      }
-    },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -26943,15 +25750,6 @@
         "websocket-driver": ">=0.5.1"
       }
     },
-    "fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-      "dev": true,
-      "requires": {
-        "pend": "~1.2.0"
-      }
-    },
     "figures": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
@@ -27371,33 +26169,6 @@
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "dev": true
     },
-    "global-agent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
-      "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "boolean": "^3.0.1",
-        "es6-error": "^4.1.1",
-        "matcher": "^3.0.0",
-        "roarr": "^2.15.3",
-        "semver": "^7.3.2",
-        "serialize-error": "^7.0.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.5.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
-          "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
     "global-modules": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
@@ -27435,35 +26206,12 @@
         }
       }
     },
-    "global-tunnel-ng": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz",
-      "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "encodeurl": "^1.0.2",
-        "lodash": "^4.17.10",
-        "npm-conf": "^1.1.3",
-        "tunnel": "^0.0.6"
-      }
-    },
     "globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true
     },
-    "globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "define-properties": "^1.1.3"
-      }
-    },
     "globby": {
       "version": "11.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
@@ -27528,25 +26276,6 @@
         "delegate": "^3.1.2"
       }
     },
-    "got": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-      "dev": true,
-      "requires": {
-        "@sindresorhus/is": "^0.14.0",
-        "@szmarczak/http-timer": "^1.1.2",
-        "cacheable-request": "^6.0.0",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^4.1.0",
-        "lowercase-keys": "^1.0.1",
-        "mimic-response": "^1.0.1",
-        "p-cancelable": "^1.0.0",
-        "to-readable-stream": "^1.0.0",
-        "url-parse-lax": "^3.0.0"
-      }
-    },
     "graceful-fs": {
       "version": "4.2.10",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
@@ -28404,12 +27133,6 @@
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true
     },
-    "json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==",
-      "dev": true
-    },
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -28517,15 +27240,6 @@
         "readable-stream": "^3.6.0"
       }
     },
-    "keyv": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
-      "dev": true,
-      "requires": {
-        "json-buffer": "3.0.0"
-      }
-    },
     "kind-of": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -29006,12 +27720,6 @@
         }
       }
     },
-    "lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "dev": true
-    },
     "lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -29022,11 +27730,11 @@
       }
     },
     "magic-string": {
-      "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
-      "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
+      "version": "0.25.9",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
+      "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
       "requires": {
-        "@jridgewell/sourcemap-codec": "^1.4.13"
+        "sourcemap-codec": "^1.4.8"
       }
     },
     "make-dir": {
@@ -29154,25 +27862,6 @@
       "integrity": "sha512-oEacRUVeTJ5D5hW1UYd2qExYI0oELdYK72k1TKGvIeYJIbqQWAz476NAc7LNixSySUhcNl++d02DvX0ccDk9/w==",
       "dev": true
     },
-    "matcher": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
-      "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "escape-string-regexp": "^4.0.0"
-      },
-      "dependencies": {
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "mathml-tag-names": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
@@ -29334,12 +28023,6 @@
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true
     },
-    "mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "dev": true
-    },
     "min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
@@ -29827,17 +28510,6 @@
       "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
       "dev": true
     },
-    "npm-conf": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
-      "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "config-chain": "^1.1.11",
-        "pify": "^3.0.0"
-      }
-    },
     "npm-run-all": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
@@ -30201,12 +28873,6 @@
         }
       }
     },
-    "p-cancelable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
-      "dev": true
-    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -30410,12 +29076,6 @@
         "sha.js": "^2.4.8"
       }
     },
-    "pend": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-      "dev": true
-    },
     "penpal": {
       "version": "6.2.2",
       "resolved": "https://registry.npmjs.org/penpal/-/penpal-6.2.2.tgz",
@@ -30954,12 +29614,6 @@
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
-    "prepend-http": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-      "integrity": "sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==",
-      "dev": true
-    },
     "prettier": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
@@ -31123,13 +29777,6 @@
       "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz",
       "integrity": "sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA=="
     },
-    "proto-list": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
-      "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
-      "dev": true,
-      "optional": true
-    },
     "proxy-addr": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -31598,15 +30245,6 @@
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
-    "responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==",
-      "dev": true,
-      "requires": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
     "restore-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
@@ -31661,30 +30299,6 @@
         "bn.js": "^5.2.0"
       }
     },
-    "roarr": {
-      "version": "2.15.4",
-      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
-      "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "boolean": "^3.0.1",
-        "detect-node": "^2.0.4",
-        "globalthis": "^1.0.1",
-        "json-stringify-safe": "^5.0.1",
-        "semver-compare": "^1.0.0",
-        "sprintf-js": "^1.1.2"
-      },
-      "dependencies": {
-        "sprintf-js": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-          "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "run-con": {
       "version": "1.2.11",
       "resolved": "https://registry.npmjs.org/run-con/-/run-con-1.2.11.tgz",
@@ -31862,13 +30476,6 @@
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "dev": true
     },
-    "semver-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
-      "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
-      "dev": true,
-      "optional": true
-    },
     "send": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
@@ -31921,25 +30528,6 @@
         }
       }
     },
-    "serialize-error": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
-      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "type-fest": "^0.13.1"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.13.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
-          "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "serialize-javascript": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
@@ -32136,60 +30724,6 @@
       "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
       "dev": true
     },
-    "socket.io": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.6.2.tgz",
-      "integrity": "sha512-Vp+lSks5k0dewYTfwgPT9UeGGd+ht7sCpB7p0e83VgO4X/AHYWhXITMrNk/pg8syY2bpx23ptClCQuHhqi2BgQ==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.4",
-        "base64id": "~2.0.0",
-        "debug": "~4.3.2",
-        "engine.io": "~6.4.2",
-        "socket.io-adapter": "~2.5.2",
-        "socket.io-parser": "~4.2.4"
-      }
-    },
-    "socket.io-adapter": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz",
-      "integrity": "sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==",
-      "dev": true,
-      "requires": {
-        "ws": "~8.11.0"
-      },
-      "dependencies": {
-        "ws": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
-          "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-          "dev": true,
-          "requires": {}
-        }
-      }
-    },
-    "socket.io-client": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.6.2.tgz",
-      "integrity": "sha512-OwWrMbbA8wSqhBAR0yoPK6EdQLERQAYjXb3A0zLpgxfM1ZGLKoxHx8gVmCHA6pcclRX5oA/zvQf7bghAS11jRA==",
-      "dev": true,
-      "requires": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.2",
-        "engine.io-client": "~6.4.0",
-        "socket.io-parser": "~4.2.4"
-      }
-    },
-    "socket.io-parser": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
-      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
-      "dev": true,
-      "requires": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.1"
-      }
-    },
     "sockjs": {
       "version": "0.3.24",
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
@@ -32233,8 +30767,7 @@
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
     },
     "source-map-js": {
       "version": "1.0.2",
@@ -32251,6 +30784,11 @@
         "source-map": "^0.6.0"
       }
     },
+    "sourcemap-codec": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
+    },
     "spdx-correct": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
@@ -32747,15 +31285,6 @@
         "postcss-value-parser": "^4.1.0"
       }
     },
-    "sumchecker": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
-      "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.0"
-      }
-    },
     "superstruct": {
       "version": "0.16.5",
       "resolved": "https://registry.npmjs.org/superstruct/-/superstruct-0.16.5.tgz",
@@ -33108,12 +31637,6 @@
       "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
       "dev": true
     },
-    "to-readable-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
-      "dev": true
-    },
     "to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -33279,13 +31802,6 @@
         "tslib": "^1.8.1"
       }
     },
-    "tunnel": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
-      "dev": true,
-      "optional": true
-    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -33430,24 +31946,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "url-parse-lax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-      "integrity": "sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==",
-      "dev": true,
-      "requires": {
-        "prepend-http": "^2.0.0"
-      }
-    },
-    "utf-8-validate": {
-      "version": "5.0.10",
-      "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz",
-      "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==",
-      "devOptional": true,
-      "requires": {
-        "node-gyp-build": "^4.3.0"
-      }
-    },
     "utf8": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz",
@@ -33522,15 +32020,15 @@
       }
     },
     "vue": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",
-      "integrity": "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==",
+      "version": "3.2.37",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz",
+      "integrity": "sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ==",
       "requires": {
-        "@vue/compiler-dom": "3.3.4",
-        "@vue/compiler-sfc": "3.3.4",
-        "@vue/runtime-dom": "3.3.4",
-        "@vue/server-renderer": "3.3.4",
-        "@vue/shared": "3.3.4"
+        "@vue/compiler-dom": "3.2.37",
+        "@vue/compiler-sfc": "3.2.37",
+        "@vue/runtime-dom": "3.2.37",
+        "@vue/server-renderer": "3.2.37",
+        "@vue/shared": "3.2.37"
       }
     },
     "vue-class-component": {
@@ -33707,11 +32205,11 @@
       }
     },
     "vue-router": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.2.tgz",
-      "integrity": "sha512-cChBPPmAflgBGmy3tBsjeoe3f3VOSG6naKyY5pjtrqLGbNEXdzCigFUHgBvp9e3ysAtFtEx7OLqcSDh/1Cq2TQ==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.1.3.tgz",
+      "integrity": "sha512-XvK81bcYglKiayT7/vYAg/f36ExPC4t90R/HIpzrZ5x+17BOWptXLCrEPufGgZeuq68ww4ekSIMBZY1qdUdfjA==",
       "requires": {
-        "@vue/devtools-api": "^6.5.0"
+        "@vue/devtools-api": "^6.1.4"
       }
     },
     "vue-slider-component": {
@@ -34261,12 +32759,6 @@
       "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==",
       "requires": {}
     },
-    "xmlhttprequest-ssl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz",
-      "integrity": "sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==",
-      "dev": true
-    },
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -34312,16 +32804,6 @@
       "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true
     },
-    "yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-      "dev": true,
-      "requires": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
-      }
-    },
     "yorkie": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/yorkie/-/yorkie-2.0.0.tgz",
diff --git a/package.json b/package.json
index 89bee60c..e215943f 100644
--- a/package.json
+++ b/package.json
@@ -47,12 +47,12 @@
     "pinia": "^2.0.12",
     "stream-browserify": "^3.0.0",
     "uuid": "^9.0.0",
-    "vue": "^3.3.4",
+    "vue": "^3.2.13",
     "vue-class-component": "^8.0.0-0",
     "vue-gtag": "^2.0.1",
     "vue-json-viewer": "^3.0.4",
     "vue-qrious": "^3.1.0",
-    "vue-router": "^4.2.2",
+    "vue-router": "^4.0.14",
     "vue-slider-component": "^4.1.0-beta.2",
     "vue-toastification": "^2.0.0-rc.5",
     "vue3-popper": "^1.5.0",
@@ -68,7 +68,6 @@
     "@vue/cli-plugin-eslint": "~5.0.0",
     "@vue/cli-plugin-typescript": "~5.0.0",
     "@vue/cli-service": "~5.0.0",
-    "@vue/devtools": "^6.5.0",
     "@vue/eslint-config-prettier": "^7.0.0",
     "@vue/eslint-config-typescript": "^9.1.0",
     "autoprefixer": "^10.4.8",
diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index 07b2db68..e7b69f75 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -158,17 +158,15 @@ function connectToParent() {
     appStore,
     getRequestHandler()
   )
-  if (!parentConnectionStore.parentConnection) {
-    parentConnection = createParentConnection({
-      isLoggedIn: () => userStore.isLoggedIn,
-      sendRequest,
-      getPublicKey: handleGetPublicKey,
-      triggerLogout: handleLogout,
-      getUserInfo,
-      expandWallet: () => (appStore.expandWallet = true),
-    })
-    parentConnectionStore.setParentConnection(parentConnection)
-  }
+  parentConnection = createParentConnection({
+    isLoggedIn: () => userStore.isLoggedIn,
+    sendRequest,
+    getPublicKey: handleGetPublicKey,
+    triggerLogout: handleLogout,
+    getUserInfo,
+    expandWallet: () => (appStore.expandWallet = true),
+  })
+  parentConnectionStore.setParentConnection(parentConnection)
 }
 
 async function setTheme() {
@@ -256,23 +254,17 @@ async function getRpcConfig() {
 
 async function getRpcConfigFromParent() {
   try {
-    const parentConnectionInstance = await parentConnectionStore
-      .parentConnection?.promise
-    if (parentConnectionInstance) {
-      const rpcConfig = await parentConnectionInstance.getRpcConfig()
-      console.log({ rpcConfig })
-      if (rpcConfig) {
-        const chainId = Number(rpcConfig.chainId)
-        const chainToBeSet = enabledChainList.value.find(
-          (chain) => chain.chainId === chainId
-        )
-        if (chainToBeSet) {
-          rpcStore.setSelectedRPCConfig(chainToBeSet)
-          rpcStore.setRpcConfig(chainToBeSet)
-        }
+    const parentConnectionInstance = await parentConnection.promise
+    const rpcConfig = await parentConnectionInstance.getRpcConfig()
+    if (rpcConfig) {
+      const chainId = Number(rpcConfig.chainId)
+      const chainToBeSet = enabledChainList.value.find(
+        (chain) => chain.chainId === chainId
+      )
+      if (chainToBeSet) {
+        rpcStore.setSelectedRPCConfig(chainToBeSet)
+        rpcStore.setRpcConfig(chainToBeSet)
       }
-    } else {
-      console.error('parent connection not initialized')
     }
   } catch (err) {
     console.log({ err })

From 78f40c08c840a06dd8a098d2dfd92a518a3e89d1 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 15 Jun 2023 09:49:57 +0530
Subject: [PATCH 140/153] Use parentConnection from store to logout

---
 src/pages/loggedInView.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index 07b2db68..fb424a21 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -214,9 +214,9 @@ async function setAppMode(walletType, parentConnectionInstance) {
 }
 
 async function handleLogout() {
-  appStore.sdkVersion = 'v2'
-  if (parentConnection) {
-    const parentConnectionInstance = await parentConnection.promise
+  if (parentConnectionStore.parentConnection) {
+    const parentConnectionInstance = await parentConnectionStore
+      .parentConnection.promise
     const authProvider = await getAuthProvider(appStore.id as string)
     await userStore.handleLogout(authProvider)
     parentConnectionInstance?.onEvent('disconnect')

From 8f66d810280f750a469a794c1d67f9418de82f20 Mon Sep 17 00:00:00 2001
From: shaloo <5890484+shaloo@users.noreply.github.com>
Date: Thu, 15 Jun 2023 10:38:04 +0530
Subject: [PATCH 141/153] Address review comments

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 4551f222..b8ec2423 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,10 @@
 <a title="MIT License" href="https://github.com/arcana-network/license/blob/main/LICENSE.md"><img src="https://img.shields.io/badge/license-MIT-blue"/></a>
 <a title="Beta release" href="https://github.com/arcana-network/wallet-ui/releases"><img src="https://img.shields.io/github/v/release/arcana-network/wallet-ui?style=flat-square&color=28A745"/></a>
 <a title="Twitter" href="https://twitter.com/ArcanaNetwork"><img alt="Twitter URL" src="https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Ftwitter.com%2FArcanaNetwork"/></a>
+<!---
 <a title="CodeCov" href="https://codecov.io/gh/arcana-network/wallet-ui">
  <img src="https://codecov.io/gh/arcana-network/wallet-ui/branch/dev/graph/badge.svg?token=KmdjEs3enL"/></a>
+-->
 </p><p id="start" align="center">
 <a href="https://docs.beta.arcana.network/"><img src="https://raw.githubusercontent.com/arcana-network/branding/main/an_banner_docs.png" alt="Arcana Wallet UI"/></a>
 </p>

From a9d76ce0351b96bb49b987a47b04b697a5fbb34c Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 15 Jun 2023 15:47:32 +0530
Subject: [PATCH 142/153] Render router view once and ensure parentConnection
 is happening only once

---
 src/App.vue                | 17 ++++-------------
 src/pages/loggedInView.vue | 31 ++++++++++++++++---------------
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 46f25568..83d1c201 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -116,12 +116,12 @@ function canShowCollapseButton() {
 </script>
 
 <template>
-  <div v-if="sdkVersion === 'v3'" class="flex flex-col h-full">
+  <div class="flex flex-col h-full">
     <div
       v-show="expandWallet || app.expandRestoreScreen"
       class="flex flex-col h-full bg-white-300 dark:bg-black-300 overflow-hidden"
     >
-      <div class="flex justify-center mt-2 mb-2">
+      <div v-if="sdkVersion === 'v3'" class="flex justify-center mt-2 mb-2">
         <button
           v-if="canShowCollapseButton()"
           class="flex flex-grow justify-center"
@@ -131,7 +131,7 @@ function canShowCollapseButton() {
           <img v-else :src="getImage('collapse-arrow.svg')" />
         </button>
       </div>
-      <WalletHeader v-if="route.name !== 'requests'" />
+      <WalletHeader v-if="sdkVersion === 'v3' && route.name !== 'requests'" />
       <div class="flex-grow wallet__container m-1 p-3">
         <RouterView class="flex-grow" />
         <img
@@ -144,6 +144,7 @@ function canShowCollapseButton() {
       <WalletFooter v-if="showFooter" />
     </div>
     <div
+      v-if="sdkVersion === 'v3'"
       v-show="showWalletButton"
       class="relative h-[50vh] mt-[50vh] bg-white-300 rounded-t-sm dark:bg-black-300 transition-all duration-500 hover:h-[100vh] hover:mt-0"
       style="z-index: 999"
@@ -154,16 +155,6 @@ function canShowCollapseButton() {
       <WalletButton class="relative z-1" />
     </div>
   </div>
-  <div v-else class="flex flex-col h-full bg-white-300 dark:bg-black-300">
-    <div
-      class="flex-grow wallet__container p-4"
-      :class="{ 'p-0': compactMode }"
-    >
-      <RouterView class="min-h-full" />
-      <BaseModal v-if="modal.show" />
-    </div>
-    <WalletFooter v-if="showFooter" />
-  </div>
 </template>
 
 <style>
diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index 01c37863..ef3f5da2 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -152,21 +152,22 @@ async function initAccountHandler() {
 }
 
 function connectToParent() {
-  const sendRequest = getSendRequestFn(
-    handleRequest,
-    requestStore,
-    appStore,
-    getRequestHandler()
-  )
-  parentConnection = createParentConnection({
-    isLoggedIn: () => userStore.isLoggedIn,
-    sendRequest,
-    getPublicKey: handleGetPublicKey,
-    triggerLogout: handleLogout,
-    getUserInfo,
-    expandWallet: () => (appStore.expandWallet = true),
-  })
-  parentConnectionStore.setParentConnection(parentConnection)
+  if (!parentConnection) {
+    parentConnection = createParentConnection({
+      isLoggedIn: () => userStore.isLoggedIn,
+      sendRequest: getSendRequestFn(
+        handleRequest,
+        requestStore,
+        appStore,
+        getRequestHandler()
+      ),
+      getPublicKey: handleGetPublicKey,
+      triggerLogout: handleLogout,
+      getUserInfo,
+      expandWallet: () => (appStore.expandWallet = true),
+    })
+    parentConnectionStore.setParentConnection(parentConnection)
+  }
 }
 
 async function setTheme() {

From ab00181a5f5fa6bf5527ed41acc08c8b769c8b1a Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 15 Jun 2023 16:34:52 +0530
Subject: [PATCH 143/153] Add max height to toast message and show toast only
 if wallet is expanded

---
 src/App.vue                    |  2 ++
 src/utils/requestManagement.ts | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 83d1c201..abc6305d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -223,8 +223,10 @@ body {
 
 .Vue-Toastification__toast {
   min-height: unset !important;
+  max-height: 120px !important;
   padding: 1rem !important;
   font-family: Onest, sans-serif !important;
+  text-overflow: ellipsis !important;
 }
 
 .Vue-Toastification__icon {
diff --git a/src/utils/requestManagement.ts b/src/utils/requestManagement.ts
index 49782e69..2a5536c7 100644
--- a/src/utils/requestManagement.ts
+++ b/src/utils/requestManagement.ts
@@ -30,9 +30,13 @@ const appStore = useAppStore()
 
 async function showToast(type, message) {
   return new Promise((res) => {
-    if (type === 'error') toast.error(message)
-    if (type === 'success') toast.success(message)
-    setTimeout(() => res(true), TOAST_TIME_OUT)
+    if (appStore.expandWallet) {
+      if (type === 'error') toast.error(message)
+      if (type === 'success') toast.success(message)
+      setTimeout(() => res(true), TOAST_TIME_OUT)
+    } else {
+      res(true)
+    }
   })
 }
 
@@ -323,7 +327,6 @@ async function processRequest({ request, isPermissionGranted }, keeper) {
       try {
         const response = await keeper.request(request)
         await keeper.reply(request.method, response)
-        console.log(response)
         if (response.error) {
           if (response.error.data?.originalError) {
             await showToast(

From 6613ffec999e1dcfbe3dee0ae2b022ae57576016 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 15 Jun 2023 16:45:10 +0530
Subject: [PATCH 144/153] Add failsafe condition when adding token

---
 src/components/SignMessageCompact.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/SignMessageCompact.vue b/src/components/SignMessageCompact.vue
index de3b325c..2bb373ff 100644
--- a/src/components/SignMessageCompact.vue
+++ b/src/components/SignMessageCompact.vue
@@ -35,14 +35,15 @@ function getTitle(requestMethod: string) {
 
 function getPermissionText(method, request) {
   const { params } = request
-  const { chainName } = params[0]
-  if (method === 'wallet_addEthereumChain') {
-    return chainName ? `Adding Chain - ${chainName}` : 'Adding Chain'
-  } else if (method === 'wallet_switchEthereumChain') {
-    return chainName ? `Switch Chain - ${chainName}` : 'Switch Chain'
-  } else {
-    return methodAndAction[method]
+  if (params instanceof Array && params[0]) {
+    const { chainName } = params[0]
+    if (method === 'wallet_addEthereumChain') {
+      return chainName ? `Adding Chain - ${chainName}` : 'Adding Chain'
+    } else if (method === 'wallet_switchEthereumChain') {
+      return chainName ? `Switch Chain - ${chainName}` : 'Switch Chain'
+    }
   }
+  return methodAndAction[method]
 }
 </script>
 

From daf2a27fb1124b97cc9c7d2ff1b37c759039e0ab Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 15 Jun 2023 17:16:51 +0530
Subject: [PATCH 145/153] Reduce height of VJsonViewer

---
 src/components/signMessageAdvancedInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/signMessageAdvancedInfo.vue b/src/components/signMessageAdvancedInfo.vue
index 8ccd6336..f65e4808 100644
--- a/src/components/signMessageAdvancedInfo.vue
+++ b/src/components/signMessageAdvancedInfo.vue
@@ -11,7 +11,7 @@ const props = defineProps({
 
 <template>
   <div
-    class="bg-black-100 p-4 break-word rounded-md overflow-hidden break-words"
+    class="bg-black-100 p-4 break-word rounded-md overflow-auto max-h-40 break-words"
   >
     <VJsonViewer :value="info"></VJsonViewer>
   </div>

From 2141f5c71b9f2c62ae73cd23324f4f918f42a211 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 15 Jun 2023 18:16:14 +0530
Subject: [PATCH 146/153] Set network after chain id is added

---
 src/components/AddNetwork.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/AddNetwork.vue b/src/components/AddNetwork.vue
index b5d455cb..c74aa71d 100644
--- a/src/components/AddNetwork.vue
+++ b/src/components/AddNetwork.vue
@@ -72,6 +72,9 @@ async function handleSubmit() {
           isCustom: true,
         }
         rpcStore.addNetwork(payload)
+        rpcStore.setRpcConfig({
+          ...payload,
+        })
         rpcStore.setSelectedChainId(payload.chainId)
       }
       emit('close')
@@ -150,7 +153,6 @@ async function handleSubmit() {
         <input
           id="explorerUrl"
           v-model="rpcConfig.explorerUrl"
-          required
           type="text"
           class="input-field focus:input-active"
           placeholder="e.g. https://etherscan.io"

From 6892771069188469c6cca80012080a1cb25a9ebd Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 15 Jun 2023 18:24:06 +0530
Subject: [PATCH 147/153] Add notification dot on icon only if there are
 pending requests

---
 src/assets/images/dark/no-notifications-icon-selected.svg | 3 +++
 src/assets/images/dark/no-notifications-icon.svg          | 3 +++
 .../images/light/no-notifications-icon-selected.svg       | 3 +++
 src/assets/images/light/no-notifications-icon.svg         | 3 +++
 src/components/AppFooter.vue                              | 8 ++++++++
 5 files changed, 20 insertions(+)
 create mode 100644 src/assets/images/dark/no-notifications-icon-selected.svg
 create mode 100644 src/assets/images/dark/no-notifications-icon.svg
 create mode 100644 src/assets/images/light/no-notifications-icon-selected.svg
 create mode 100644 src/assets/images/light/no-notifications-icon.svg

diff --git a/src/assets/images/dark/no-notifications-icon-selected.svg b/src/assets/images/dark/no-notifications-icon-selected.svg
new file mode 100644
index 00000000..f8c42ca0
--- /dev/null
+++ b/src/assets/images/dark/no-notifications-icon-selected.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9465 4H9.34204C9.19845 4 9.12666 4 9.06328 4.02186C9.00723 4.04119 8.95618 4.07275 8.91382 4.11423C8.86592 4.16115 8.83382 4.22536 8.7696 4.35378L5.4096 11.0738C5.25626 11.3805 5.17959 11.5338 5.198 11.6585C5.21409 11.7673 5.27429 11.8647 5.36445 11.9278C5.46771 12 5.63915 12 5.98204 12H10.9465L8.5465 20L18.301 9.88425C18.6301 9.54296 18.7946 9.37232 18.8042 9.22631C18.8126 9.09956 18.7603 8.97639 18.6632 8.89443C18.5514 8.8 18.3144 8.8 17.8403 8.8H12.1465L13.9465 4Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/dark/no-notifications-icon.svg b/src/assets/images/dark/no-notifications-icon.svg
new file mode 100644
index 00000000..e2c906da
--- /dev/null
+++ b/src/assets/images/dark/no-notifications-icon.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9465 4H9.34204C9.19845 4 9.12666 4 9.06328 4.02186C9.00723 4.04119 8.95618 4.07275 8.91382 4.11423C8.86592 4.16115 8.83382 4.22536 8.7696 4.35378L5.4096 11.0738C5.25626 11.3805 5.17959 11.5338 5.198 11.6585C5.21409 11.7673 5.27429 11.8647 5.36445 11.9278C5.46771 12 5.63915 12 5.98204 12H10.9465L8.5465 20L18.301 9.88425C18.6301 9.54296 18.7946 9.37232 18.8042 9.22631C18.8126 9.09956 18.7603 8.97639 18.6632 8.89443C18.5514 8.8 18.3144 8.8 17.8403 8.8H12.1465L13.9465 4Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/no-notifications-icon-selected.svg b/src/assets/images/light/no-notifications-icon-selected.svg
new file mode 100644
index 00000000..fe9657b7
--- /dev/null
+++ b/src/assets/images/light/no-notifications-icon-selected.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9465 4H9.34204C9.19845 4 9.12666 4 9.06328 4.02186C9.00723 4.04119 8.95618 4.07275 8.91382 4.11423C8.86592 4.16115 8.83382 4.22536 8.7696 4.35378L5.4096 11.0738C5.25626 11.3805 5.17959 11.5338 5.198 11.6585C5.21409 11.7673 5.27429 11.8647 5.36445 11.9278C5.46771 12 5.63915 12 5.98204 12H10.9465L8.5465 20L18.301 9.88425C18.6301 9.54296 18.7946 9.37232 18.8042 9.22631C18.8126 9.09956 18.7603 8.97639 18.6632 8.89443C18.5514 8.8 18.3144 8.8 17.8403 8.8H12.1465L13.9465 4Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/no-notifications-icon.svg b/src/assets/images/light/no-notifications-icon.svg
new file mode 100644
index 00000000..e2c906da
--- /dev/null
+++ b/src/assets/images/light/no-notifications-icon.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9465 4H9.34204C9.19845 4 9.12666 4 9.06328 4.02186C9.00723 4.04119 8.95618 4.07275 8.91382 4.11423C8.86592 4.16115 8.83382 4.22536 8.7696 4.35378L5.4096 11.0738C5.25626 11.3805 5.17959 11.5338 5.198 11.6585C5.21409 11.7673 5.27429 11.8647 5.36445 11.9278C5.46771 12 5.63915 12 5.98204 12H10.9465L8.5465 20L18.301 9.88425C18.6301 9.54296 18.7946 9.37232 18.8042 9.22631C18.8126 9.09956 18.7603 8.97639 18.6632 8.89443C18.5514 8.8 18.3144 8.8 17.8403 8.8H12.1465L13.9465 4Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/AppFooter.vue b/src/components/AppFooter.vue
index bff7c3c0..2fd16d47 100644
--- a/src/components/AppFooter.vue
+++ b/src/components/AppFooter.vue
@@ -2,11 +2,13 @@
 import { computed } from 'vue'
 import { useRoute } from 'vue-router'
 
+import { useRequestStore } from '@/store/request'
 import { useUserStore } from '@/store/user'
 import { getImage } from '@/utils/getImage'
 
 const userStore = useUserStore()
 const route = useRoute()
+const requestStore = useRequestStore()
 
 const currentRoute = computed(() => {
   return route.name
@@ -105,9 +107,15 @@ function getIcon(icon: string, pathName: string) {
           }"
         >
           <img
+            v-if="requestStore.skippedRequestsForApproval.length > 0"
             :src="getIcon('notifications-icon', 'activities')"
             alt="activities"
           />
+          <img
+            v-else
+            :src="getIcon('no-notifications-icon', 'activities')"
+            alt="activities"
+          />
         </div>
         <span
           class="text-xs font-normal text-gray-100"

From 0076702adacfb19f42af6a3b68e409569d8a70b7 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 15 Jun 2023 18:35:11 +0530
Subject: [PATCH 148/153] Show testnet or dev banner to avoid confusion

---
 src/App.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/App.vue b/src/App.vue
index abc6305d..052b1d0d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,6 +12,7 @@ import { useAppStore } from '@/store/app'
 import { useModalStore } from '@/store/modal'
 import { useParentConnectionStore } from '@/store/parentConnection'
 import { useRequestStore } from '@/store/request'
+import { AUTH_NETWORK } from '@/utils/constants'
 import { getImage } from '@/utils/getImage'
 import { initializeOnRampMoney } from '@/utils/onrampmoney.ramp'
 import { fetchTransakNetworks } from '@/utils/transak'
@@ -121,6 +122,17 @@ function canShowCollapseButton() {
       v-show="expandWallet || app.expandRestoreScreen"
       class="flex flex-col h-full bg-white-300 dark:bg-black-300 overflow-hidden"
     >
+      <div
+        v-if="AUTH_NETWORK !== 'mainnet'"
+        class="p-1 text-center"
+        style="background: #ff682620"
+      >
+        <span class="text-xs" style="color: #ff6826"
+          >This wallet is on Arcana
+          <span class="capitalize">{{ AUTH_NETWORK }}</span> and is meant for
+          testing only</span
+        >
+      </div>
       <div v-if="sdkVersion === 'v3'" class="flex justify-center mt-2 mb-2">
         <button
           v-if="canShowCollapseButton()"

From 86e178dafd2d36b82d57678c783646d2a9127707 Mon Sep 17 00:00:00 2001
From: shrinathprabhu <shrinathprabhu.123@gmail.com>
Date: Thu, 15 Jun 2023 18:47:47 +0530
Subject: [PATCH 149/153] Appear wallet button arrow at start

---
 src/components/WalletButton.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/WalletButton.vue b/src/components/WalletButton.vue
index c7739b9b..dd71e5cc 100644
--- a/src/components/WalletButton.vue
+++ b/src/components/WalletButton.vue
@@ -24,7 +24,7 @@ const showRequestCountBadge = computed(() => {
 <template>
   <div class="h-full relative">
     <button
-      class="flex items-center justify-center flex-grow h-full w-full"
+      class="flex items-start justify-center flex-grow h-full w-full pt-[6px]"
       @click="onClickOfButton"
     >
       <img :src="getImage('expand-arrow.svg')" />

From 6ca4906b4c688abf3e652f25737ddcede75c1f53 Mon Sep 17 00:00:00 2001
From: makylfang <makyl@newfang.io>
Date: Fri, 16 Jun 2023 12:00:25 +0400
Subject: [PATCH 150/153] update auth-core version to fix steam issue (#369)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e215943f..11c7a1f0 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@arcana/auth": "^0.1.3",
-    "@arcana/auth-core": "1.0.0-beta.8",
+    "@arcana/auth-core": "1.0.0-beta.9",
     "@arcana/key-helper": "^1.0.0-beta.7",
     "@ethereumjs/tx": "^3.4.0",
     "@fontsource/montserrat": "^4.5.14",

From 1103f7887278ee7d9f406fe5051f9781205145b0 Mon Sep 17 00:00:00 2001
From: makylfang <makyl@newfang.io>
Date: Wed, 21 Jun 2023 13:45:22 +0400
Subject: [PATCH 151/153] [Fix] Update auth-core and used base64 decoding for
 state params (#370)

* Update auth-core and used base64 decoding for state params

* Updated auth-core version

* Fixed usage of state in other places
---
 package-lock.json                     | 16 ++++++++--------
 package.json                          |  2 +-
 src/pages/MFARestoreScreen.vue        |  4 +++-
 src/pages/backCompat/signIn.vue       |  7 +++++--
 src/pages/loginRedirect.vue           | 21 ++++++++++++---------
 src/pages/signInV2.vue                |  9 ++++++---
 src/utils/PasswordlessLoginHandler.ts | 16 ++++++++++++++--
 src/utils/redirectUtils.ts            |  5 +++--
 8 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4ec2063a..2d662223 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "@arcana/auth": "^0.1.3",
-        "@arcana/auth-core": "^1.0.0-beta.8",
+        "@arcana/auth-core": "^1.0.0-beta.10",
         "@arcana/key-helper": "^1.0.0-beta.7",
         "@ethereumjs/tx": "^3.4.0",
         "@fontsource/montserrat": "^4.5.14",
@@ -84,7 +84,7 @@
     },
     "../auth-core": {
       "name": "@arcana/auth-core",
-      "version": "1.0.0-beta.8",
+      "version": "1.0.0-beta.10",
       "extraneous": true,
       "license": "MIT",
       "dependencies": {
@@ -167,9 +167,9 @@
       }
     },
     "node_modules/@arcana/auth-core": {
-      "version": "1.0.0-beta.8",
-      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.8.tgz",
-      "integrity": "sha512-A7pgnBydII2c4EFjNcyzIjT1bsqWEgo6kxFm77BIQiNNBkPfPAq2DN70YzDoTtn0sEDYHZvj1hJn5bs6KKAtLA==",
+      "version": "1.0.0-beta.10",
+      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.10.tgz",
+      "integrity": "sha512-KLuoz82KwmG599TRpCJhVupIgASih6LXxBGimjG1m2IUHYrjFXPBVq+y/dQu0o1W1lV2Dwg8wSAHPkyIw9LglQ==",
       "dependencies": {
         "@arcana/keystore": "^1.0.0",
         "@stablelib/base64": "^1.0.1",
@@ -18974,9 +18974,9 @@
       }
     },
     "@arcana/auth-core": {
-      "version": "1.0.0-beta.8",
-      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.8.tgz",
-      "integrity": "sha512-A7pgnBydII2c4EFjNcyzIjT1bsqWEgo6kxFm77BIQiNNBkPfPAq2DN70YzDoTtn0sEDYHZvj1hJn5bs6KKAtLA==",
+      "version": "1.0.0-beta.10",
+      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.10.tgz",
+      "integrity": "sha512-KLuoz82KwmG599TRpCJhVupIgASih6LXxBGimjG1m2IUHYrjFXPBVq+y/dQu0o1W1lV2Dwg8wSAHPkyIw9LglQ==",
       "requires": {
         "@arcana/keystore": "^1.0.0",
         "@stablelib/base64": "^1.0.1",
diff --git a/package.json b/package.json
index e215943f..f6a16c36 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@arcana/auth": "^0.1.3",
-    "@arcana/auth-core": "1.0.0-beta.8",
+    "@arcana/auth-core": "^1.0.0-beta.11",
     "@arcana/key-helper": "^1.0.0-beta.7",
     "@ethereumjs/tx": "^3.4.0",
     "@fontsource/montserrat": "^4.5.14",
diff --git a/src/pages/MFARestoreScreen.vue b/src/pages/MFARestoreScreen.vue
index ced7277d..f41376ae 100644
--- a/src/pages/MFARestoreScreen.vue
+++ b/src/pages/MFARestoreScreen.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { StateInfo, decodeJSON } from '@arcana/auth-core'
 import { Core, SecurityQuestionModule } from '@arcana/key-helper'
 import { getUniqueId } from 'json-rpc-engine'
 import { connectToParent } from 'penpal'
@@ -194,6 +195,7 @@ async function returnToParent(key: string) {
   ).promise
   const info = JSON.parse(storage.session.getItem('info') as string)
   const state = storage.local.getItem('state') as string
+  const stateInfo = decodeJSON<StateInfo>(state)
   const loginSrc = storage.local.getItem('loginSrc')
   const isStandalone =
     loginSrc === 'rn' || loginSrc === 'flutter' || loginSrc === 'unity'
@@ -206,7 +208,7 @@ async function returnToParent(key: string) {
 
   const messageId = getUniqueId()
   await handleLogin({
-    state,
+    state: stateInfo.i,
     isStandalone,
     userInfo: info,
     messageId,
diff --git a/src/pages/backCompat/signIn.vue b/src/pages/backCompat/signIn.vue
index fa9d2ae8..4a20a720 100644
--- a/src/pages/backCompat/signIn.vue
+++ b/src/pages/backCompat/signIn.vue
@@ -14,7 +14,10 @@ import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
 import { createParentConnection } from '@/utils/createParentConnection'
 import { getAuthProvider } from '@/utils/getAuthProvider'
 import { decodeJSON } from '@/utils/hash'
-import { PasswordlessLoginHandler } from '@/utils/PasswordlessLoginHandler'
+import {
+  PasswordlessLoginHandler,
+  getPasswordlessState,
+} from '@/utils/PasswordlessLoginHandler'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
 const route = useRoute()
@@ -71,7 +74,7 @@ const initPasswordlessLogin = async (email: string) => {
 
   passwordlessLoginHandler = new PasswordlessLoginHandler(email)
   const params = passwordlessLoginHandler.params()
-  const state = `passwordless-${params.sessionId}-${params.setToken}`
+  const state = getPasswordlessState(params.sessionId, params.setToken)
   const response = await provider.loginWithPasswordlessStart({
     email,
     kind: 'link',
diff --git a/src/pages/loginRedirect.vue b/src/pages/loginRedirect.vue
index 693eb340..fa3ad5d8 100644
--- a/src/pages/loginRedirect.vue
+++ b/src/pages/loginRedirect.vue
@@ -1,5 +1,10 @@
 <script setup lang="ts">
-import { GetInfoOutput, SocialLoginType } from '@arcana/auth-core'
+import {
+  GetInfoOutput,
+  SocialLoginType,
+  StateInfo,
+  decodeJSON,
+} from '@arcana/auth-core'
 import { Core, SecurityQuestionModule } from '@arcana/key-helper'
 import dayjs from 'dayjs'
 import { getUniqueId } from 'json-rpc-engine'
@@ -26,9 +31,6 @@ let channel: BroadcastChannel | null = null
 onMounted(init)
 onUnmounted(cleanup)
 
-const getLoginTypeFromState = (s: string) => {
-  return s.split('-')[0]
-}
 async function init() {
   const storage = getStorage()
   const loginSrc = storage.local.getItem('loginSrc')
@@ -37,14 +39,15 @@ async function init() {
   try {
     const state = getStateFromUrl(route.fullPath)
     storage.session.setItem('state', state)
+    const stateInfo = decodeJSON<StateInfo>(state)
+
     const connectionToParent =
       await connectToParent<RedirectParentConnectionApi>({}).promise
-    if (
-      !isStandalone &&
-      getLoginTypeFromState(state) !== SocialLoginType.passwordless
-    ) {
+
+    if (!isStandalone && stateInfo.t !== SocialLoginType.passwordless) {
       await verifyOpenerPage(state)
     }
+
     const authProvider = await getAuthProvider(`${appId}`)
     if (authProvider.isLoggedIn()) {
       const info = authProvider.getUserInfo()
@@ -84,7 +87,7 @@ async function init() {
       await handleLogin({
         connection: connectionToParent,
         userInfo,
-        state,
+        state: stateInfo.i,
         messageId,
         isStandalone,
       })
diff --git a/src/pages/signInV2.vue b/src/pages/signInV2.vue
index 6524ce1c..9ea265b9 100644
--- a/src/pages/signInV2.vue
+++ b/src/pages/signInV2.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { AuthProvider, GetInfoOutput } from '@arcana/auth-core'
-import { SocialLoginType } from '@arcana/auth-core'
+import { SocialLoginType, encodeJSON } from '@arcana/auth-core'
 import { Core, SecurityQuestionModule } from '@arcana/key-helper'
 import type { Connection } from 'penpal'
 import { toRefs, onMounted, ref, onUnmounted } from 'vue'
@@ -15,7 +15,10 @@ import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
 import { createParentConnection } from '@/utils/createParentConnection'
 import { getAuthProvider } from '@/utils/getAuthProvider'
 import { decodeJSON } from '@/utils/hash'
-import { PasswordlessLoginHandler } from '@/utils/PasswordlessLoginHandler'
+import {
+  getPasswordlessState,
+  PasswordlessLoginHandler,
+} from '@/utils/PasswordlessLoginHandler'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
 const route = useRoute()
@@ -73,7 +76,7 @@ const initPasswordlessLogin = async (email: string) => {
 
   passwordlessLoginHandler = new PasswordlessLoginHandler(email)
   const params = passwordlessLoginHandler.params()
-  const state = `passwordless-${params.sessionId}-${params.setToken}`
+  const state = getPasswordlessState(params.sessionId, params.setToken)
   const response = await provider.loginWithPasswordlessStart({
     email,
     kind: 'link',
diff --git a/src/utils/PasswordlessLoginHandler.ts b/src/utils/PasswordlessLoginHandler.ts
index aa5f8a01..87b4918e 100644
--- a/src/utils/PasswordlessLoginHandler.ts
+++ b/src/utils/PasswordlessLoginHandler.ts
@@ -1,4 +1,4 @@
-import { v4 as uuid } from 'uuid'
+import { SocialLoginType, encodeJSON } from '@arcana/auth-core'
 
 import { getRandomPrivateKey, sign, decrypt } from '@/utils/crypto'
 
@@ -142,4 +142,16 @@ const getCredentialKey = async (sessionId: string) => {
   return data.publicKey
 }
 
-export { PasswordlessLoginHandler, setCredential, getCredentialKey }
+const getPasswordlessState = (sessionId: string, setToken: string) => {
+  const state = encodeJSON({
+    t: SocialLoginType.passwordless,
+    i: `${sessionId}-${setToken}`,
+  })
+  return state
+}
+export {
+  PasswordlessLoginHandler,
+  getPasswordlessState,
+  setCredential,
+  getCredentialKey,
+}
diff --git a/src/utils/redirectUtils.ts b/src/utils/redirectUtils.ts
index 935fb8fd..f2d0db0b 100644
--- a/src/utils/redirectUtils.ts
+++ b/src/utils/redirectUtils.ts
@@ -5,6 +5,7 @@ import { RedirectParentConnectionApi } from '@/models/Connection'
 import { encrypt } from '@/utils/crypto'
 import {
   getCredentialKey,
+  getPasswordlessState,
   setCredential,
 } from '@/utils/PasswordlessLoginHandler'
 
@@ -82,7 +83,7 @@ const fetchPasswordlessResponseFromSignIn = async ({
   sessionId: string
   setToken: string
 }) => {
-  const state = `passwordless-${sessionId}-${setToken}`
+  const state = getPasswordlessState(sessionId, setToken)
   const data = await interactWithIframe<{
     status: string
     error: string | null
@@ -151,7 +152,7 @@ async function handlePasswordlessLoginV2(
   state: string,
   connection: AsyncMethodReturns<RedirectParentConnectionApi>
 ) {
-  const [, sessionId, setToken] = state.split('-')
+  const [sessionId, setToken] = state.split('-')
   const publicKey = await getCredentialKey(sessionId)
   const dataToEncrypt = {
     privateKey: info.privateKey,

From e60c7ab1101baf2d76877b1faceedd814d135a29 Mon Sep 17 00:00:00 2001
From: makylfang <makyl@newfang.io>
Date: Wed, 21 Jun 2023 19:56:20 +0400
Subject: [PATCH 152/153] [Deploy] Merging dev to testnet (#372)

* Upgrade vue packages

* Handle duplicate parent connection instance

* Fix: #AR-6193 readme update

* Revert "hotfix handle duplicate parent connection"

* Use parentConnection from store to logout

* Address review comments

* Render router view once and ensure parentConnection is happening only once

* Add max height to toast message and show toast only if wallet is expanded

* Add failsafe condition when adding token

* Reduce height of VJsonViewer

* Set network after chain id is added

* Add notification dot on icon only if there are pending requests

* Show testnet or dev banner to avoid confusion

* Appear wallet button arrow at start

* [Fix] Update auth-core and used base64 decoding for state params (#370)

* Update auth-core and used base64 decoding for state params

* Updated auth-core version

* Fixed usage of state in other places

---------

Co-authored-by: shrinathprabhu <shrinathprabhu.123@gmail.com>
Co-authored-by: shaloo <5890484+shaloo@users.noreply.github.com>
Co-authored-by: shalz <shalz@hotmail.com>
---
 README.md                                     | 50 ++++++++++++++-----
 package-lock.json                             | 16 +++---
 package.json                                  |  2 +-
 src/App.vue                                   | 31 +++++++-----
 .../dark/no-notifications-icon-selected.svg   |  3 ++
 .../images/dark/no-notifications-icon.svg     |  3 ++
 .../light/no-notifications-icon-selected.svg  |  3 ++
 .../images/light/no-notifications-icon.svg    |  3 ++
 src/components/AddNetwork.vue                 |  4 +-
 src/components/AppFooter.vue                  |  8 +++
 src/components/SignMessageCompact.vue         | 15 +++---
 src/components/WalletButton.vue               |  2 +-
 src/components/signMessageAdvancedInfo.vue    |  2 +-
 src/pages/MFARestoreScreen.vue                |  4 +-
 src/pages/backCompat/signIn.vue               |  7 ++-
 src/pages/loggedInView.vue                    | 37 +++++++-------
 src/pages/loginRedirect.vue                   | 21 ++++----
 src/pages/signInV2.vue                        |  9 ++--
 src/utils/PasswordlessLoginHandler.ts         | 16 +++++-
 src/utils/redirectUtils.ts                    |  5 +-
 src/utils/requestManagement.ts                | 11 ++--
 21 files changed, 167 insertions(+), 85 deletions(-)
 create mode 100644 src/assets/images/dark/no-notifications-icon-selected.svg
 create mode 100644 src/assets/images/dark/no-notifications-icon.svg
 create mode 100644 src/assets/images/light/no-notifications-icon-selected.svg
 create mode 100644 src/assets/images/light/no-notifications-icon.svg

diff --git a/README.md b/README.md
index 049f74c0..b8ec2423 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,32 @@
-# wallet-ui
+<p align="center">
+<a href="#start"><img height="30rem" src="https://raw.githubusercontent.com/arcana-network/branding/main/an_logo_light_temp.png"/></a>
+<h2 align="center"> <a href="https://arcana.network/">Arcana Wallet UI </a></h2>
+</p>
+<br/>
+<p id="banner" align="center">
+<br/>
+<a title="MIT License" href="https://github.com/arcana-network/license/blob/main/LICENSE.md"><img src="https://img.shields.io/badge/license-MIT-blue"/></a>
+<a title="Beta release" href="https://github.com/arcana-network/wallet-ui/releases"><img src="https://img.shields.io/github/v/release/arcana-network/wallet-ui?style=flat-square&color=28A745"/></a>
+<a title="Twitter" href="https://twitter.com/ArcanaNetwork"><img alt="Twitter URL" src="https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Ftwitter.com%2FArcanaNetwork"/></a>
+<!---
+<a title="CodeCov" href="https://codecov.io/gh/arcana-network/wallet-ui">
+ <img src="https://codecov.io/gh/arcana-network/wallet-ui/branch/dev/graph/badge.svg?token=KmdjEs3enL"/></a>
+-->
+</p><p id="start" align="center">
+<a href="https://docs.beta.arcana.network/"><img src="https://raw.githubusercontent.com/arcana-network/branding/main/an_banner_docs.png" alt="Arcana Wallet UI"/></a>
+</p>
 
-Arcana's embedded Web3 wallet implementation.
+# Arcana Wallet UI
 
-This is a Vue app written in TypeScript and styled with Tailwind CSS.
+The Arcana wallet is a non-custodial, embedded Web3 wallet that is instantly available to authenticated users of Web3 apps that use the [Arcana Auth SDK](https://github.com/arcana-network/auth). Web3 app developers must install and integrate the Auth SDK to enable users to sign blockchain transactions. Users do not have to install any software to access the Arcana Wallet UI.
 
-## Installation
+Developers can also choose to disable the Arcana Wallet UI and plug in a custom wallet UI for their apps using the white-labeled Auth feature.
+
+This repo contains Aracna Wallet UI implementation. It is a Vue app written in TypeScript and styled with Tailwind CSS.
+
+**Note:**  Arcana Wallet UI is NOT a standalone wallet. It is part of the Arcana Auth SDK.
+
+## 📋 Installation
 
 Use the Node version listed in the [.nvmrc](./.nvmrc) file.
 
@@ -17,20 +39,24 @@ Use the Node version listed in the [.nvmrc](./.nvmrc) file.
 
 If you are using VS Code, see the recommended [settings](./.vscode/settings.json) and [extensions](./.vscode/extensions.json).
 
-## Usage
+## 📒 Usage
+
+To use Arcana Wallet UI in a Web3 app, follow the instructions [here](https://docs.arcana.network/quick-start/index.html) to register the app with Arcana Network, configure the chains and social login settings and install, and integrate the app with the Arcana Auth SDK.
+
+## 📚 Documentation
 
-To use Arcana's Web3 wallet in an external dapp, follow the instructions for initializing [`@arcana/auth`](https://github.com/arcana-network/auth) SDK.
+Check out [Arcana Auth documentation](https://docs.arcana.network/) and use the [Auth SDK Quick Start Guide](https://docs.arcana.network/quick-start/index.html) to integrate any Web3 app and enable the Arcana Wallet UI. See [Arcana Wallet User Guide](https://docs.arcana.network/user-guides/wallet-ui/index.html) for usage details.
 
-## Support
+## 💡 Support
 
-For any support or integration related queries, contact [Arcana's support team](mailto:support@arcana.network).
+For any support or integration-related queries, contact [Arcana Support Team](mailto:support@arcana.network).
 
-## Contributing Guide
+## 🤝 Contributing
 
-We welcome all contributions to this repository from the community. Read our [contributing guide](https://github.com/arcana-network/license/blob/main/CONTRIBUTING.md) to learn about our development process, how to propose bug fixes and improvements, and the code of conduct that we expect the participants to adhere to.
+We welcome all contributions to the Arcana Auth product and Wallet UI from the community. Read our [contributing guide](https://github.com/arcana-network/license/blob/main/CONTRIBUTING.md) to learn about the our development process, how to propose bug fixes and improvements, and the code of conduct that we expect the participants to adhere to. Refer to the build and test section of this readme for details on how to test and validate your changes to the Wallet UI code before submitting your contributions.
 
-## License
+## ℹ️ License
 
-This public repository of Arcana Network is shared and distributed under the [MIT License](https://fossa.com/blog/open-source-licenses-101-mit-license/).
+Arcana Wallet UI is distributed under the [MIT License](https://fossa.com/blog/open-source-licenses-101-mit-license/).
 
 For details see [Arcana License](https://github.com/arcana-network/license/blob/main/LICENSE.md).
diff --git a/package-lock.json b/package-lock.json
index 4ec2063a..2d662223 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "@arcana/auth": "^0.1.3",
-        "@arcana/auth-core": "^1.0.0-beta.8",
+        "@arcana/auth-core": "^1.0.0-beta.10",
         "@arcana/key-helper": "^1.0.0-beta.7",
         "@ethereumjs/tx": "^3.4.0",
         "@fontsource/montserrat": "^4.5.14",
@@ -84,7 +84,7 @@
     },
     "../auth-core": {
       "name": "@arcana/auth-core",
-      "version": "1.0.0-beta.8",
+      "version": "1.0.0-beta.10",
       "extraneous": true,
       "license": "MIT",
       "dependencies": {
@@ -167,9 +167,9 @@
       }
     },
     "node_modules/@arcana/auth-core": {
-      "version": "1.0.0-beta.8",
-      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.8.tgz",
-      "integrity": "sha512-A7pgnBydII2c4EFjNcyzIjT1bsqWEgo6kxFm77BIQiNNBkPfPAq2DN70YzDoTtn0sEDYHZvj1hJn5bs6KKAtLA==",
+      "version": "1.0.0-beta.10",
+      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.10.tgz",
+      "integrity": "sha512-KLuoz82KwmG599TRpCJhVupIgASih6LXxBGimjG1m2IUHYrjFXPBVq+y/dQu0o1W1lV2Dwg8wSAHPkyIw9LglQ==",
       "dependencies": {
         "@arcana/keystore": "^1.0.0",
         "@stablelib/base64": "^1.0.1",
@@ -18974,9 +18974,9 @@
       }
     },
     "@arcana/auth-core": {
-      "version": "1.0.0-beta.8",
-      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.8.tgz",
-      "integrity": "sha512-A7pgnBydII2c4EFjNcyzIjT1bsqWEgo6kxFm77BIQiNNBkPfPAq2DN70YzDoTtn0sEDYHZvj1hJn5bs6KKAtLA==",
+      "version": "1.0.0-beta.10",
+      "resolved": "https://registry.npmjs.org/@arcana/auth-core/-/auth-core-1.0.0-beta.10.tgz",
+      "integrity": "sha512-KLuoz82KwmG599TRpCJhVupIgASih6LXxBGimjG1m2IUHYrjFXPBVq+y/dQu0o1W1lV2Dwg8wSAHPkyIw9LglQ==",
       "requires": {
         "@arcana/keystore": "^1.0.0",
         "@stablelib/base64": "^1.0.1",
diff --git a/package.json b/package.json
index 11c7a1f0..f6a16c36 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@arcana/auth": "^0.1.3",
-    "@arcana/auth-core": "1.0.0-beta.9",
+    "@arcana/auth-core": "^1.0.0-beta.11",
     "@arcana/key-helper": "^1.0.0-beta.7",
     "@ethereumjs/tx": "^3.4.0",
     "@fontsource/montserrat": "^4.5.14",
diff --git a/src/App.vue b/src/App.vue
index 46f25568..052b1d0d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,6 +12,7 @@ import { useAppStore } from '@/store/app'
 import { useModalStore } from '@/store/modal'
 import { useParentConnectionStore } from '@/store/parentConnection'
 import { useRequestStore } from '@/store/request'
+import { AUTH_NETWORK } from '@/utils/constants'
 import { getImage } from '@/utils/getImage'
 import { initializeOnRampMoney } from '@/utils/onrampmoney.ramp'
 import { fetchTransakNetworks } from '@/utils/transak'
@@ -116,12 +117,23 @@ function canShowCollapseButton() {
 </script>
 
 <template>
-  <div v-if="sdkVersion === 'v3'" class="flex flex-col h-full">
+  <div class="flex flex-col h-full">
     <div
       v-show="expandWallet || app.expandRestoreScreen"
       class="flex flex-col h-full bg-white-300 dark:bg-black-300 overflow-hidden"
     >
-      <div class="flex justify-center mt-2 mb-2">
+      <div
+        v-if="AUTH_NETWORK !== 'mainnet'"
+        class="p-1 text-center"
+        style="background: #ff682620"
+      >
+        <span class="text-xs" style="color: #ff6826"
+          >This wallet is on Arcana
+          <span class="capitalize">{{ AUTH_NETWORK }}</span> and is meant for
+          testing only</span
+        >
+      </div>
+      <div v-if="sdkVersion === 'v3'" class="flex justify-center mt-2 mb-2">
         <button
           v-if="canShowCollapseButton()"
           class="flex flex-grow justify-center"
@@ -131,7 +143,7 @@ function canShowCollapseButton() {
           <img v-else :src="getImage('collapse-arrow.svg')" />
         </button>
       </div>
-      <WalletHeader v-if="route.name !== 'requests'" />
+      <WalletHeader v-if="sdkVersion === 'v3' && route.name !== 'requests'" />
       <div class="flex-grow wallet__container m-1 p-3">
         <RouterView class="flex-grow" />
         <img
@@ -144,6 +156,7 @@ function canShowCollapseButton() {
       <WalletFooter v-if="showFooter" />
     </div>
     <div
+      v-if="sdkVersion === 'v3'"
       v-show="showWalletButton"
       class="relative h-[50vh] mt-[50vh] bg-white-300 rounded-t-sm dark:bg-black-300 transition-all duration-500 hover:h-[100vh] hover:mt-0"
       style="z-index: 999"
@@ -154,16 +167,6 @@ function canShowCollapseButton() {
       <WalletButton class="relative z-1" />
     </div>
   </div>
-  <div v-else class="flex flex-col h-full bg-white-300 dark:bg-black-300">
-    <div
-      class="flex-grow wallet__container p-4"
-      :class="{ 'p-0': compactMode }"
-    >
-      <RouterView class="min-h-full" />
-      <BaseModal v-if="modal.show" />
-    </div>
-    <WalletFooter v-if="showFooter" />
-  </div>
 </template>
 
 <style>
@@ -232,8 +235,10 @@ body {
 
 .Vue-Toastification__toast {
   min-height: unset !important;
+  max-height: 120px !important;
   padding: 1rem !important;
   font-family: Onest, sans-serif !important;
+  text-overflow: ellipsis !important;
 }
 
 .Vue-Toastification__icon {
diff --git a/src/assets/images/dark/no-notifications-icon-selected.svg b/src/assets/images/dark/no-notifications-icon-selected.svg
new file mode 100644
index 00000000..f8c42ca0
--- /dev/null
+++ b/src/assets/images/dark/no-notifications-icon-selected.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9465 4H9.34204C9.19845 4 9.12666 4 9.06328 4.02186C9.00723 4.04119 8.95618 4.07275 8.91382 4.11423C8.86592 4.16115 8.83382 4.22536 8.7696 4.35378L5.4096 11.0738C5.25626 11.3805 5.17959 11.5338 5.198 11.6585C5.21409 11.7673 5.27429 11.8647 5.36445 11.9278C5.46771 12 5.63915 12 5.98204 12H10.9465L8.5465 20L18.301 9.88425C18.6301 9.54296 18.7946 9.37232 18.8042 9.22631C18.8126 9.09956 18.7603 8.97639 18.6632 8.89443C18.5514 8.8 18.3144 8.8 17.8403 8.8H12.1465L13.9465 4Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/dark/no-notifications-icon.svg b/src/assets/images/dark/no-notifications-icon.svg
new file mode 100644
index 00000000..e2c906da
--- /dev/null
+++ b/src/assets/images/dark/no-notifications-icon.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9465 4H9.34204C9.19845 4 9.12666 4 9.06328 4.02186C9.00723 4.04119 8.95618 4.07275 8.91382 4.11423C8.86592 4.16115 8.83382 4.22536 8.7696 4.35378L5.4096 11.0738C5.25626 11.3805 5.17959 11.5338 5.198 11.6585C5.21409 11.7673 5.27429 11.8647 5.36445 11.9278C5.46771 12 5.63915 12 5.98204 12H10.9465L8.5465 20L18.301 9.88425C18.6301 9.54296 18.7946 9.37232 18.8042 9.22631C18.8126 9.09956 18.7603 8.97639 18.6632 8.89443C18.5514 8.8 18.3144 8.8 17.8403 8.8H12.1465L13.9465 4Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/no-notifications-icon-selected.svg b/src/assets/images/light/no-notifications-icon-selected.svg
new file mode 100644
index 00000000..fe9657b7
--- /dev/null
+++ b/src/assets/images/light/no-notifications-icon-selected.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9465 4H9.34204C9.19845 4 9.12666 4 9.06328 4.02186C9.00723 4.04119 8.95618 4.07275 8.91382 4.11423C8.86592 4.16115 8.83382 4.22536 8.7696 4.35378L5.4096 11.0738C5.25626 11.3805 5.17959 11.5338 5.198 11.6585C5.21409 11.7673 5.27429 11.8647 5.36445 11.9278C5.46771 12 5.63915 12 5.98204 12H10.9465L8.5465 20L18.301 9.88425C18.6301 9.54296 18.7946 9.37232 18.8042 9.22631C18.8126 9.09956 18.7603 8.97639 18.6632 8.89443C18.5514 8.8 18.3144 8.8 17.8403 8.8H12.1465L13.9465 4Z" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/images/light/no-notifications-icon.svg b/src/assets/images/light/no-notifications-icon.svg
new file mode 100644
index 00000000..e2c906da
--- /dev/null
+++ b/src/assets/images/light/no-notifications-icon.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9465 4H9.34204C9.19845 4 9.12666 4 9.06328 4.02186C9.00723 4.04119 8.95618 4.07275 8.91382 4.11423C8.86592 4.16115 8.83382 4.22536 8.7696 4.35378L5.4096 11.0738C5.25626 11.3805 5.17959 11.5338 5.198 11.6585C5.21409 11.7673 5.27429 11.8647 5.36445 11.9278C5.46771 12 5.63915 12 5.98204 12H10.9465L8.5465 20L18.301 9.88425C18.6301 9.54296 18.7946 9.37232 18.8042 9.22631C18.8126 9.09956 18.7603 8.97639 18.6632 8.89443C18.5514 8.8 18.3144 8.8 17.8403 8.8H12.1465L13.9465 4Z" stroke="#8D8D8D" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/AddNetwork.vue b/src/components/AddNetwork.vue
index b5d455cb..c74aa71d 100644
--- a/src/components/AddNetwork.vue
+++ b/src/components/AddNetwork.vue
@@ -72,6 +72,9 @@ async function handleSubmit() {
           isCustom: true,
         }
         rpcStore.addNetwork(payload)
+        rpcStore.setRpcConfig({
+          ...payload,
+        })
         rpcStore.setSelectedChainId(payload.chainId)
       }
       emit('close')
@@ -150,7 +153,6 @@ async function handleSubmit() {
         <input
           id="explorerUrl"
           v-model="rpcConfig.explorerUrl"
-          required
           type="text"
           class="input-field focus:input-active"
           placeholder="e.g. https://etherscan.io"
diff --git a/src/components/AppFooter.vue b/src/components/AppFooter.vue
index bff7c3c0..2fd16d47 100644
--- a/src/components/AppFooter.vue
+++ b/src/components/AppFooter.vue
@@ -2,11 +2,13 @@
 import { computed } from 'vue'
 import { useRoute } from 'vue-router'
 
+import { useRequestStore } from '@/store/request'
 import { useUserStore } from '@/store/user'
 import { getImage } from '@/utils/getImage'
 
 const userStore = useUserStore()
 const route = useRoute()
+const requestStore = useRequestStore()
 
 const currentRoute = computed(() => {
   return route.name
@@ -105,9 +107,15 @@ function getIcon(icon: string, pathName: string) {
           }"
         >
           <img
+            v-if="requestStore.skippedRequestsForApproval.length > 0"
             :src="getIcon('notifications-icon', 'activities')"
             alt="activities"
           />
+          <img
+            v-else
+            :src="getIcon('no-notifications-icon', 'activities')"
+            alt="activities"
+          />
         </div>
         <span
           class="text-xs font-normal text-gray-100"
diff --git a/src/components/SignMessageCompact.vue b/src/components/SignMessageCompact.vue
index de3b325c..2bb373ff 100644
--- a/src/components/SignMessageCompact.vue
+++ b/src/components/SignMessageCompact.vue
@@ -35,14 +35,15 @@ function getTitle(requestMethod: string) {
 
 function getPermissionText(method, request) {
   const { params } = request
-  const { chainName } = params[0]
-  if (method === 'wallet_addEthereumChain') {
-    return chainName ? `Adding Chain - ${chainName}` : 'Adding Chain'
-  } else if (method === 'wallet_switchEthereumChain') {
-    return chainName ? `Switch Chain - ${chainName}` : 'Switch Chain'
-  } else {
-    return methodAndAction[method]
+  if (params instanceof Array && params[0]) {
+    const { chainName } = params[0]
+    if (method === 'wallet_addEthereumChain') {
+      return chainName ? `Adding Chain - ${chainName}` : 'Adding Chain'
+    } else if (method === 'wallet_switchEthereumChain') {
+      return chainName ? `Switch Chain - ${chainName}` : 'Switch Chain'
+    }
   }
+  return methodAndAction[method]
 }
 </script>
 
diff --git a/src/components/WalletButton.vue b/src/components/WalletButton.vue
index c7739b9b..dd71e5cc 100644
--- a/src/components/WalletButton.vue
+++ b/src/components/WalletButton.vue
@@ -24,7 +24,7 @@ const showRequestCountBadge = computed(() => {
 <template>
   <div class="h-full relative">
     <button
-      class="flex items-center justify-center flex-grow h-full w-full"
+      class="flex items-start justify-center flex-grow h-full w-full pt-[6px]"
       @click="onClickOfButton"
     >
       <img :src="getImage('expand-arrow.svg')" />
diff --git a/src/components/signMessageAdvancedInfo.vue b/src/components/signMessageAdvancedInfo.vue
index 8ccd6336..f65e4808 100644
--- a/src/components/signMessageAdvancedInfo.vue
+++ b/src/components/signMessageAdvancedInfo.vue
@@ -11,7 +11,7 @@ const props = defineProps({
 
 <template>
   <div
-    class="bg-black-100 p-4 break-word rounded-md overflow-hidden break-words"
+    class="bg-black-100 p-4 break-word rounded-md overflow-auto max-h-40 break-words"
   >
     <VJsonViewer :value="info"></VJsonViewer>
   </div>
diff --git a/src/pages/MFARestoreScreen.vue b/src/pages/MFARestoreScreen.vue
index ced7277d..f41376ae 100644
--- a/src/pages/MFARestoreScreen.vue
+++ b/src/pages/MFARestoreScreen.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { StateInfo, decodeJSON } from '@arcana/auth-core'
 import { Core, SecurityQuestionModule } from '@arcana/key-helper'
 import { getUniqueId } from 'json-rpc-engine'
 import { connectToParent } from 'penpal'
@@ -194,6 +195,7 @@ async function returnToParent(key: string) {
   ).promise
   const info = JSON.parse(storage.session.getItem('info') as string)
   const state = storage.local.getItem('state') as string
+  const stateInfo = decodeJSON<StateInfo>(state)
   const loginSrc = storage.local.getItem('loginSrc')
   const isStandalone =
     loginSrc === 'rn' || loginSrc === 'flutter' || loginSrc === 'unity'
@@ -206,7 +208,7 @@ async function returnToParent(key: string) {
 
   const messageId = getUniqueId()
   await handleLogin({
-    state,
+    state: stateInfo.i,
     isStandalone,
     userInfo: info,
     messageId,
diff --git a/src/pages/backCompat/signIn.vue b/src/pages/backCompat/signIn.vue
index fa9d2ae8..4a20a720 100644
--- a/src/pages/backCompat/signIn.vue
+++ b/src/pages/backCompat/signIn.vue
@@ -14,7 +14,10 @@ import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
 import { createParentConnection } from '@/utils/createParentConnection'
 import { getAuthProvider } from '@/utils/getAuthProvider'
 import { decodeJSON } from '@/utils/hash'
-import { PasswordlessLoginHandler } from '@/utils/PasswordlessLoginHandler'
+import {
+  PasswordlessLoginHandler,
+  getPasswordlessState,
+} from '@/utils/PasswordlessLoginHandler'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
 const route = useRoute()
@@ -71,7 +74,7 @@ const initPasswordlessLogin = async (email: string) => {
 
   passwordlessLoginHandler = new PasswordlessLoginHandler(email)
   const params = passwordlessLoginHandler.params()
-  const state = `passwordless-${params.sessionId}-${params.setToken}`
+  const state = getPasswordlessState(params.sessionId, params.setToken)
   const response = await provider.loginWithPasswordlessStart({
     email,
     kind: 'link',
diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index e7b69f75..ef3f5da2 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -152,21 +152,22 @@ async function initAccountHandler() {
 }
 
 function connectToParent() {
-  const sendRequest = getSendRequestFn(
-    handleRequest,
-    requestStore,
-    appStore,
-    getRequestHandler()
-  )
-  parentConnection = createParentConnection({
-    isLoggedIn: () => userStore.isLoggedIn,
-    sendRequest,
-    getPublicKey: handleGetPublicKey,
-    triggerLogout: handleLogout,
-    getUserInfo,
-    expandWallet: () => (appStore.expandWallet = true),
-  })
-  parentConnectionStore.setParentConnection(parentConnection)
+  if (!parentConnection) {
+    parentConnection = createParentConnection({
+      isLoggedIn: () => userStore.isLoggedIn,
+      sendRequest: getSendRequestFn(
+        handleRequest,
+        requestStore,
+        appStore,
+        getRequestHandler()
+      ),
+      getPublicKey: handleGetPublicKey,
+      triggerLogout: handleLogout,
+      getUserInfo,
+      expandWallet: () => (appStore.expandWallet = true),
+    })
+    parentConnectionStore.setParentConnection(parentConnection)
+  }
 }
 
 async function setTheme() {
@@ -212,9 +213,9 @@ async function setAppMode(walletType, parentConnectionInstance) {
 }
 
 async function handleLogout() {
-  appStore.sdkVersion = 'v2'
-  if (parentConnection) {
-    const parentConnectionInstance = await parentConnection.promise
+  if (parentConnectionStore.parentConnection) {
+    const parentConnectionInstance = await parentConnectionStore
+      .parentConnection.promise
     const authProvider = await getAuthProvider(appStore.id as string)
     await userStore.handleLogout(authProvider)
     parentConnectionInstance?.onEvent('disconnect')
diff --git a/src/pages/loginRedirect.vue b/src/pages/loginRedirect.vue
index 693eb340..fa3ad5d8 100644
--- a/src/pages/loginRedirect.vue
+++ b/src/pages/loginRedirect.vue
@@ -1,5 +1,10 @@
 <script setup lang="ts">
-import { GetInfoOutput, SocialLoginType } from '@arcana/auth-core'
+import {
+  GetInfoOutput,
+  SocialLoginType,
+  StateInfo,
+  decodeJSON,
+} from '@arcana/auth-core'
 import { Core, SecurityQuestionModule } from '@arcana/key-helper'
 import dayjs from 'dayjs'
 import { getUniqueId } from 'json-rpc-engine'
@@ -26,9 +31,6 @@ let channel: BroadcastChannel | null = null
 onMounted(init)
 onUnmounted(cleanup)
 
-const getLoginTypeFromState = (s: string) => {
-  return s.split('-')[0]
-}
 async function init() {
   const storage = getStorage()
   const loginSrc = storage.local.getItem('loginSrc')
@@ -37,14 +39,15 @@ async function init() {
   try {
     const state = getStateFromUrl(route.fullPath)
     storage.session.setItem('state', state)
+    const stateInfo = decodeJSON<StateInfo>(state)
+
     const connectionToParent =
       await connectToParent<RedirectParentConnectionApi>({}).promise
-    if (
-      !isStandalone &&
-      getLoginTypeFromState(state) !== SocialLoginType.passwordless
-    ) {
+
+    if (!isStandalone && stateInfo.t !== SocialLoginType.passwordless) {
       await verifyOpenerPage(state)
     }
+
     const authProvider = await getAuthProvider(`${appId}`)
     if (authProvider.isLoggedIn()) {
       const info = authProvider.getUserInfo()
@@ -84,7 +87,7 @@ async function init() {
       await handleLogin({
         connection: connectionToParent,
         userInfo,
-        state,
+        state: stateInfo.i,
         messageId,
         isStandalone,
       })
diff --git a/src/pages/signInV2.vue b/src/pages/signInV2.vue
index 6524ce1c..9ea265b9 100644
--- a/src/pages/signInV2.vue
+++ b/src/pages/signInV2.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { AuthProvider, GetInfoOutput } from '@arcana/auth-core'
-import { SocialLoginType } from '@arcana/auth-core'
+import { SocialLoginType, encodeJSON } from '@arcana/auth-core'
 import { Core, SecurityQuestionModule } from '@arcana/key-helper'
 import type { Connection } from 'penpal'
 import { toRefs, onMounted, ref, onUnmounted } from 'vue'
@@ -15,7 +15,10 @@ import { GATEWAY_URL, AUTH_NETWORK } from '@/utils/constants'
 import { createParentConnection } from '@/utils/createParentConnection'
 import { getAuthProvider } from '@/utils/getAuthProvider'
 import { decodeJSON } from '@/utils/hash'
-import { PasswordlessLoginHandler } from '@/utils/PasswordlessLoginHandler'
+import {
+  getPasswordlessState,
+  PasswordlessLoginHandler,
+} from '@/utils/PasswordlessLoginHandler'
 import { getStorage, initStorage } from '@/utils/storageWrapper'
 
 const route = useRoute()
@@ -73,7 +76,7 @@ const initPasswordlessLogin = async (email: string) => {
 
   passwordlessLoginHandler = new PasswordlessLoginHandler(email)
   const params = passwordlessLoginHandler.params()
-  const state = `passwordless-${params.sessionId}-${params.setToken}`
+  const state = getPasswordlessState(params.sessionId, params.setToken)
   const response = await provider.loginWithPasswordlessStart({
     email,
     kind: 'link',
diff --git a/src/utils/PasswordlessLoginHandler.ts b/src/utils/PasswordlessLoginHandler.ts
index aa5f8a01..87b4918e 100644
--- a/src/utils/PasswordlessLoginHandler.ts
+++ b/src/utils/PasswordlessLoginHandler.ts
@@ -1,4 +1,4 @@
-import { v4 as uuid } from 'uuid'
+import { SocialLoginType, encodeJSON } from '@arcana/auth-core'
 
 import { getRandomPrivateKey, sign, decrypt } from '@/utils/crypto'
 
@@ -142,4 +142,16 @@ const getCredentialKey = async (sessionId: string) => {
   return data.publicKey
 }
 
-export { PasswordlessLoginHandler, setCredential, getCredentialKey }
+const getPasswordlessState = (sessionId: string, setToken: string) => {
+  const state = encodeJSON({
+    t: SocialLoginType.passwordless,
+    i: `${sessionId}-${setToken}`,
+  })
+  return state
+}
+export {
+  PasswordlessLoginHandler,
+  getPasswordlessState,
+  setCredential,
+  getCredentialKey,
+}
diff --git a/src/utils/redirectUtils.ts b/src/utils/redirectUtils.ts
index 935fb8fd..f2d0db0b 100644
--- a/src/utils/redirectUtils.ts
+++ b/src/utils/redirectUtils.ts
@@ -5,6 +5,7 @@ import { RedirectParentConnectionApi } from '@/models/Connection'
 import { encrypt } from '@/utils/crypto'
 import {
   getCredentialKey,
+  getPasswordlessState,
   setCredential,
 } from '@/utils/PasswordlessLoginHandler'
 
@@ -82,7 +83,7 @@ const fetchPasswordlessResponseFromSignIn = async ({
   sessionId: string
   setToken: string
 }) => {
-  const state = `passwordless-${sessionId}-${setToken}`
+  const state = getPasswordlessState(sessionId, setToken)
   const data = await interactWithIframe<{
     status: string
     error: string | null
@@ -151,7 +152,7 @@ async function handlePasswordlessLoginV2(
   state: string,
   connection: AsyncMethodReturns<RedirectParentConnectionApi>
 ) {
-  const [, sessionId, setToken] = state.split('-')
+  const [sessionId, setToken] = state.split('-')
   const publicKey = await getCredentialKey(sessionId)
   const dataToEncrypt = {
     privateKey: info.privateKey,
diff --git a/src/utils/requestManagement.ts b/src/utils/requestManagement.ts
index 49782e69..2a5536c7 100644
--- a/src/utils/requestManagement.ts
+++ b/src/utils/requestManagement.ts
@@ -30,9 +30,13 @@ const appStore = useAppStore()
 
 async function showToast(type, message) {
   return new Promise((res) => {
-    if (type === 'error') toast.error(message)
-    if (type === 'success') toast.success(message)
-    setTimeout(() => res(true), TOAST_TIME_OUT)
+    if (appStore.expandWallet) {
+      if (type === 'error') toast.error(message)
+      if (type === 'success') toast.success(message)
+      setTimeout(() => res(true), TOAST_TIME_OUT)
+    } else {
+      res(true)
+    }
   })
 }
 
@@ -323,7 +327,6 @@ async function processRequest({ request, isPermissionGranted }, keeper) {
       try {
         const response = await keeper.request(request)
         await keeper.reply(request.method, response)
-        console.log(response)
         if (response.error) {
           if (response.error.data?.originalError) {
             await showToast(

From aac58d854e4cbdc4fcfedd40d052083620756b78 Mon Sep 17 00:00:00 2001
From: makylfang <makyl@newfang.io>
Date: Thu, 22 Jun 2023 10:00:02 +0400
Subject: [PATCH 153/153] Fixed reading session from session instead of local
 in MFA restore (#373)

---
 src/pages/MFARestoreScreen.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/MFARestoreScreen.vue b/src/pages/MFARestoreScreen.vue
index f41376ae..00b2129d 100644
--- a/src/pages/MFARestoreScreen.vue
+++ b/src/pages/MFARestoreScreen.vue
@@ -194,7 +194,7 @@ async function returnToParent(key: string) {
     {}
   ).promise
   const info = JSON.parse(storage.session.getItem('info') as string)
-  const state = storage.local.getItem('state') as string
+  const state = storage.session.getItem('state') as string
   const stateInfo = decodeJSON<StateInfo>(state)
   const loginSrc = storage.local.getItem('loginSrc')
   const isStandalone =