tek-wallet 0.0.306 → 0.0.308

package/dist/components/ui/WithdrawFunction/index.js

@@ -116,6 +116,8 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
     var backDropRef = (0, react_1.useRef)(null);
     var suggestUseTransferInternalDialogRef = (0, react_1.useRef)(null);
     var _j = (0, react_1.useState)(), selectedMethod = _j[0], setSelectedMethod = _j[1];
+    var _k = (0, react_1.useState)(), sendInfoGet = _k[0], setSendInfoGet = _k[1];
+    var _l = (0, react_1.useState)(), recipientAddressInternal = _l[0], setRecipientAddressInternal = _l[1];
     var networks = (0, react_1.useMemo)(function () {
         console.warn("🚀 ~ networks ~ selectedToken:", selectedToken);
         if (!selectedToken) {
@@ -209,6 +211,7 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
         if (currentStep === WithdrawStep.CONFIRM &&
             selectedMethod === SendMethods.TRANSFER_INTERNAL) {
             gotoStep(WithdrawStep.SELECT_TOKEN);
+            return;
         }
         (_a = swiperRef.current) === null || _a === void 0 ? void 0 : _a.prev();
         setCurrentStep(function (prev) { return prev - 1; });
@@ -242,7 +245,7 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
         return withdrawTokens === null || withdrawTokens === void 0 ? void 0 : withdrawTokens.find(function (item) { return (item === null || item === void 0 ? void 0 : item.address) === contract_address; });
     };
     var handleScanAllQrCode = function (result) { return __awaiter(void 0, void 0, void 0, function () {
-        var text, tonTransferParam, validateWalletAddress, withdrawToken;
+        var text, tonTransferParam, validateWalletAddress;
         var _a, _b, _c, _d, _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
@@ -264,13 +267,7 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                         setInfoDialogContent("Unsupported QR");
                         return [2 /*return*/];
                     }
-                    setRecipientAddress(tonTransferParam === null || tonTransferParam === void 0 ? void 0 : tonTransferParam.address);
-                    withdrawToken = findWithdrawToken((tonTransferParam === null || tonTransferParam === void 0 ? void 0 : tonTransferParam.jetton) || "");
-                    if (!!withdrawToken) {
-                        setSelectedToken(withdrawToken);
-                        setAmount(tonTransferParam === null || tonTransferParam === void 0 ? void 0 : tonTransferParam.amount);
-                    }
-                    setMemo(tonTransferParam === null || tonTransferParam === void 0 ? void 0 : tonTransferParam.text);
+                    setSendInfoGet(tonTransferParam);
                     (_d = backDropRef.current) === null || _d === void 0 ? void 0 : _d.close();
                     console.warn("validateWalletAddress", validateWalletAddress);
                     // if(validateWalletAddress?.is_current_wallet) {
@@ -279,6 +276,7 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                     if (!!(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.master_wallet_address)) {
                         //internal
                         console.warn("internal");
+                        setRecipientAddressInternal(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.master_wallet_address);
                         (_e = suggestUseTransferInternalDialogRef.current) === null || _e === void 0 ? void 0 : _e.open();
                     }
                     else if (!!(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.valid)) {
@@ -299,24 +297,35 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
     var handleSelectTransferInternal = function () {
         var _a;
         (_a = suggestUseTransferInternalDialogRef.current) === null || _a === void 0 ? void 0 : _a.close();
-        if (!selectedToken) {
+        var tokenSet = findWithdrawToken((sendInfoGet === null || sendInfoGet === void 0 ? void 0 : sendInfoGet.jetton) || "");
+        if (!tokenSet) {
             gotoStep(WithdrawStep.SELECT_TOKEN);
         }
         else {
+            setSelectedToken(tokenSet);
+            setSelectedNetwork(tokenSet === null || tokenSet === void 0 ? void 0 : tokenSet.network_data);
             gotoStep(WithdrawStep.CONFIRM);
         }
         setSelectedMethod(SendMethods.TRANSFER_INTERNAL);
+        setRecipientAddress(recipientAddressInternal);
+        setAmount(sendInfoGet === null || sendInfoGet === void 0 ? void 0 : sendInfoGet.amount);
     };
     var handleSelectContinueTransferExternal = function () {
         var _a;
         (_a = suggestUseTransferInternalDialogRef.current) === null || _a === void 0 ? void 0 : _a.close();
-        if (!selectedToken) {
+        var tokenSet = findWithdrawToken((sendInfoGet === null || sendInfoGet === void 0 ? void 0 : sendInfoGet.jetton) || "");
+        if (!tokenSet) {
             gotoStep(WithdrawStep.SELECT_TOKEN);
         }
         else {
+            setSelectedToken(tokenSet);
+            setSelectedNetwork(tokenSet === null || tokenSet === void 0 ? void 0 : tokenSet.network_data);
             gotoStep(WithdrawStep.CONFIRM);
         }
         setSelectedMethod(SendMethods.TRANSFER_EXTERNAL);
+        setRecipientAddress(sendInfoGet === null || sendInfoGet === void 0 ? void 0 : sendInfoGet.address);
+        setAmount(sendInfoGet === null || sendInfoGet === void 0 ? void 0 : sendInfoGet.amount);
+        setMemo(sendInfoGet === null || sendInfoGet === void 0 ? void 0 : sendInfoGet.text);
     };
     (0, react_1.useEffect)(function () {
         if (isAuthenticated && !withdrawTokens) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tek-wallet",
-  "version": "0.0.306",
+  "version": "0.0.308",
   "description": "A custom React provider with TypeScript support",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",