From e5a7d1ddc01e69afaf7f540c3fda7147d2f60b80 Mon Sep 17 00:00:00 2001 From: Vivek Teega Date: Tue, 8 Oct 2024 00:14:18 +0530 Subject: [PATCH] Fixed key values for fn_pay.js --- scripts/fn_pay.js | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/scripts/fn_pay.js b/scripts/fn_pay.js index 6fe26a2..6e1c349 100644 --- a/scripts/fn_pay.js +++ b/scripts/fn_pay.js @@ -292,25 +292,20 @@ Cashier.checkIfTokenTxIsValid = function (tokenTxID, sender, amount) { floTokenAPI.getTx(tokenTxID).then(tx => { let parsedTxData = floTokenAPI.util.parseTxData(tx); console.debug(parsedTxData); - if (parsedTxData.type !== "transfer" || parsedTxData.transferType !== "token"){ - debugger + + if (tx.type !== "transfer" || tx.transferType !== "token") reject([true, "Invalid token transfer type"]); - } - else if (parsedTxData.tokenAmount !== amount){ - reject([true, "Incorrect token amount: " + parsedTxData.tokenAmount]); - } - else if (parsedTxData.tokenIdentification !== floGlobals.currency){ - reject([true, "Incorrect token: " + parsedTxData.tokenIdentification]); - } - else if (parsedTxData.sender !== sender){ + else if (tx.tokenAmount !== amount) + reject([true, "Incorrect token amount: " + tx.tokenAmount]); + else if (tx.tokenIdentification !== floGlobals.currency) + reject([true, "Incorrect token: " + tx.tokenIdentification]); + else if (parsedTxData.sender !== sender) reject([true, "Incorrect senderID: " + parsedTxData.sender]); - } - else if (parsedTxData.receiver !== myFloID){ + else if (parsedTxData.receiver !== myFloID) reject([true, "Incorrect receiverID: " + parsedTxData.receive]) - } - else { - resolve(true); - } + else resolve(true); + + }).catch(error => reject([null, error])) }) } \ No newline at end of file