Skip to content

Commit

Permalink
add auh to tx-creation
Browse files Browse the repository at this point in the history
  • Loading branch information
m-aboelenein committed Nov 17, 2023
1 parent 18051f4 commit 308588b
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 61 deletions.
90 changes: 35 additions & 55 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@ledgerhq/hw-transport-webusb": "^6.27.13",
"@phosphor-icons/react": "^2.0.10",
"@react-spring/web": "^9.6.1",
"@secretkeylabs/xverse-core": "2.3.2-1de4d4c",
"@secretkeylabs/xverse-core": "2.3.2-af6b0b6",
"@stacks/connect": "7.4.1",
"@stacks/stacks-blockchain-api-types": "6.1.1",
"@stacks/transactions": "6.9.0",
Expand Down
10 changes: 6 additions & 4 deletions src/app/hooks/useStxTransactionRequest.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { txPayloadToRequest } from '@secretkeylabs/xverse-core/connect';
import { txPayloadToRequest } from '@secretkeylabs/xverse-core';
import { deserializeTransaction } from '@stacks/transactions';
import { decodeToken } from 'jsontokens';
import { useLocation } from 'react-router-dom';
Expand All @@ -9,11 +9,12 @@ const useStxTransactionRequest = () => {
const requestToken = params.get('request') ?? '';
const request = decodeToken(requestToken) as any;
const tabId = params.get('tabId') ?? '0';
const stacksTransaction = request.payload.txHex
? deserializeTransaction(request.payload.txHex!)
: undefined;

const getPayload = () => {
const isSignHex = Boolean(request.payload.txHex);
if (isSignHex) {
const stacksTransaction = deserializeTransaction(request.payload.txHex!);
if (stacksTransaction) {
const txPayload = txPayloadToRequest(
stacksTransaction,
request.payload.stxAddress,
Expand All @@ -31,6 +32,7 @@ const useStxTransactionRequest = () => {

return {
payload: txPayload,
stacksTransaction,
tabId,
requestToken,
};
Expand Down
5 changes: 4 additions & 1 deletion src/app/screens/transactionRequest/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const LoaderContainer = styled.div((props) => ({
function TransactionRequest() {
const { stxAddress, network, stxPublicKey, feeMultipliers, accountsList, selectedAccount } =
useWalletSelector();
const { payload, tabId, requestToken } = useStxTransactionRequest();
const { payload, tabId, requestToken, stacksTransaction } = useStxTransactionRequest();
const navigate = useNavigate();
const selectedNetwork = useNetworkSelector();
const { switchAccount } = useWalletReducer();
Expand All @@ -55,6 +55,7 @@ function TransactionRequest() {
feeMultipliers!,
selectedNetwork,
stxPendingTxData,
stacksTransaction?.auth,
);
setUnsignedTx(unsignedSendStxTx);
navigate('/confirm-stx-tx', {
Expand All @@ -78,6 +79,7 @@ function TransactionRequest() {
stxAddress,
selectedNetwork,
stxPublicKey,
stacksTransaction?.auth,
);
setUnsignedTx(unSignedContractCall);
setCoinsMetaData(coinMeta);
Expand Down Expand Up @@ -109,6 +111,7 @@ function TransactionRequest() {
stxPublicKey,
feeMultipliers!,
stxAddress,
stacksTransaction?.auth,
);
setUnsignedTx(response.contractDeployTx);
setCodeBody(response.codeBody);
Expand Down

0 comments on commit 308588b

Please sign in to comment.