From ccafdeaa562b8641130a28c017d4e56cd6a1a001 Mon Sep 17 00:00:00 2001
From: Ilias Trichopoulos <hlias.nop@gmail.com>
Date: Fri, 1 Sep 2023 17:04:26 +0300
Subject: [PATCH] Clean up

---
 src/api/transactions.ts                       |   8 +-
 src/components/DashboardHeaderActions.tsx     |  27 ++---
 src/contexts/SendContext.tsx                  |  27 ++---
 .../walletConnect/WalletConnectContext.tsx    |  69 ++++++------
 ...x => WalletConnectSessionRequestModal.tsx} | 104 +++++++++---------
 src/screens/SendReceive/Send/VerifyScreen.tsx |  33 +++---
 src/screens/WalletConnectPairingsModal.tsx    |  13 +--
 src/types/walletConnect.ts                    |   2 +-
 8 files changed, 130 insertions(+), 153 deletions(-)
 rename src/contexts/walletConnect/{WalletConnectTxModal.tsx => WalletConnectSessionRequestModal.tsx} (69%)

diff --git a/src/api/transactions.ts b/src/api/transactions.ts
index dbddc868..5321d73b 100644
--- a/src/api/transactions.ts
+++ b/src/api/transactions.ts
@@ -40,9 +40,7 @@ export const buildSweepTransactions = async (fromAddress: Address, toAddressHash
 export const buildUnsignedTransactions = async (
   fromAddress: Address,
   toAddressHash: string,
-  assetAmounts: AssetAmount[],
-  gasAmount?: number,
-  gasPrice?: string
+  assetAmounts: AssetAmount[]
 ) => {
   const assetsWithAvailableBalance = getAddressAssetsAvailableBalance(fromAddress).filter(
     (asset) => asset.availableBalance > 0
@@ -60,9 +58,7 @@ export const buildUnsignedTransactions = async (
     const data = await buildTransferTransaction({
       fromAddress,
       toAddress: toAddressHash,
-      assetAmounts,
-      gasAmount,
-      gasPrice
+      assetAmounts
     })
 
     return {
diff --git a/src/components/DashboardHeaderActions.tsx b/src/components/DashboardHeaderActions.tsx
index 964d2b4f..9518542b 100644
--- a/src/components/DashboardHeaderActions.tsx
+++ b/src/components/DashboardHeaderActions.tsx
@@ -47,11 +47,11 @@ const DashboardHeaderActions = ({ style }: DashboardHeaderActionsProps) => {
   const isCameraOpen = useAppSelector((s) => s.app.isCameraOpen)
   const dispatch = useAppDispatch()
   const posthog = usePostHog()
-  const { pair, walletConnectClient, activeSessions } = useWalletConnectContext()
+  const { pairWithDapp, walletConnectClient, activeSessions } = useWalletConnectContext()
   const {
-    ref: currentConnectionsModalRef,
-    open: openCurrentConnectionsModal,
-    close: closeCurrentConnectionsModal
+    ref: currentWalletConnectConnectionsModalRef,
+    open: openCurrentWalletConnectConnectionsModal,
+    close: closeCurrentWalletConnectConnectionsModal
   } = useModalize()
 
   const openQRCodeScannerModal = () => dispatch(cameraToggled(true))
@@ -62,14 +62,10 @@ const DashboardHeaderActions = ({ style }: DashboardHeaderActionsProps) => {
 
   const handleQRCodeScan = async (text: string) => {
     if (isAddressValid(text)) {
-      navigation.navigate('SendNavigation', {
-        screen: 'OriginScreen',
-        params: { toAddressHash: text }
-      })
-
+      navigation.navigate('SendNavigation', { screen: 'OriginScreen', params: { toAddressHash: text } })
       posthog?.capture('Send: Captured destination address by scanning QR code from Dashboard')
     } else if (text.startsWith('wc:')) {
-      pair(text)
+      pairWithDapp(text)
     }
   }
 
@@ -86,7 +82,12 @@ const DashboardHeaderActions = ({ style }: DashboardHeaderActionsProps) => {
           variant={isMnemonicBackedUp ? 'default' : 'alert'}
         />
         {walletConnectClient && activeSessions.length > 0 && (
-          <Button onPress={() => openCurrentConnectionsModal()} Icon={Radio} type="transparent" variant="accent" />
+          <Button
+            onPress={() => openCurrentWalletConnectConnectionsModal()}
+            Icon={Radio}
+            type="transparent"
+            variant="accent"
+          />
         )}
         <Button onPress={openQRCodeScannerModal} Icon={ScanLine} type="transparent" />
         <Button onPress={() => navigation.navigate('SettingsScreen')} Icon={Settings} type="transparent" />
@@ -100,8 +101,8 @@ const DashboardHeaderActions = ({ style }: DashboardHeaderActionsProps) => {
       )}
 
       <Portal>
-        <Modalize ref={currentConnectionsModalRef}>
-          <WalletConnectPairingsModal onClose={closeCurrentConnectionsModal} />
+        <Modalize ref={currentWalletConnectConnectionsModalRef}>
+          <WalletConnectPairingsModal onClose={closeCurrentWalletConnectConnectionsModal} />
         </Modalize>
       </Portal>
     </>
diff --git a/src/contexts/SendContext.tsx b/src/contexts/SendContext.tsx
index 459c15ce..326cce18 100644
--- a/src/contexts/SendContext.tsx
+++ b/src/contexts/SendContext.tsx
@@ -48,11 +48,11 @@ interface SendContextValue {
   setToAddress: (toAddress: AddressHash) => void
   fromAddress?: AddressHash
   setFromAddress: (toAddress: AddressHash) => void
-  setAssetAmount: (assetId: string, amount?: bigint) => void
   assetAmounts: AssetAmount[]
+  setAssetAmount: (assetId: string, amount?: bigint) => void
   fees: bigint
   buildTransaction: (callbacks: BuildTransactionCallbacks) => Promise<void>
-  sendTransaction: (onSendSuccess: (signature?: string) => void) => Promise<void>
+  sendTransaction: (onSendSuccess: () => void) => Promise<void>
 }
 
 const initialValues: SendContextValue = {
@@ -60,8 +60,8 @@ const initialValues: SendContextValue = {
   setToAddress: () => null,
   fromAddress: undefined,
   setFromAddress: () => null,
-  setAssetAmount: () => null,
   assetAmounts: [],
+  setAssetAmount: () => null,
   fees: BigInt(0),
   buildTransaction: () => Promise.resolve(undefined),
   sendTransaction: () => Promise.resolve(undefined)
@@ -116,13 +116,10 @@ export const SendContextProvider = ({ children }: { children: ReactNode }) => {
 
   const buildTransaction = useCallback(
     async (callbacks: BuildTransactionCallbacks) => {
-      if (!address) return
+      if (!address || !toAddress) return
 
       try {
-        if (!toAddress) throw new Error('Destination address not set')
-
         const data = await buildUnsignedTransactions(address, toAddress, assetAmounts)
-
         setUnsignedTxData(data)
         callbacks.onBuildSuccess()
       } catch (e) {
@@ -144,22 +141,20 @@ export const SendContextProvider = ({ children }: { children: ReactNode }) => {
   )
 
   const sendTransaction = useCallback(
-    async (onSendSuccess: (signature?: string) => void) => {
-      if (!address) return
+    async (onSendSuccess: () => void) => {
+      if (!address || !toAddress) return
 
       const { attoAlphAmount, tokens } = getTransactionAssetAmounts(assetAmounts)
-      let signature
 
       try {
         for (const { txId, unsignedTx } of unsignedTxData.unsignedTxs) {
           const data = await signAndSendTransaction(address, txId, unsignedTx)
-          signature = data.signature
 
           dispatch(
             transactionSent({
               hash: data.txId,
               fromAddress: address.hash,
-              toAddress: consolidationRequired ? address.hash : toAddress ?? '',
+              toAddress: consolidationRequired ? address.hash : toAddress,
               amount: attoAlphAmount,
               tokens,
               timestamp: new Date().getTime(),
@@ -169,9 +164,7 @@ export const SendContextProvider = ({ children }: { children: ReactNode }) => {
           )
         }
 
-        console.log('SUCCESS SENDING')
-
-        onSendSuccess(signature)
+        onSendSuccess()
 
         posthog?.capture('Send: Sent transaction', { tokens: tokens.length })
       } catch (e) {
@@ -180,7 +173,7 @@ export const SendContextProvider = ({ children }: { children: ReactNode }) => {
         posthog?.capture('Error', { message: 'Could not send transaction' })
       }
     },
-    [address, assetAmounts, consolidationRequired, dispatch, posthog, toAddress, unsignedTxData]
+    [address, assetAmounts, consolidationRequired, dispatch, posthog, toAddress, unsignedTxData.unsignedTxs]
   )
 
   const authenticateAndSend = useCallback(
@@ -202,8 +195,8 @@ export const SendContextProvider = ({ children }: { children: ReactNode }) => {
         setToAddress,
         fromAddress,
         setFromAddress,
-        setAssetAmount,
         assetAmounts,
+        setAssetAmount,
         fees: unsignedTxData.fees,
         buildTransaction,
         sendTransaction: authenticateAndSend
diff --git a/src/contexts/walletConnect/WalletConnectContext.tsx b/src/contexts/walletConnect/WalletConnectContext.tsx
index 597e7bcc..48961ea0 100644
--- a/src/contexts/walletConnect/WalletConnectContext.tsx
+++ b/src/contexts/walletConnect/WalletConnectContext.tsx
@@ -51,32 +51,37 @@ import {
 import Modalize from '~/components/layout/Modalize'
 import SpinnerModal from '~/components/SpinnerModal'
 import WalletConnectSessionProposalModal from '~/contexts/walletConnect/WalletConnectSessionProposalModal'
-import WalletConnectTxModal from '~/contexts/walletConnect/WalletConnectTxModal'
+import WalletConnectSessionRequestModal from '~/contexts/walletConnect/WalletConnectSessionRequestModal'
 import { useAppSelector } from '~/hooks/redux'
 import { selectAllAddresses } from '~/store/addressesSlice'
 import { Address } from '~/types/addresses'
 import { CallContractTxData, DeployContractTxData, TransferTxData } from '~/types/transactions'
-import { SessionProposalEvent, SessionRequestEvent, TxData } from '~/types/walletConnect'
+import { SessionProposalEvent, SessionRequestData, SessionRequestEvent } from '~/types/walletConnect'
 import { WALLETCONNECT_ERRORS } from '~/utils/constants'
 import { getActiveWalletConnectSessions, isNetworkValid, parseSessionProposalEvent } from '~/utils/walletConnect'
 
 interface WalletConnectContextValue {
   walletConnectClient?: SignClient
-  pair: (uri: string) => Promise<void>
-  unpair: (pairingTopic: string) => Promise<void>
+  pairWithDapp: (uri: string) => Promise<void>
+  unpairFromDapp: (pairingTopic: string) => Promise<void>
   activeSessions: SessionTypes.Struct[]
 }
 
 const initialValues: WalletConnectContextValue = {
   walletConnectClient: undefined,
-  pair: () => Promise.resolve(),
-  unpair: () => Promise.resolve(),
+  pairWithDapp: () => Promise.resolve(),
+  unpairFromDapp: () => Promise.resolve(),
   activeSessions: []
 }
 
 const WalletConnectContext = createContext(initialValues)
 
 export const WalletConnectContextProvider = ({ children }: { children: ReactNode }) => {
+  const currentNetworkId = useAppSelector((s) => s.network.settings.networkId)
+  const currentNetworkName = useAppSelector((s) => s.network.name)
+  const addresses = useAppSelector(selectAllAddresses)
+  const posthog = usePostHog()
+
   const {
     ref: sessionProposalModalRef,
     open: openSessionProposalModal,
@@ -87,18 +92,14 @@ export const WalletConnectContextProvider = ({ children }: { children: ReactNode
     open: openSessionRequestModal,
     close: closeSessionRequestModal
   } = useModalize()
-  const currentNetworkId = useAppSelector((s) => s.network.settings.networkId)
-  const currentNetworkName = useAppSelector((s) => s.network.name)
-  const addresses = useAppSelector(selectAllAddresses)
-  const posthog = usePostHog()
 
   const [walletConnectClient, setWalletConnectClient] = useState<WalletConnectContextValue['walletConnectClient']>()
   const [activeSessions, setActiveSessions] = useState<SessionTypes.Struct[]>([])
   const [sessionProposalEvent, setSessionProposalEvent] = useState<SessionProposalEvent>()
   const [sessionRequestEvent, setSessionRequestEvent] = useState<SessionRequestEvent>()
-  const [loading, setLoading] = useState('')
-  const [txData, setTxData] = useState<TxData>()
+  const [sessionRequestData, setSessionRequestData] = useState<SessionRequestData>()
   const [isSessionRequestModalOpen, setIsSessionRequestModalOpen] = useState(false)
+  const [loading, setLoading] = useState('')
 
   const activeSessionMetadata = activeSessions.find((s) => s.topic === sessionRequestEvent?.topic)?.peer.metadata
 
@@ -161,6 +162,7 @@ export const WalletConnectContextProvider = ({ children }: { children: ReactNode
             ]
 
             const fromAddress = addresses.find((address) => address.hash === signerAddress)
+
             if (!fromAddress) {
               return respondToWalletConnectWithError(requestEvent, {
                 message: 'Signer address doesn\t exist',
@@ -183,7 +185,7 @@ export const WalletConnectContextProvider = ({ children }: { children: ReactNode
             console.log('✅ BUILDING TX: DONE!')
             setLoading('')
 
-            setTxData({
+            setSessionRequestData({
               type: 'transfer',
               wcData: wcTxData,
               unsignedTxData: buildTransactionTxResult
@@ -229,7 +231,7 @@ export const WalletConnectContextProvider = ({ children }: { children: ReactNode
             console.log('✅ BUILDING TX: DONE!')
             setLoading('')
 
-            setTxData({
+            setSessionRequestData({
               type: 'deploy-contract',
               wcData: wcTxData,
               unsignedTxData: buildDeployContractTxResult
@@ -287,7 +289,7 @@ export const WalletConnectContextProvider = ({ children }: { children: ReactNode
             console.log('✅ BUILDING TX: DONE!')
             setLoading('')
 
-            setTxData({
+            setSessionRequestData({
               type: 'call-contract',
               wcData: wcTxData,
               unsignedTxData: buildCallContractTxResult
@@ -318,7 +320,7 @@ export const WalletConnectContextProvider = ({ children }: { children: ReactNode
             break
           }
           default:
-            // TODO: support all of the other SignerProvider methods
+            // TODO: Support all of the other SignerProvider methods
             respondToWalletConnectWithError(requestEvent, getSdkError('WC_METHOD_UNSUPPORTED'))
         }
       } catch (e) {
@@ -329,7 +331,7 @@ export const WalletConnectContextProvider = ({ children }: { children: ReactNode
         posthog?.capture('Error', { message: 'Could not build transaction' })
       }
     },
-    // The `addresses` depedency causes re-rendering when any property of an Address changes, even though we only need
+    // The `addresses` dependency causes re-rendering when any property of an Address changes, even though we only need
     // the `hash`, the `publicKey`, and the `privateKey`. Creating a selector that extracts those 3 doesn't help.
     // TODO: Figure out a way to avoid re-renders
     [
@@ -438,7 +440,7 @@ export const WalletConnectContextProvider = ({ children }: { children: ReactNode
     walletConnectClient
   ])
 
-  const pair = useCallback(
+  const pairWithDapp = useCallback(
     async (uri: string) => {
       if (!walletConnectClient) return
 
@@ -487,7 +489,7 @@ export const WalletConnectContextProvider = ({ children }: { children: ReactNode
     [onSessionProposal, walletConnectClient]
   )
 
-  const unpair = useCallback(
+  const unpairFromDapp = useCallback(
     async (topic: string) => {
       if (!walletConnectClient) return
 
@@ -569,16 +571,14 @@ export const WalletConnectContextProvider = ({ children }: { children: ReactNode
     try {
       setLoading('Approving...')
       console.log('⏳ APPROVING PROPOSAL...')
-
       const { topic, acknowledged } = await walletConnectClient.approve({ id, relayProtocol, namespaces })
+      console.log('👉 APPROVAL TOPIC RECEIVED:', topic)
+      console.log('✅ APPROVING: DONE!')
 
-      console.log('⏳ APPROVAL TOPIC RECEIVED:', topic)
       console.log('⏳ WAITING FOR DAPP ACKNOWLEDGEMENT...')
       const res = await acknowledged()
       console.log('👉 DID DAPP ACTUALLY ACKNOWLEDGE?', res.acknowledged)
 
-      console.log('✅ APPROVING: DONE!')
-
       setSessionProposalEvent(undefined)
       setActiveSessions(getActiveWalletConnectSessions(walletConnectClient))
 
@@ -592,8 +592,7 @@ export const WalletConnectContextProvider = ({ children }: { children: ReactNode
   }
 
   const rejectProposal = async () => {
-    if (!walletConnectClient) return
-    if (sessionProposalEvent === undefined) return
+    if (!walletConnectClient || sessionProposalEvent === undefined) return
 
     try {
       setLoading('Rejecting...')
@@ -639,7 +638,7 @@ export const WalletConnectContextProvider = ({ children }: { children: ReactNode
     } finally {
       console.log('👉 RESETTING SESSION REQUEST EVENT.')
       setSessionRequestEvent(undefined)
-      setTxData(undefined)
+      setSessionRequestData(undefined)
       setLoading('')
     }
   }
@@ -656,16 +655,16 @@ export const WalletConnectContextProvider = ({ children }: { children: ReactNode
     } finally {
       console.log('👉 RESETTING SESSION REQUEST EVENT.')
       setSessionRequestEvent(undefined)
-      setTxData(undefined)
+      setSessionRequestData(undefined)
     }
   }
 
-  const handleTxModalClose = async () => {
+  const handleSessionRequestModalClose = async () => {
     setIsSessionRequestModalOpen(false)
-    onTxModalClose()
+    onSessionRequestModalClose()
   }
 
-  const onTxModalClose = async () => {
+  const onSessionRequestModalClose = async () => {
     console.log('👉 CLOSING MODAL.')
 
     if (sessionRequestEvent && walletConnectClient && walletConnectClient?.getPendingSessionRequests().length > 0) {
@@ -679,7 +678,7 @@ export const WalletConnectContextProvider = ({ children }: { children: ReactNode
   }, [closeSessionRequestModal, isSessionRequestModalOpen, sessionRequestEvent])
 
   return (
-    <WalletConnectContext.Provider value={{ pair, unpair, walletConnectClient, activeSessions }}>
+    <WalletConnectContext.Provider value={{ pairWithDapp, unpairFromDapp, walletConnectClient, activeSessions }}>
       {children}
       <Portal>
         <Modalize ref={sessionProposalModalRef}>
@@ -695,11 +694,11 @@ export const WalletConnectContextProvider = ({ children }: { children: ReactNode
         <Modalize
           ref={walletConnectSessionRequestModalRef}
           onOpen={() => setIsSessionRequestModalOpen(true)}
-          onClose={handleTxModalClose}
+          onClose={handleSessionRequestModalClose}
         >
-          {txData && (
-            <WalletConnectTxModal
-              txData={txData}
+          {sessionRequestData && (
+            <WalletConnectSessionRequestModal
+              requestData={sessionRequestData}
               onApprove={handleApprovePress}
               onReject={handleRejectPress}
               metadata={activeSessionMetadata}
diff --git a/src/contexts/walletConnect/WalletConnectTxModal.tsx b/src/contexts/walletConnect/WalletConnectSessionRequestModal.tsx
similarity index 69%
rename from src/contexts/walletConnect/WalletConnectTxModal.tsx
rename to src/contexts/walletConnect/WalletConnectSessionRequestModal.tsx
index c672b32e..095f52ad 100644
--- a/src/contexts/walletConnect/WalletConnectTxModal.tsx
+++ b/src/contexts/walletConnect/WalletConnectSessionRequestModal.tsx
@@ -45,11 +45,11 @@ import { BottomModalScreenTitle, BottomScreenSection, ScreenSection } from '~/co
 import ScrollScreen, { ScrollScreenProps } from '~/components/layout/ScrollScreen'
 import { useAppDispatch } from '~/hooks/redux'
 import { transactionSent } from '~/store/addressesSlice'
-import { TxData } from '~/types/walletConnect'
+import { SessionRequestData } from '~/types/walletConnect'
 import { getTransactionAssetAmounts } from '~/utils/transactions'
 
-interface WalletConnectTxModalProps<T extends TxData> extends ModalProps<ScrollScreenProps> {
-  txData: T
+interface WalletConnectSessionRequestModalProps<T extends SessionRequestData> extends ModalProps<ScrollScreenProps> {
+  requestData: T
   onApprove: (
     sendTransaction: () => Promise<
       SignTransferTxResult | SignExecuteScriptTxResult | SignDeployContractTxResult | undefined
@@ -59,37 +59,37 @@ interface WalletConnectTxModalProps<T extends TxData> extends ModalProps<ScrollS
   metadata?: SessionTypes.Struct['peer']['metadata']
 }
 
-const WalletConnectTxModal = <T extends TxData>({
-  txData,
+const WalletConnectSessionRequestModal = <T extends SessionRequestData>({
+  requestData,
   onApprove,
   onReject,
   metadata,
   ...props
-}: WalletConnectTxModalProps<T>) => {
+}: WalletConnectSessionRequestModalProps<T>) => {
   const posthog = usePostHog()
   const dispatch = useAppDispatch()
 
-  const fees = BigInt(txData.unsignedTxData.gasAmount) * BigInt(txData.unsignedTxData.gasPrice)
+  const fees = BigInt(requestData.unsignedTxData.gasAmount) * BigInt(requestData.unsignedTxData.gasPrice)
 
   const handleApprovePress = () => onApprove(sendTransaction)
 
   const sendTransaction = async () => {
     try {
       const data = await signAndSendTransaction(
-        txData.wcData.fromAddress,
-        txData.unsignedTxData.txId,
-        txData.unsignedTxData.unsignedTx
+        requestData.wcData.fromAddress,
+        requestData.unsignedTxData.txId,
+        requestData.unsignedTxData.unsignedTx
       )
 
-      switch (txData.type) {
+      switch (requestData.type) {
         case 'transfer': {
-          const { attoAlphAmount, tokens } = getTransactionAssetAmounts(txData.wcData.assetAmounts)
+          const { attoAlphAmount, tokens } = getTransactionAssetAmounts(requestData.wcData.assetAmounts)
 
           dispatch(
             transactionSent({
               hash: data.txId,
-              fromAddress: txData.wcData.fromAddress.hash,
-              toAddress: txData.wcData.toAddress,
+              fromAddress: requestData.wcData.fromAddress.hash,
+              toAddress: requestData.wcData.toAddress,
               amount: attoAlphAmount,
               tokens,
               timestamp: new Date().getTime(),
@@ -101,24 +101,24 @@ const WalletConnectTxModal = <T extends TxData>({
           posthog?.capture('WC: Approved transfer')
 
           return {
-            fromGroup: txData.unsignedTxData.fromGroup,
-            toGroup: txData.unsignedTxData.toGroup,
-            unsignedTx: txData.unsignedTxData.unsignedTx,
-            txId: txData.unsignedTxData.txId,
+            fromGroup: requestData.unsignedTxData.fromGroup,
+            toGroup: requestData.unsignedTxData.toGroup,
+            unsignedTx: requestData.unsignedTxData.unsignedTx,
+            txId: requestData.unsignedTxData.txId,
             signature: data.signature,
-            gasAmount: txData.unsignedTxData.gasAmount,
-            gasPrice: BigInt(txData.unsignedTxData.gasPrice)
+            gasAmount: requestData.unsignedTxData.gasAmount,
+            gasPrice: BigInt(requestData.unsignedTxData.gasPrice)
           } as SignTransferTxResult
         }
         case 'call-contract': {
-          const { attoAlphAmount, tokens } = txData.wcData.assetAmounts
-            ? getTransactionAssetAmounts(txData.wcData.assetAmounts)
+          const { attoAlphAmount, tokens } = requestData.wcData.assetAmounts
+            ? getTransactionAssetAmounts(requestData.wcData.assetAmounts)
             : { attoAlphAmount: undefined, tokens: undefined }
 
           dispatch(
             transactionSent({
               hash: data.txId,
-              fromAddress: txData.wcData.fromAddress.hash,
+              fromAddress: requestData.wcData.fromAddress.hash,
               amount: attoAlphAmount,
               tokens,
               timestamp: new Date().getTime(),
@@ -130,19 +130,19 @@ const WalletConnectTxModal = <T extends TxData>({
           posthog?.capture('WC: Approved contract call')
 
           return {
-            groupIndex: txData.unsignedTxData.fromGroup,
-            unsignedTx: txData.unsignedTxData.unsignedTx,
-            txId: txData.unsignedTxData.txId,
+            groupIndex: requestData.unsignedTxData.fromGroup,
+            unsignedTx: requestData.unsignedTxData.unsignedTx,
+            txId: requestData.unsignedTxData.txId,
             signature: data.signature,
-            gasAmount: txData.unsignedTxData.gasAmount,
-            gasPrice: BigInt(txData.unsignedTxData.gasPrice)
+            gasAmount: requestData.unsignedTxData.gasAmount,
+            gasPrice: BigInt(requestData.unsignedTxData.gasPrice)
           } as SignExecuteScriptTxResult
         }
         case 'deploy-contract': {
           dispatch(
             transactionSent({
               hash: data.txId,
-              fromAddress: txData.wcData.fromAddress.hash,
+              fromAddress: requestData.wcData.fromAddress.hash,
               timestamp: new Date().getTime(),
               status: 'pending',
               type: 'deploy-contract'
@@ -152,14 +152,14 @@ const WalletConnectTxModal = <T extends TxData>({
           posthog?.capture('WC: Approved contract deployment')
 
           return {
-            groupIndex: txData.unsignedTxData.fromGroup,
-            unsignedTx: txData.unsignedTxData.unsignedTx,
-            txId: txData.unsignedTxData.txId,
+            groupIndex: requestData.unsignedTxData.fromGroup,
+            unsignedTx: requestData.unsignedTxData.unsignedTx,
+            txId: requestData.unsignedTxData.txId,
             signature: data.signature,
-            contractAddress: txData.unsignedTxData.contractAddress,
-            contractId: binToHex(contractIdFromAddress(txData.unsignedTxData.contractAddress)),
-            gasAmount: txData.unsignedTxData.gasAmount,
-            gasPrice: BigInt(txData.unsignedTxData.gasPrice)
+            contractAddress: requestData.unsignedTxData.contractAddress,
+            contractId: binToHex(contractIdFromAddress(requestData.unsignedTxData.contractAddress)),
+            gasAmount: requestData.unsignedTxData.gasAmount,
+            gasPrice: BigInt(requestData.unsignedTxData.gasPrice)
           } as SignDeployContractTxResult
         }
       }
@@ -183,7 +183,7 @@ const WalletConnectTxModal = <T extends TxData>({
                 transfer: 'Transfer request',
                 'call-contract': 'Smart contract request',
                 'deploy-contract': 'Smart contract request'
-              }[txData.type]
+              }[requestData.type]
             }
           </BottomModalScreenTitle>
           {metadata.url && (
@@ -195,22 +195,22 @@ const WalletConnectTxModal = <T extends TxData>({
       )}
       <ScreenSection>
         <BoxSurface>
-          {(txData.type === 'transfer' || txData.type === 'call-contract') &&
-            txData.wcData.assetAmounts &&
-            txData.wcData.assetAmounts.length > 0 && (
+          {(requestData.type === 'transfer' || requestData.type === 'call-contract') &&
+            requestData.wcData.assetAmounts &&
+            requestData.wcData.assetAmounts.length > 0 && (
               <HighlightRow title="Sending" titleColor="secondary">
                 <AssetAmounts>
-                  {txData.wcData.assetAmounts.map(({ id, amount }) =>
+                  {requestData.wcData.assetAmounts.map(({ id, amount }) =>
                     amount ? <AssetAmountWithLogo key={id} assetId={id} logoSize={18} amount={BigInt(amount)} /> : null
                   )}
                 </AssetAmounts>
               </HighlightRow>
             )}
           <HighlightRow title="From" titleColor="secondary">
-            <AddressBadge addressHash={txData.wcData.fromAddress.hash} />
+            <AddressBadge addressHash={requestData.wcData.fromAddress.hash} />
           </HighlightRow>
 
-          {txData.type === 'deploy-contract' || txData.type === 'call-contract' ? (
+          {requestData.type === 'deploy-contract' || requestData.type === 'call-contract' ? (
             metadata?.name && (
               <HighlightRow title="To" titleColor="secondary">
                 <AppText semiBold>{metadata.name}</AppText>
@@ -218,32 +218,32 @@ const WalletConnectTxModal = <T extends TxData>({
             )
           ) : (
             <HighlightRow title="To" titleColor="secondary">
-              <AddressBadge addressHash={txData.wcData.toAddress} />
+              <AddressBadge addressHash={requestData.wcData.toAddress} />
             </HighlightRow>
           )}
 
-          {txData.type === 'deploy-contract' && (
+          {requestData.type === 'deploy-contract' && (
             <>
-              {!!txData.wcData.initialAlphAmount?.amount && (
+              {!!requestData.wcData.initialAlphAmount?.amount && (
                 <HighlightRow title="Initial amount" titleColor="secondary">
                   <AssetAmountWithLogo
                     assetId={ALPH.id}
                     logoSize={18}
-                    amount={BigInt(txData.wcData.initialAlphAmount.amount)}
+                    amount={BigInt(requestData.wcData.initialAlphAmount.amount)}
                   />
                 </HighlightRow>
               )}
-              {txData.wcData.issueTokenAmount && (
+              {requestData.wcData.issueTokenAmount && (
                 <HighlightRow title="Issue token amount" titleColor="secondary">
-                  <AppText>{txData.wcData.issueTokenAmount}</AppText>
+                  <AppText>{requestData.wcData.issueTokenAmount}</AppText>
                 </HighlightRow>
               )}
             </>
           )}
 
-          {(txData.type === 'deploy-contract' || txData.type === 'call-contract') && (
+          {(requestData.type === 'deploy-contract' || requestData.type === 'call-contract') && (
             <HighlightRow title="Bytecode" titleColor="secondary">
-              <AppText>{txData.wcData.bytecode}</AppText>
+              <AppText>{requestData.wcData.bytecode}</AppText>
             </HighlightRow>
           )}
         </BoxSurface>
@@ -266,7 +266,7 @@ const WalletConnectTxModal = <T extends TxData>({
   )
 }
 
-export default WalletConnectTxModal
+export default WalletConnectSessionRequestModal
 
 const AssetAmounts = styled.View`
   gap: 5px;
diff --git a/src/screens/SendReceive/Send/VerifyScreen.tsx b/src/screens/SendReceive/Send/VerifyScreen.tsx
index 60a66e90..89924b25 100644
--- a/src/screens/SendReceive/Send/VerifyScreen.tsx
+++ b/src/screens/SendReceive/Send/VerifyScreen.tsx
@@ -47,15 +47,12 @@ const VerifyScreen = ({ navigation, ...props }: ScreenProps) => {
     navigation.getParent()?.setOptions({
       headerLeft: () => <BackButton onPress={() => navigation.goBack()} />,
       headerRight: () => (
-        <ContinueButton
-          text="Send"
-          onPress={async () => sendTransaction(() => navigation.navigate('TransfersScreen'))}
-        />
+        <ContinueButton text="Send" onPress={() => sendTransaction(() => navigation.navigate('TransfersScreen'))} />
       )
     })
   })
 
-  if (!fromAddress) return null
+  if (!fromAddress || !toAddress || assetAmounts.length < 1) return null
 
   return (
     <ScrollScreen {...props}>
@@ -66,20 +63,18 @@ const VerifyScreen = ({ navigation, ...props }: ScreenProps) => {
       />
       <ScreenSection>
         <BoxSurface>
-          {assetAmounts.length > 0 && (
-            <HighlightRow title="Sending" titleColor="secondary">
-              <AssetAmounts>
-                {assets.map(({ id, amount }) =>
-                  amount ? <AssetAmountWithLogo key={id} assetId={id} logoSize={18} amount={BigInt(amount)} /> : null
-                )}
-              </AssetAmounts>
-            </HighlightRow>
-          )}
-          {toAddress && (
-            <HighlightRow title="To" titleColor="secondary">
-              <AddressBadge addressHash={toAddress} />
-            </HighlightRow>
-          )}
+          <HighlightRow title="Sending" titleColor="secondary">
+            <AssetAmounts>
+              {assets.map(({ id, amount }) =>
+                amount ? <AssetAmountWithLogo key={id} assetId={id} logoSize={18} amount={BigInt(amount)} /> : null
+              )}
+            </AssetAmounts>
+          </HighlightRow>
+
+          <HighlightRow title="To" titleColor="secondary">
+            <AddressBadge addressHash={toAddress} />
+          </HighlightRow>
+
           <HighlightRow title="From" titleColor="secondary">
             <AddressBadge addressHash={fromAddress} />
           </HighlightRow>
diff --git a/src/screens/WalletConnectPairingsModal.tsx b/src/screens/WalletConnectPairingsModal.tsx
index 016ed7db..c01a7139 100644
--- a/src/screens/WalletConnectPairingsModal.tsx
+++ b/src/screens/WalletConnectPairingsModal.tsx
@@ -28,14 +28,8 @@ import { ScrollScreenProps } from '~/components/layout/ScrollScreen'
 import ListItem from '~/components/ListItem'
 import { useWalletConnectContext } from '~/contexts/walletConnect/WalletConnectContext'
 
-type WalletConnectPairingsModalProps = ModalProps<ScrollScreenProps>
-
-const WalletConnectPairingsModal = ({ onClose, ...props }: WalletConnectPairingsModalProps) => {
-  const { unpair, walletConnectClient, activeSessions } = useWalletConnectContext()
-
-  // ActiveSessions.map((p) => console.log(p))
-  // walletConnectClient?.core.history.pending.map((p) => console.log(p))
-  // walletConnectClient?.session.values.map((p) => console.log(p))
+const WalletConnectPairingsModal = ({ onClose, ...props }: ModalProps<ScrollScreenProps>) => {
+  const { unpairFromDapp, walletConnectClient, activeSessions } = useWalletConnectContext()
 
   useEffect(() => {
     if (!walletConnectClient || activeSessions.length === 0) {
@@ -44,8 +38,7 @@ const WalletConnectPairingsModal = ({ onClose, ...props }: WalletConnectPairings
   }, [activeSessions.length, onClose, walletConnectClient])
 
   const handleDisconnectPress = async (pairingTopic: string) => {
-    await unpair(pairingTopic)
-    // setActiveSessions(getActiveWalletConnectSessions(walletConnectClient))
+    await unpairFromDapp(pairingTopic)
   }
 
   return (
diff --git a/src/types/walletConnect.ts b/src/types/walletConnect.ts
index c52f8527..3ba04608 100644
--- a/src/types/walletConnect.ts
+++ b/src/types/walletConnect.ts
@@ -28,7 +28,7 @@ export type SessionRequestEvent = SignClientTypes.EventArguments['session_reques
 
 export type SessionProposalEvent = Pick<SignClientTypes.EventArguments['session_proposal'], 'id' | 'params'>
 
-export type TxData =
+export type SessionRequestData =
   | {
       type: 'transfer'
       wcData: TransferTxData