diff --git a/src/app/starknetkitLatest/page.tsx b/src/app/starknetkitLatest/page.tsx
index fb50db7..ae0d14a 100644
--- a/src/app/starknetkitLatest/page.tsx
+++ b/src/app/starknetkitLatest/page.tsx
@@ -1,25 +1,25 @@
 "use client"
 
 import { AccountSection } from "@/components/AccountSection"
-import { SignMessage } from "@/components/Actions/SignMessage"
-import { Transfer } from "@/components/Actions/Transfer"
+import { AddNetworkLatest } from "@/components/Actions/AddNetwork"
+import { AddTokenLatest } from "@/components/Actions/AddToken"
+import { Declare } from "@/components/Actions/Declare"
+import { DeployLatest } from "@/components/Actions/Deploy"
+import { MintLatest } from "@/components/Actions/Mint"
+import { SignMessageLatest } from "@/components/Actions/SignMessage"
+import { TransferLatest } from "@/components/Actions/Transfer"
+import { DisconnectButton } from "@/components/DisconnectButton"
 import { Section } from "@/components/Section"
+import { ARGENT_WEBWALLET_URL } from "@/constants"
 import { useWaitForTx } from "@/hooks/useWaitForTx"
 import { walletStarknetkitLatestAtom } from "@/state/connectedWalletStarknetkitLatest"
-import { Box, Button, Flex } from "@chakra-ui/react"
+import { Flex } from "@chakra-ui/react"
 import { useAtom } from "jotai"
+import { RESET } from "jotai/utils"
 import { useRouter } from "next/navigation"
 import { useEffect } from "react"
-import { connect, disconnect } from "starknetkit-latest"
-import { RESET } from "jotai/utils"
-import { ARGENT_WEBWALLET_URL } from "@/constants"
 import { constants } from "starknet"
-import { Declare } from "@/components/Actions/Declare"
-import { Deploy } from "@/components/Actions/Deploy"
-import { Mint } from "@/components/Actions/Mint"
-import { DisconnectButton } from "@/components/DisconnectButton"
-import { AddNetworkLatest } from "@/components/Actions/AddNetwork"
-import { AddTokenLatest } from "@/components/Actions/AddToken"
+import { connect, disconnect } from "starknetkit-latest"
 
 export default function StarknetkitLatest() {
   const [wallet, setWallet] = useAtom(walletStarknetkitLatestAtom)
@@ -64,20 +64,20 @@ export default function StarknetkitLatest() {
             chainId={wallet.chainId}
           />
           <Section>
-            <Mint />
+            <MintLatest />
           </Section>
           <Section>
-            <Transfer />
+            <TransferLatest />
           </Section>
           <Section>
-            <SignMessage />
+            <SignMessageLatest />
           </Section>
           {wallet.id !== "argentWebWallet" &&
             wallet.id !== "argentMobileWallet" && (
               <Section>
                 <Flex alignItems="center" gap="10">
                   <Declare />
-                  <Deploy />
+                  <DeployLatest />
                 </Flex>
               </Section>
             )}
diff --git a/src/app/starknetkitNext/page.tsx b/src/app/starknetkitNext/page.tsx
index 487f7fa..9521060 100644
--- a/src/app/starknetkitNext/page.tsx
+++ b/src/app/starknetkitNext/page.tsx
@@ -4,14 +4,14 @@ import { AccountSection } from "@/components/AccountSection"
 import { AddNetworkNext } from "@/components/Actions/AddNetwork"
 import { AddTokenNext } from "@/components/Actions/AddToken"
 import { Declare } from "@/components/Actions/Declare"
-import { Deploy } from "@/components/Actions/Deploy"
-import { MintRpcMethod } from "@/components/Actions/MintRpcMethod"
+import { DeployNext } from "@/components/Actions/Deploy"
+import { MintNext } from "@/components/Actions/Mint"
 import { SessionKeysExecute } from "@/components/Actions/SessionKeysExecute"
 import { SessionKeysExecuteOutside } from "@/components/Actions/SessionKeysExecuteOutside"
 import { SessionKeysSign } from "@/components/Actions/SessionKeysSign"
 import { SessionKeysTypedDataOutside } from "@/components/Actions/SessionKeysTypedDataOutside"
-import { SignMessageRpcMethod } from "@/components/Actions/SignMessageRpcMethod"
-import { TransferRpcMethod } from "@/components/Actions/TransferRpcMethod"
+import { SignMessageNext } from "@/components/Actions/SignMessage"
+import { TransferNext } from "@/components/Actions/Transfer"
 import { WalletRpcMsgContainer } from "@/components/Actions/WalletRpcMsgContainer"
 import { DisconnectButton } from "@/components/DisconnectButton"
 import { Section } from "@/components/Section"
@@ -83,13 +83,13 @@ export default function StarknetkitLatest() {
             chainId={connectorData?.chainId}
           />
           <Section>
-            <MintRpcMethod />
+            <MintNext />
           </Section>
           <Section>
-            <TransferRpcMethod />
+            <TransferNext />
           </Section>
           <Section>
-            <SignMessageRpcMethod />
+            <SignMessageNext />
           </Section>
           <Section>
             <SessionKeysSign />
@@ -105,7 +105,7 @@ export default function StarknetkitLatest() {
               <Section>
                 <Flex alignItems="center" gap="10">
                   <Declare />
-                  <Deploy />
+                  <DeployNext />
                 </Flex>
               </Section>
             )}
diff --git a/src/app/withStarknetReactLatest/page.tsx b/src/app/withStarknetReactLatest/page.tsx
index 2f39784..e888374 100644
--- a/src/app/withStarknetReactLatest/page.tsx
+++ b/src/app/withStarknetReactLatest/page.tsx
@@ -1,153 +1,3 @@
-"use client"
-
-import { ConnectButton } from "@/components/ConnectButton"
-import { DeploymentData } from "@/components/DeploymentData"
-import { SessionKeysExecute } from "@/components/SessionKeysExecute"
-import { SessionKeysExecuteOutside } from "@/components/SessionKeysExecuteOutside"
-import { SessionKeysSign } from "@/components/SessionKeysSign"
-import { SessionKeysTypedDataOutside } from "@/components/SessionKeysTypedDataOutside"
-import { provider } from "@/constants"
-import { Status } from "@/types/status"
-import { OffChainSession } from "@argent/x-sessions"
-import { useEffect, useState } from "react"
-import { GatewayError, Signature, constants } from "starknet"
-import { StarknetChainId } from "starknet-types"
-import { StarknetWindowObject, disconnect } from "starknetkit"
-
-export default function Session() {
-  const [connectedWallet, setConnectedWallet] = useState<
-    StarknetWindowObject | undefined | null
-  >(null)
-  const [connectorData, setConnectorData] = useState<
-    | {
-        account?: string
-        chainId?: StarknetChainId
-      }
-    | undefined
-    | null
-  >(null)
-  const [chainId, setChainId] = useState<constants.StarknetChainId | undefined>(
-    undefined,
-  )
-
-  const [lastTransactionHash, setLastTransactionHash] = useState("")
-  const [transactionStatus, setTransactionStatus] = useState<Status>("idle")
-  const [transactionError, setTransactionError] = useState("")
-  const [accountSessionSignature, setAccountSessionSignature] = useState<
-    string[] | Signature
-  >()
-  const [sessionRequest, setSessionRequest] = useState<OffChainSession>()
-
-  useEffect(() => {
-    const waitTx = async () => {
-      if (lastTransactionHash && transactionStatus === "pending") {
-        setTransactionError("")
-        try {
-          await provider.waitForTransaction(lastTransactionHash)
-          setTransactionStatus("success")
-        } catch (error) {
-          setTransactionStatus("failure")
-          let message = error ? `${error}` : "No further details"
-          if (error instanceof GatewayError) {
-            message = JSON.stringify(error.message, null, 2)
-          }
-          setTransactionError(message)
-        }
-      }
-    }
-    waitTx()
-  }, [transactionStatus, lastTransactionHash])
-
-  return (
-    <main className="flex min-h-screen flex-col p-24 gap-4">
-      <div>
-        {!connectedWallet && (
-          <ConnectButton
-            setConnectedWallet={setConnectedWallet}
-            setChainId={setChainId}
-            setConnectorData={setConnectorData}
-          />
-        )}
-      </div>
-
-      {connectedWallet && connectorData?.account && (
-        <>
-          <button
-            className="bg-white text-black p-2 rounded-lg absolute top-4 right-4"
-            onClick={() => {
-              disconnect()
-              setConnectedWallet(undefined)
-            }}
-          >
-            Disconnect
-          </button>
-          <div>
-            <div>Account: {connectorData?.account}</div>
-          </div>
-          <div>
-            {connectedWallet && <DeploymentData wallet={connectedWallet} />}
-          </div>
-          <div>
-            Chain:{" "}
-            {chainId === constants.StarknetChainId.SN_SEPOLIA
-              ? "SN_SEPOLIA"
-              : "SN_MAIN"}
-          </div>
-          <div
-            className={`${lastTransactionHash ? "cursor-pointer hover:underline" : "default"}`}
-            onClick={() => {
-              if (!lastTransactionHash) return
-              window.open(
-                `https://sepolia.starkscan.co/tx/${lastTransactionHash}`,
-                "_blank",
-              )
-            }}
-          >
-            Last tx hash: {lastTransactionHash || "---"}
-          </div>
-          <div>Tx status: {transactionStatus}</div>
-          <div color="##ff4848">{transactionError.toString()}</div>
-
-          <div className="flex flex-col text-black">
-            <SessionKeysSign
-              wallet={connectedWallet}
-              setTransactionStatus={setTransactionStatus}
-              setAccountSessionSignature={setAccountSessionSignature}
-              setSessionRequest={setSessionRequest}
-            />
-          </div>
-
-          <div className="flex flex-col text-black">
-            <SessionKeysExecute
-              address={connectorData?.account}
-              accountSessionSignature={accountSessionSignature}
-              sessionRequest={sessionRequest}
-              setTransactionStatus={setTransactionStatus}
-              setLastTransactionHash={setLastTransactionHash}
-              transactionStatus={transactionStatus}
-            />
-          </div>
-
-          <div className="flex text-black justify-between">
-            <div className="flex flex-col text-black ">
-              <SessionKeysExecuteOutside
-                address={connectorData?.account}
-                accountSessionSignature={accountSessionSignature}
-                sessionRequest={sessionRequest}
-                transactionStatus={transactionStatus}
-              />
-            </div>
-            <div className="flex flex-col text-black ">
-              <SessionKeysTypedDataOutside
-                address={connectorData?.account}
-                accountSessionSignature={accountSessionSignature}
-                sessionRequest={sessionRequest}
-                transactionStatus={transactionStatus}
-              />
-            </div>
-          </div>
-        </>
-      )}
-    </main>
-  )
+export default function StarknetReactLatest() {
+  return <>todo</>
 }
diff --git a/src/app/withStarknetReactNext/page.tsx b/src/app/withStarknetReactNext/page.tsx
index 2f39784..cda1bbc 100644
--- a/src/app/withStarknetReactNext/page.tsx
+++ b/src/app/withStarknetReactNext/page.tsx
@@ -1,153 +1,3 @@
-"use client"
-
-import { ConnectButton } from "@/components/ConnectButton"
-import { DeploymentData } from "@/components/DeploymentData"
-import { SessionKeysExecute } from "@/components/SessionKeysExecute"
-import { SessionKeysExecuteOutside } from "@/components/SessionKeysExecuteOutside"
-import { SessionKeysSign } from "@/components/SessionKeysSign"
-import { SessionKeysTypedDataOutside } from "@/components/SessionKeysTypedDataOutside"
-import { provider } from "@/constants"
-import { Status } from "@/types/status"
-import { OffChainSession } from "@argent/x-sessions"
-import { useEffect, useState } from "react"
-import { GatewayError, Signature, constants } from "starknet"
-import { StarknetChainId } from "starknet-types"
-import { StarknetWindowObject, disconnect } from "starknetkit"
-
-export default function Session() {
-  const [connectedWallet, setConnectedWallet] = useState<
-    StarknetWindowObject | undefined | null
-  >(null)
-  const [connectorData, setConnectorData] = useState<
-    | {
-        account?: string
-        chainId?: StarknetChainId
-      }
-    | undefined
-    | null
-  >(null)
-  const [chainId, setChainId] = useState<constants.StarknetChainId | undefined>(
-    undefined,
-  )
-
-  const [lastTransactionHash, setLastTransactionHash] = useState("")
-  const [transactionStatus, setTransactionStatus] = useState<Status>("idle")
-  const [transactionError, setTransactionError] = useState("")
-  const [accountSessionSignature, setAccountSessionSignature] = useState<
-    string[] | Signature
-  >()
-  const [sessionRequest, setSessionRequest] = useState<OffChainSession>()
-
-  useEffect(() => {
-    const waitTx = async () => {
-      if (lastTransactionHash && transactionStatus === "pending") {
-        setTransactionError("")
-        try {
-          await provider.waitForTransaction(lastTransactionHash)
-          setTransactionStatus("success")
-        } catch (error) {
-          setTransactionStatus("failure")
-          let message = error ? `${error}` : "No further details"
-          if (error instanceof GatewayError) {
-            message = JSON.stringify(error.message, null, 2)
-          }
-          setTransactionError(message)
-        }
-      }
-    }
-    waitTx()
-  }, [transactionStatus, lastTransactionHash])
-
-  return (
-    <main className="flex min-h-screen flex-col p-24 gap-4">
-      <div>
-        {!connectedWallet && (
-          <ConnectButton
-            setConnectedWallet={setConnectedWallet}
-            setChainId={setChainId}
-            setConnectorData={setConnectorData}
-          />
-        )}
-      </div>
-
-      {connectedWallet && connectorData?.account && (
-        <>
-          <button
-            className="bg-white text-black p-2 rounded-lg absolute top-4 right-4"
-            onClick={() => {
-              disconnect()
-              setConnectedWallet(undefined)
-            }}
-          >
-            Disconnect
-          </button>
-          <div>
-            <div>Account: {connectorData?.account}</div>
-          </div>
-          <div>
-            {connectedWallet && <DeploymentData wallet={connectedWallet} />}
-          </div>
-          <div>
-            Chain:{" "}
-            {chainId === constants.StarknetChainId.SN_SEPOLIA
-              ? "SN_SEPOLIA"
-              : "SN_MAIN"}
-          </div>
-          <div
-            className={`${lastTransactionHash ? "cursor-pointer hover:underline" : "default"}`}
-            onClick={() => {
-              if (!lastTransactionHash) return
-              window.open(
-                `https://sepolia.starkscan.co/tx/${lastTransactionHash}`,
-                "_blank",
-              )
-            }}
-          >
-            Last tx hash: {lastTransactionHash || "---"}
-          </div>
-          <div>Tx status: {transactionStatus}</div>
-          <div color="##ff4848">{transactionError.toString()}</div>
-
-          <div className="flex flex-col text-black">
-            <SessionKeysSign
-              wallet={connectedWallet}
-              setTransactionStatus={setTransactionStatus}
-              setAccountSessionSignature={setAccountSessionSignature}
-              setSessionRequest={setSessionRequest}
-            />
-          </div>
-
-          <div className="flex flex-col text-black">
-            <SessionKeysExecute
-              address={connectorData?.account}
-              accountSessionSignature={accountSessionSignature}
-              sessionRequest={sessionRequest}
-              setTransactionStatus={setTransactionStatus}
-              setLastTransactionHash={setLastTransactionHash}
-              transactionStatus={transactionStatus}
-            />
-          </div>
-
-          <div className="flex text-black justify-between">
-            <div className="flex flex-col text-black ">
-              <SessionKeysExecuteOutside
-                address={connectorData?.account}
-                accountSessionSignature={accountSessionSignature}
-                sessionRequest={sessionRequest}
-                transactionStatus={transactionStatus}
-              />
-            </div>
-            <div className="flex flex-col text-black ">
-              <SessionKeysTypedDataOutside
-                address={connectorData?.account}
-                accountSessionSignature={accountSessionSignature}
-                sessionRequest={sessionRequest}
-                transactionStatus={transactionStatus}
-              />
-            </div>
-          </div>
-        </>
-      )}
-    </main>
-  )
+export default function StarknetReactNext() {
+  return <>todo</>
 }
diff --git a/src/components/AccountSection.tsx b/src/components/AccountSection.tsx
index ea68af0..7d43d1f 100644
--- a/src/components/AccountSection.tsx
+++ b/src/components/AccountSection.tsx
@@ -23,7 +23,8 @@ const AccountSection: FC<AccountSectionProps> = ({ address, chainId }) => {
       <Box>Account: {address}</Box>
       <Box>Chain: {chainId}</Box>
       <Box
-        className={`${lastTxHash ? "cursor-pointer hover:underline" : "default"}`}
+        cursor={lastTxHash ? "pointer" : "default"}
+        _hover={{ textDecoration: lastTxHash ? "underline" : "none" }}
         onClick={() => {
           if (!lastTxHash) return
           window.open(`https://sepolia.starkscan.co/tx/${lastTxHash}`, "_blank")
diff --git a/src/components/Actions/Deploy.tsx b/src/components/Actions/Deploy.tsx
index 25c370f..29013e2 100644
--- a/src/components/Actions/Deploy.tsx
+++ b/src/components/Actions/Deploy.tsx
@@ -1,13 +1,32 @@
-import { deploy } from "@/services/deploy"
+import { deploy, deployRcpMethod } from "@/services/deploy"
 import { walletStarknetkitLatestAtom } from "@/state/connectedWalletStarknetkitLatest"
+import { walletStarknetkitNextAtom } from "@/state/connectedWalletStarknetkitNext"
 import { lastTxHashAtom, lastTxStatusAtom } from "@/state/transactionState"
 import { Button, Heading, Flex, Input } from "@chakra-ui/react"
 import { useAtomValue, useSetAtom } from "jotai"
-import { useState } from "react"
-import { UniversalDeployerContractPayload } from "starknet"
+import { FC, useState } from "react"
+import {
+  Account,
+  AccountInterface,
+  UniversalDeployerContractPayload,
+} from "starknet"
+import { StarknetWindowObject } from "starknetkit-next"
 
-const Deploy = () => {
+const DeployLatest = () => {
   const wallet = useAtomValue(walletStarknetkitLatestAtom)
+  return <Deploy account={wallet?.account} />
+}
+const DeployNext = () => {
+  const wallet = useAtomValue(walletStarknetkitNextAtom)
+  return <Deploy wallet={wallet} />
+}
+
+interface DeployProps {
+  account?: Account | AccountInterface
+  wallet?: StarknetWindowObject | undefined | null
+}
+
+const Deploy: FC<DeployProps> = ({ account, wallet }) => {
   const setTransactionStatus = useSetAtom(lastTxStatusAtom)
   const setLastTransactionHash = useSetAtom(lastTxHashAtom)
   const [deployClassHash, setDeployClassHash] = useState("")
@@ -21,7 +40,10 @@ const Deploy = () => {
       const payload: UniversalDeployerContractPayload = {
         classHash: deployClassHash,
       }
-      const result = await deploy(wallet?.account, payload)
+
+      const result = account
+        ? await deploy(account, payload)
+        : await deployRcpMethod(wallet, payload)
       setLastTransactionHash(result.transaction_hash)
       setTransactionStatus("pending")
     } catch (e) {
@@ -60,4 +82,4 @@ const Deploy = () => {
   )
 }
 
-export { Deploy }
+export { DeployLatest, DeployNext }
diff --git a/src/components/Actions/DeployRpcMethod.tsx b/src/components/Actions/DeployRpcMethod.tsx
deleted file mode 100644
index 0f5a44e..0000000
--- a/src/components/Actions/DeployRpcMethod.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { deploy, deployRcpMethod } from "@/services/deploy"
-import { walletStarknetkitLatestAtom } from "@/state/connectedWalletStarknetkitLatest"
-import { walletStarknetkitNextAtom } from "@/state/connectedWalletStarknetkitNext"
-import { lastTxHashAtom, lastTxStatusAtom } from "@/state/transactionState"
-import { Button, Heading, Flex, Input } from "@chakra-ui/react"
-import { useAtomValue, useSetAtom } from "jotai"
-import { useState } from "react"
-import { UniversalDeployerContractPayload } from "starknet"
-
-const DeployRpcMethod = () => {
-  const wallet = useAtomValue(walletStarknetkitNextAtom)
-  const setTransactionStatus = useSetAtom(lastTxStatusAtom)
-  const setLastTransactionHash = useSetAtom(lastTxHashAtom)
-  const [deployClassHash, setDeployClassHash] = useState("")
-
-  const handleDeploy = async (e: React.FormEvent) => {
-    try {
-      e.preventDefault()
-      if (!deployClassHash) {
-        throw new Error("No class hash")
-      }
-      const payload: UniversalDeployerContractPayload = {
-        classHash: deployClassHash,
-      }
-      const result = await deployRcpMethod(wallet, payload)
-      setLastTransactionHash(result.transaction_hash)
-      setTransactionStatus("pending")
-    } catch (e) {
-      console.error(e)
-      setTransactionStatus("idle")
-    }
-  }
-
-  return (
-    <Flex
-      as="form"
-      onSubmit={handleDeploy}
-      direction="column"
-      background="neutrals.700"
-      flex={1}
-      p="4"
-      gap="3"
-      borderTopRightRadius="lg"
-      borderBottomRightRadius="lg"
-    >
-      <Heading as="h2">Deploy</Heading>
-
-      <label htmlFor="deployClassHash">Class Hash to deploy:</label>
-      <Input
-        style={{ width: "100%" }}
-        id="deployClassHash"
-        name="deployClassHash"
-        type="text"
-        onChange={(e) => {
-          setDeployClassHash(e.target.value)
-        }}
-        value={deployClassHash}
-      />
-
-      <Button type="submit" colorScheme="inverted">
-        DeployRpcMethod
-      </Button>
-    </Flex>
-  )
-}
-
-export { DeployRpcMethod }
diff --git a/src/components/Actions/Mint.tsx b/src/components/Actions/Mint.tsx
index a74107a..1746abb 100644
--- a/src/components/Actions/Mint.tsx
+++ b/src/components/Actions/Mint.tsx
@@ -1,12 +1,29 @@
-import { mintToken } from "@/services/mint"
+import { mintToken, mintTokenRcpMethod } from "@/services/mint"
 import { walletStarknetkitLatestAtom } from "@/state/connectedWalletStarknetkitLatest"
+import { walletStarknetkitNextAtom } from "@/state/connectedWalletStarknetkitNext"
 import { lastTxHashAtom, lastTxStatusAtom } from "@/state/transactionState"
 import { Flex, Heading, Input } from "@chakra-ui/react"
 import { useAtom, useAtomValue, useSetAtom } from "jotai"
-import { useState } from "react"
+import { FC, useState } from "react"
+import { Account, AccountInterface } from "starknet"
+import { StarknetWindowObject } from "starknetkit-next"
 
-const Mint = () => {
+const MintLatest = () => {
   const wallet = useAtomValue(walletStarknetkitLatestAtom)
+  return <Mint account={wallet?.account} />
+}
+
+const MintNext = () => {
+  const wallet = useAtomValue(walletStarknetkitNextAtom)
+  return <Mint wallet={wallet} />
+}
+
+interface MintProps {
+  account?: Account | AccountInterface
+  wallet?: StarknetWindowObject | null
+}
+
+const Mint: FC<MintProps> = ({ account, wallet }) => {
   const [transactionStatus, setTransactionStatus] = useAtom(lastTxStatusAtom)
   const setLastTransactionHash = useSetAtom(lastTxHashAtom)
 
@@ -17,7 +34,9 @@ const Mint = () => {
     e.preventDefault()
     try {
       setTransactionStatus("approve")
-      const { transaction_hash } = await mintToken(wallet?.account, mintAmount)
+      const { transaction_hash } = account
+        ? await mintToken(account, mintAmount)
+        : await mintTokenRcpMethod(wallet, mintAmount)
       setLastTransactionHash(transaction_hash)
       setTransactionStatus("pending")
     } catch (e) {
@@ -48,10 +67,14 @@ const Mint = () => {
           onChange={(e) => setMintAmount(e.target.value)}
         />
 
-        <Input type="submit" disabled={true} value="Not possible with ETH!" />
+        <Input
+          type="submit"
+          disabled={true || buttonsDisabled}
+          value="Not possible with ETH!"
+        />
       </Flex>
     </Flex>
   )
 }
 
-export { Mint }
+export { MintLatest, MintNext }
diff --git a/src/components/Actions/MintRpcMethod.tsx b/src/components/Actions/MintRpcMethod.tsx
deleted file mode 100644
index 746e8cb..0000000
--- a/src/components/Actions/MintRpcMethod.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { mintTokenRcpMethod } from "@/services/mint"
-import { walletStarknetkitNextAtom } from "@/state/connectedWalletStarknetkitNext"
-import { lastTxHashAtom, lastTxStatusAtom } from "@/state/transactionState"
-import { Flex, Heading, Input } from "@chakra-ui/react"
-import { useAtom, useAtomValue, useSetAtom } from "jotai"
-import { useState } from "react"
-
-const MintRpcMethod = () => {
-  const wallet = useAtomValue(walletStarknetkitNextAtom)
-  const [transactionStatus, setTransactionStatus] = useAtom(lastTxStatusAtom)
-  const setLastTransactionHash = useSetAtom(lastTxHashAtom)
-
-  const [mintAmount, setMintAmount] = useState("10")
-  const buttonsDisabled = ["approve", "pending"].includes(transactionStatus)
-
-  const handleMintSubmit = async (e: React.FormEvent) => {
-    e.preventDefault()
-    try {
-      setTransactionStatus("approve")
-      const { transaction_hash } = await mintTokenRcpMethod(wallet, mintAmount)
-      setLastTransactionHash(transaction_hash)
-      setTransactionStatus("pending")
-    } catch (e) {
-      console.error(e)
-      setTransactionStatus("idle")
-    }
-  }
-
-  return (
-    <Flex flex={1} width="full" gap={10}>
-      <Flex
-        as="form"
-        onSubmit={handleMintSubmit}
-        direction="column"
-        flex={1}
-        p="4"
-        gap="3"
-        borderRadius="lg"
-      >
-        <Heading as="h2">Mint token</Heading>
-        <Input
-          disabled
-          placeholder="Amount"
-          type="text"
-          id="mint-amount"
-          name="fname"
-          value={mintAmount}
-          onChange={(e) => setMintAmount(e.target.value)}
-        />
-
-        <Input type="submit" disabled={true} value="Not possible with ETH!" />
-      </Flex>
-    </Flex>
-  )
-}
-
-export { MintRpcMethod }
diff --git a/src/components/Actions/SignMessage.tsx b/src/components/Actions/SignMessage.tsx
index 003ffe3..db4383e 100644
--- a/src/components/Actions/SignMessage.tsx
+++ b/src/components/Actions/SignMessage.tsx
@@ -1,30 +1,48 @@
-import { signMessage } from "@/services/signMessage"
+import { signMessage, signMessageRcpMethod } from "@/services/signMessage"
 import { walletStarknetkitLatestAtom } from "@/state/connectedWalletStarknetkitLatest"
+import { walletStarknetkitNextAtom } from "@/state/connectedWalletStarknetkitNext"
 import { lastTxStatusAtom } from "@/state/transactionState"
 import { Button, Flex, Heading, Input, Textarea } from "@chakra-ui/react"
 import { useAtomValue, useSetAtom } from "jotai"
-import { useState } from "react"
-import { Account, stark } from "starknet"
+import { FC, useState } from "react"
+import { Account, AccountInterface, stark } from "starknet"
+import { StarknetWindowObject } from "starknetkit-next"
 
-const SignMessage = () => {
+const SignMessageLatest = () => {
+  const wallet = useAtomValue(walletStarknetkitLatestAtom)
+  return <SignMessage account={wallet?.account} />
+}
+
+const SignMessageNext = () => {
+  const wallet = useAtomValue(walletStarknetkitNextAtom)
+  return <SignMessage wallet={wallet} />
+}
+
+interface SignMessageProps {
+  account?: Account | AccountInterface
+  wallet?: StarknetWindowObject | null
+}
+
+const SignMessage: FC<SignMessageProps> = ({ account, wallet }) => {
   const [shortText, setShortText] = useState("")
   const [lastSig, setLastSig] = useState<string[]>([])
 
-  const wallet = useAtomValue(walletStarknetkitLatestAtom)
   const setTransactionStatus = useSetAtom(lastTxStatusAtom)
 
-  const handleSignSubmit = async () => {
+  const handleSignSubmit = async (skipDeploy?: boolean) => {
     try {
-      if (!wallet?.account) {
+      if (!account && !wallet) {
         throw new Error("Account not connected")
       }
 
       setTransactionStatus("approve")
-      const result = await signMessage(
-        wallet.account as Account,
-        await wallet.account.getChainId(),
-        shortText,
-      )
+      const result = account
+        ? await signMessage(
+            account as Account,
+            await account.getChainId(),
+            shortText,
+          )
+        : await signMessageRcpMethod(wallet, shortText, skipDeploy)
       setLastSig(stark.formatSignature(result))
       setTransactionStatus("success")
     } catch (e) {
@@ -85,4 +103,4 @@ const SignMessage = () => {
   )
 }
 
-export { SignMessage }
+export { SignMessageLatest, SignMessageNext }
diff --git a/src/components/Actions/SignMessageRpcMethod.tsx b/src/components/Actions/SignMessageRpcMethod.tsx
deleted file mode 100644
index 6387ab6..0000000
--- a/src/components/Actions/SignMessageRpcMethod.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { signMessageRcpMethod } from "@/services/signMessage"
-import { walletStarknetkitNextAtom } from "@/state/connectedWalletStarknetkitNext"
-import { lastTxStatusAtom } from "@/state/transactionState"
-import { Button, Flex, Heading, Input, Textarea } from "@chakra-ui/react"
-import { useAtomValue, useSetAtom } from "jotai"
-import { useState } from "react"
-import { stark } from "starknet"
-
-const SignMessageRpcMethod = () => {
-  const [shortText, setShortText] = useState("")
-  const [lastSig, setLastSig] = useState<string[]>([])
-  const wallet = useAtomValue(walletStarknetkitNextAtom)
-  const setTransactionStatus = useSetAtom(lastTxStatusAtom)
-
-  const handleSignSubmit = async (skipDeploy: boolean) => {
-    try {
-      if (!wallet) {
-        throw new Error("Account not connected")
-      }
-
-      setTransactionStatus("approve")
-      const result = await signMessageRcpMethod(wallet, shortText, skipDeploy)
-      setLastSig(stark.formatSignature(result))
-      setTransactionStatus("success")
-    } catch (e) {
-      console.error(e)
-      setTransactionStatus("idle")
-    }
-  }
-
-  return (
-    <Flex flex={1} width="full">
-      <Flex
-        as="form"
-        onSubmit={(e) => {
-          e.preventDefault()
-          handleSignSubmit(false)
-        }}
-        direction="column"
-        flex={1}
-        p="4"
-        gap="3"
-        borderTopLeftRadius="lg"
-        borderBottomLeftRadius="lg"
-      >
-        <Heading as="h2">Sign Message</Heading>
-
-        <Input
-          type="text"
-          id="short-text"
-          name="short-text"
-          placeholder="Short text"
-          value={shortText}
-          onChange={(e) => setShortText(e.target.value)}
-        />
-
-        <div style={{ display: "flex", alignItems: "center", gap: "1em" }}>
-          <Button colorScheme="primary" type="submit" w="full">
-            Sign
-          </Button>
-          <Button
-            w="full"
-            colorScheme="secondary"
-            type="submit"
-            onClick={async () => {
-              handleSignSubmit(true)
-            }}
-          >
-            Sign without deploy
-          </Button>
-        </div>
-      </Flex>
-      <Flex
-        as="form"
-        direction="column"
-        flex={1}
-        p="4"
-        gap="3"
-        borderTopRightRadius="lg"
-        borderBottomRightRadius="lg"
-      >
-        <Heading as="h2">Sign results</Heading>
-
-        {/* Label and textarea for value r */}
-        <Textarea id="r" name="r" placeholder="r" value={lastSig[0]} readOnly />
-        {/* Label and textarea for value s */}
-        <Textarea id="s" name="s" placeholder="s" value={lastSig[1]} readOnly />
-      </Flex>
-    </Flex>
-  )
-}
-
-export { SignMessageRpcMethod }
diff --git a/src/components/Actions/Transfer.tsx b/src/components/Actions/Transfer.tsx
index df08c8d..5e1f37d 100644
--- a/src/components/Actions/Transfer.tsx
+++ b/src/components/Actions/Transfer.tsx
@@ -1,16 +1,31 @@
-import { transfer } from "@/services/transfer"
+import { transfer, transferJSONRpcMethod } from "@/services/transfer"
 import { walletStarknetkitLatestAtom } from "@/state/connectedWalletStarknetkitLatest"
+import { walletStarknetkitNextAtom } from "@/state/connectedWalletStarknetkitNext"
 import { lastTxHashAtom, lastTxStatusAtom } from "@/state/transactionState"
 import { Button, Flex, Heading, Input } from "@chakra-ui/react"
 import { useAtom, useAtomValue, useSetAtom } from "jotai"
-import { useState } from "react"
+import { FC, useState } from "react"
 import { Account } from "starknet"
+import { StarknetWindowObject } from "starknetkit-next"
 
-const Transfer = () => {
+const TransferLatest = () => {
+  const wallet = useAtomValue(walletStarknetkitLatestAtom)
+  return <Transfer account={wallet?.account} />
+}
+const TransferNext = () => {
+  const wallet = useAtomValue(walletStarknetkitNextAtom)
+  return <Transfer wallet={wallet} />
+}
+
+interface TransferProps {
+  account?: Account
+  wallet?: StarknetWindowObject | null
+}
+
+const Transfer: FC<TransferProps> = ({ account, wallet }) => {
   const [transferTo, setTransferTo] = useState("")
   const [transferAmount, setTransferAmount] = useState("1")
 
-  const wallet = useAtomValue(walletStarknetkitLatestAtom)
   const [transactionStatus, setTransactionStatus] = useAtom(lastTxStatusAtom)
   const setLastTransactionHash = useSetAtom(lastTxHashAtom)
 
@@ -21,15 +36,15 @@ const Transfer = () => {
 
   const handleTransferSubmit = async (e: React.FormEvent) => {
     try {
-      if (!wallet?.account) throw new Error("Account not connected")
+      if (!account && !wallet) {
+        throw new Error("Account not connected")
+      }
 
       e.preventDefault()
       setTransactionStatus("approve")
-      const { transaction_hash } = await transfer(
-        wallet.account as Account,
-        transferTo,
-        transferAmount,
-      )
+      const { transaction_hash } = account
+        ? await transfer(account as Account, transferTo, transferAmount)
+        : await transferJSONRpcMethod(wallet, transferTo, transferAmount)
       setLastTransactionHash(transaction_hash)
       setTransactionStatus("pending")
       setTransferAmount("")
@@ -83,4 +98,4 @@ const Transfer = () => {
   )
 }
 
-export { Transfer }
+export { TransferLatest, TransferNext }
diff --git a/src/components/Actions/TransferRpcMethod.tsx b/src/components/Actions/TransferRpcMethod.tsx
deleted file mode 100644
index a655391..0000000
--- a/src/components/Actions/TransferRpcMethod.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { transferJSONRpcMethod } from "@/services/transfer"
-import { walletStarknetkitNextAtom } from "@/state/connectedWalletStarknetkitNext"
-import { lastTxHashAtom, lastTxStatusAtom } from "@/state/transactionState"
-import { Button, Flex, Heading, Input } from "@chakra-ui/react"
-import { useAtom, useAtomValue, useSetAtom } from "jotai"
-import { useState } from "react"
-
-const TransferRpcMethod = () => {
-  const [transferTo, setTransferTo] = useState("")
-  const [transferAmount, setTransferAmount] = useState("1")
-
-  const wallet = useAtomValue(walletStarknetkitNextAtom)
-  const [transactionStatus, setTransactionStatus] = useAtom(lastTxStatusAtom)
-  const setLastTransactionHash = useSetAtom(lastTxHashAtom)
-
-  const buttonsDisabled =
-    ["approve", "pending"].includes(transactionStatus) ||
-    transferTo === "" ||
-    transferAmount === ""
-
-  const handleTransferSubmit = async (e: React.FormEvent) => {
-    try {
-      if (!wallet) throw new Error("Account not connected")
-
-      e.preventDefault()
-      setTransactionStatus("approve")
-      const { transaction_hash } = await transferJSONRpcMethod(
-        wallet,
-        transferTo,
-        transferAmount,
-      )
-      setLastTransactionHash(transaction_hash)
-      setTransactionStatus("pending")
-      setTransferAmount("")
-    } catch (e) {
-      console.error(e)
-      setTransactionStatus("idle")
-    }
-  }
-
-  return (
-    <Flex flex={1} width="full" gap={10}>
-      <Flex
-        as="form"
-        onSubmit={handleTransferSubmit}
-        direction="column"
-        flex={1}
-        p="4"
-        gap="3"
-        borderRadius="lg"
-      >
-        <Heading as="h2">TransferRpcMethod token</Heading>
-
-        <Input
-          type="text"
-          id="transfer-to"
-          name="fname"
-          placeholder="To"
-          value={transferTo}
-          onChange={(e) => setTransferTo(e.target.value)}
-        />
-
-        <Input
-          type="text"
-          id="transfer-amount"
-          name="fname"
-          placeholder="Amount"
-          value={transferAmount}
-          onChange={(e) => setTransferAmount(e.target.value)}
-        />
-        <br />
-        <Button
-          colorScheme="primary"
-          type="submit"
-          isDisabled={buttonsDisabled}
-          maxW="200px"
-        >
-          Transfer
-        </Button>
-      </Flex>
-    </Flex>
-  )
-}
-
-export { TransferRpcMethod }
diff --git a/src/services/signMessage.ts b/src/services/signMessage.ts
index ea51bb1..d2999c5 100644
--- a/src/services/signMessage.ts
+++ b/src/services/signMessage.ts
@@ -32,7 +32,7 @@ export const signMessage = async (
 }
 
 export const signMessageRcpMethod = async (
-  wallet: StarknetWindowObject,
+  wallet: StarknetWindowObject | undefined | null,
   message: string,
   skipDeploy = false,
 ) => {
@@ -40,6 +40,10 @@ export const signMessageRcpMethod = async (
     throw Error("message must be a short string")
   }
 
+  if (!wallet) {
+    throw Error("wallet not connected")
+  }
+
   const chainId = await wallet?.request({
     type: "wallet_requestChainId",
   })
diff --git a/src/services/transfer.ts b/src/services/transfer.ts
index 1617434..4b853be 100644
--- a/src/services/transfer.ts
+++ b/src/services/transfer.ts
@@ -21,10 +21,14 @@ export const transfer = async (
 }
 
 export const transferJSONRpcMethod = async (
-  wallet: StarknetWindowObject,
+  wallet: StarknetWindowObject | undefined | null,
   transferTo: string,
   transferAmount: string,
 ): Promise<any> => {
+  if (!wallet) {
+    throw Error("wallet not connected")
+  }
+
   const transferCalldata = CallData.compile({
     to: transferTo,
     value: parseInputAmountToUint256(transferAmount),