From f7e631d7f3d3e874f9618fb9841d0113d6c42d6e Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Mon, 18 Dec 2023 13:31:08 +0200
Subject: [PATCH 1/2] fix nonce not being set correctly for tx requests

---
 src/app/screens/transactionRequest/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/screens/transactionRequest/index.tsx b/src/app/screens/transactionRequest/index.tsx
index ffec77882..6fc4de4e5 100644
--- a/src/app/screens/transactionRequest/index.tsx
+++ b/src/app/screens/transactionRequest/index.tsx
@@ -51,7 +51,7 @@ function TransactionRequest() {
       stxPublicKey,
       feeMultipliers!,
       selectedNetwork,
-      stxPendingTxData,
+      stxPendingTxData.data,
     );
     setUnsignedTx(unsignedSendStxTx);
     navigate('/confirm-stx-tx', {

From 5cac557b4a6c8cf999eaaeed68c4f853d29eb72b Mon Sep 17 00:00:00 2001
From: Mahmoud Aboelenein <mahmoud@secretkeylabs.com>
Date: Mon, 18 Dec 2023 17:12:31 +0200
Subject: [PATCH 2/2] fix nonce calc persisted

---
 src/app/screens/transactionRequest/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/screens/transactionRequest/index.tsx b/src/app/screens/transactionRequest/index.tsx
index 6fc4de4e5..dff53f42c 100644
--- a/src/app/screens/transactionRequest/index.tsx
+++ b/src/app/screens/transactionRequest/index.tsx
@@ -1,6 +1,5 @@
 import ContractCallRequest from '@components/transactionsRequests/ContractCallRequest';
 import ContractDeployRequest from '@components/transactionsRequests/ContractDeployTransaction';
-import useStxPendingTxData from '@hooks/queries/useStxPendingTxData';
 import useNetworkSelector from '@hooks/useNetwork';
 import useDappRequest from '@hooks/useTransationRequest';
 import useWalletReducer from '@hooks/useWalletReducer';
@@ -10,6 +9,7 @@ import {
   ContractFunction,
   createDeployContractRequest,
   extractFromPayload,
+  fetchStxPendingTxData,
 } from '@secretkeylabs/xverse-core';
 import { StacksTransaction } from '@stacks/transactions';
 import { getNetworkType, isHardwareAccount } from '@utils/helper';
@@ -39,11 +39,11 @@ function TransactionRequest() {
   const [coinsMetaData, setCoinsMetaData] = useState<Coin[] | null>(null);
   const [codeBody, setCodeBody] = useState(undefined);
   const [contractName, setContractName] = useState(undefined);
-  const stxPendingTxData = useStxPendingTxData();
   const [hasSwitchedAccount, setHasSwitchedAccount] = useState(false);
   const [attachment, setAttachment] = useState<Buffer | undefined>(undefined);
 
   const handleTokenTransferRequest = async () => {
+    const stxPendingTxData = await fetchStxPendingTxData(stxAddress, selectedNetwork);
     const unsignedSendStxTx = await getTokenTransferRequest(
       payload.recipient,
       payload.amount,
@@ -51,7 +51,7 @@ function TransactionRequest() {
       stxPublicKey,
       feeMultipliers!,
       selectedNetwork,
-      stxPendingTxData.data,
+      stxPendingTxData || [],
     );
     setUnsignedTx(unsignedSendStxTx);
     navigate('/confirm-stx-tx', {