tek-wallet 0.0.366 → 0.0.367

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

@@ -304,9 +304,9 @@ var ReceiveFunction = (0, react_1.forwardRef)(function (props, ref) {
                                                     overflow: "hidden",
                                                     backgroundColor: theme.palette.background.white,
                                                     backdropFilter: "blur(10px)",
-                                                }, children: (0, jsx_runtime_1.jsx)(QRCode_1.default, { value: qrCodeValue, title: "Receive ".concat(selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.name), logo: (0, getIcon_1.default)("ton"), bgColor: "transparent" }) }), (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { gap: theme.mixins.gaps.g4, color: "text.white" }), children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.valueDescription), children: "Network" }), (0, jsx_runtime_1.jsxs)(material_1.Box, { component: "button", sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g2, cursor: "pointer", transition: "transform 0.3s ease-in-out", "&:active": {
+                                                }, children: (0, jsx_runtime_1.jsx)(QRCode_1.default, { value: qrCodeValue, title: "Receive ".concat(selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.name), logo: (0, getIcon_1.default)("ton"), bgColor: "transparent" }) }), selectedMethod === ReceiveMethods.RECEIVE_EXTERNAL && ((0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { gap: theme.mixins.gaps.g4, color: "text.white" }), children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.valueDescription), children: "Network" }), (0, jsx_runtime_1.jsxs)(material_1.Box, { component: "button", sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g2, cursor: "pointer", transition: "transform 0.3s ease-in-out", "&:active": {
                                                                 transform: "translateX(0.5rem)",
-                                                            } }), onClick: handleBack, children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.value), children: selectedNetwork === null || selectedNetwork === void 0 ? void 0 : selectedNetwork.name }), (0, jsx_runtime_1.jsx)(Icon_1.default, { src: (0, getIcon_1.default)("right_arrow"), width: 10 })] })] }), (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { gap: theme.mixins.gaps.g4, color: "text.white" }), children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.valueDescription), children: "Address" }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.value), { wordBreak: "break-all" }), children: (0, jsx_runtime_1.jsx)(CopyTextComponent_1.default, { value: receiveAddress || "", children: receiveAddress }) })] }), (0, jsx_runtime_1.jsx)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { gap: theme.mixins.gaps.g4, backgroundColor: theme.palette.background.white16, borderRadius: theme.mixins.theBorderRadius.r12, padding: theme.mixins.customPadding.p8 }), children: (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [!amount && ((0, jsx_runtime_1.jsxs)(Text_1.default, { sx: __assign({}, theme.mixins.valueDescription), children: ["Receive", " ", (0, jsx_runtime_1.jsxs)("strong", { style: { color: theme.palette.text.white }, children: ["min ", selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.min_value, " ", selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.name] }), " ", "and", " ", (0, jsx_runtime_1.jsx)("strong", { style: { color: theme.palette.text.white }, children: "select the correct network" }), ", or you will lose your assets."] })), !!amount && ((0, jsx_runtime_1.jsxs)(Text_1.default, { sx: __assign({}, theme.mixins.valueDescription), children: [(0, jsx_runtime_1.jsx)("strong", { children: "Please select the correct network" }), ", unless you will lose your assets."] }))] }) })] }), (0, jsx_runtime_1.jsx)(DrawerComponent_1.default, { ref: amountDrawerRef, sx: {
+                                                            } }), onClick: handleBack, children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.value), children: selectedNetwork === null || selectedNetwork === void 0 ? void 0 : selectedNetwork.name }), (0, jsx_runtime_1.jsx)(Icon_1.default, { src: (0, getIcon_1.default)("right_arrow"), width: 10 })] })] })), (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { gap: theme.mixins.gaps.g4, color: "text.white" }), children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.valueDescription), children: "Address" }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.value), { wordBreak: "break-all" }), children: (0, jsx_runtime_1.jsx)(CopyTextComponent_1.default, { value: receiveAddress || "", children: receiveAddress }) })] }), (0, jsx_runtime_1.jsx)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { gap: theme.mixins.gaps.g4, backgroundColor: theme.palette.background.white16, borderRadius: theme.mixins.theBorderRadius.r12, padding: theme.mixins.customPadding.p8 }), children: (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [!amount && ((0, jsx_runtime_1.jsxs)(Text_1.default, { sx: __assign({}, theme.mixins.valueDescription), children: ["Receive", " ", (0, jsx_runtime_1.jsxs)("strong", { style: { color: theme.palette.text.white }, children: ["min ", selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.min_value, " ", selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.name] }), " ", "and", " ", (0, jsx_runtime_1.jsx)("strong", { style: { color: theme.palette.text.white }, children: "select the correct network" }), ", or you will lose your assets."] })), !!amount && ((0, jsx_runtime_1.jsxs)(Text_1.default, { sx: __assign({}, theme.mixins.valueDescription), children: [(0, jsx_runtime_1.jsx)("strong", { children: "Please select the correct network" }), ", unless you will lose your assets."] }))] }) })] }), (0, jsx_runtime_1.jsx)(DrawerComponent_1.default, { ref: amountDrawerRef, sx: {
                                             width: "100%",
                                             display: "flex",
                                             justifyContent: "center",

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

@@ -275,17 +275,18 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
     var findWithdrawToken = function (contract_address) {
         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 handleSelectTransferInternal = function () {
+    var handleSelectTransferInternal = function (tonTransferParam) {
         var _a;
         (_a = suggestUseTransferInternalDialogRef.current) === null || _a === void 0 ? void 0 : _a.close();
-        var tokenSet = findWithdrawToken((sendInfoGet === null || sendInfoGet === void 0 ? void 0 : sendInfoGet.jetton) || "");
-        console.warn("🚀 ~ handleSelectTransferInternal ~ sendInfoGet:", sendInfoGet);
+        var data = tonTransferParam !== null && tonTransferParam !== void 0 ? tonTransferParam : sendInfoGet;
+        var tokenSet = findWithdrawToken((data === null || data === void 0 ? void 0 : data.jetton) || "");
+        console.warn("🚀 ~ handleSelectTransferInternal ~ sendInfoGet:", data);
         setRecipientAddress(recipientAddressInternal);
         setSelectedMethod(SendMethods.TRANSFER_INTERNAL);
         if (onlyChangeAddress.current) {
             return;
         }
-        setAmount(getAmountAfterDecimal((sendInfoGet === null || sendInfoGet === void 0 ? void 0 : sendInfoGet.amount) || 0, (tokenSet === null || tokenSet === void 0 ? void 0 : tokenSet.decimal) || 0));
+        setAmount(getAmountAfterDecimal((data === null || data === void 0 ? void 0 : data.amount) || 0, (tokenSet === null || tokenSet === void 0 ? void 0 : tokenSet.decimal) || 0));
         if (!tokenSet) {
             gotoStep(WithdrawStep.SELECT_TOKEN);
         }
@@ -335,11 +336,13 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                 break;
         }
     };
-    var handleGetEstimateFee = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var handleGetEstimateFee = (0, react_1.useCallback)(function () { return __awaiter(void 0, void 0, void 0, function () {
         var response;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
+                    if (!selectedToken)
+                        return [2 /*return*/];
                     setIsLoadingEstimateFee(true);
                     return [4 /*yield*/, (0, get_est_fee_service_1.default)({
                             amount: "".concat(amount),
@@ -353,7 +356,7 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                     return [2 /*return*/];
             }
         });
-    }); };
+    }); }, [amount, selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.slug]);
     var openScannerAddressQrCode = function () {
         var _a;
         (_a = scannerAddressQrCodeRef.current) === null || _a === void 0 ? void 0 : _a.open();
@@ -423,7 +426,7 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
         });
     }); };
     var handleScanAllQrCode = function (result) { return __awaiter(void 0, void 0, void 0, function () {
-        var text, tonTransferParam, validateWalletAddress;
+        var text, isReceiveInternal, tonTransferParam, validateWalletAddress;
         var _a, _b, _c, _d, _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
@@ -432,7 +435,11 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                     if (!result) return [3 /*break*/, 2];
                     console.error("result", result);
                     text = (_b = result === null || result === void 0 ? void 0 : result[0]) === null || _b === void 0 ? void 0 : _b.rawValue;
-                    tonTransferParam = (0, parseTonTransferUrl_1.default)(text);
+                    isReceiveInternal = text === null || text === void 0 ? void 0 : text.includes("isTekWalletReceiveInternal");
+                    tonTransferParam = isReceiveInternal
+                        ? JSON.parse(text)
+                        : (0, parseTonTransferUrl_1.default)(text);
+                    console.warn("🚀 ~ handleScanAllQrCode ~ tonTransferParam:", tonTransferParam);
                     console.warn("🚀 ~ handleScanAllQrCode ~ tonTransferParam:", tonTransferParam);
                     (_c = backDropRef.current) === null || _c === void 0 ? void 0 : _c.open();
                     return [4 /*yield*/, (0, validate_wallet_address_service_1.default)({
@@ -459,15 +466,16 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                         setRecipientAddressError(undefined);
                     }
                     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();
+                        if (isReceiveInternal) {
+                            handleSelectTransferInternal(tonTransferParam);
+                        }
+                        else {
+                            (_e = suggestUseTransferInternalDialogRef.current) === null || _e === void 0 ? void 0 : _e.open();
+                        }
                     }
                     else if (!!(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.valid)) {
-                        //external
                         handleSelectContinueTransferExternal(tonTransferParam);
-                        console.warn("external");
                     }
                     else {
                         setInfoDialogContent("Unsupported QR");
@@ -535,7 +543,7 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
     }, [validateAmount]);
     (0, react_1.useEffect)(function () {
         handleGetEstimateFee();
-    }, [amount, selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.slug]);
+    }, [handleGetEstimateFee]);
     return ((0, jsx_runtime_1.jsx)(RequireConnect_1.default, { children: (0, jsx_runtime_1.jsx)(DrawerComponent_1.default, { ref: drawerRef, trigger: props.children, onOpen: props.onOpen, onClose: handleOnClose, children: (0, jsx_runtime_1.jsxs)(ModalLayout_1.default, { overrideHeader: (0, jsx_runtime_1.jsx)(BackHeader_1.default, { sx: {
                         width: "100%",
                         display: "flex",
@@ -598,7 +606,7 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                                     display: "grid",
                                     gridTemplateColumns: "1fr auto 1fr",
                                     gap: theme.mixins.gaps.g8,
-                                }, children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.dialogActionsCancel), { width: "100%" }), onClick: function () { return handleSelectContinueTransferExternal(); }, children: "Keep continue" }), (0, jsx_runtime_1.jsx)(material_1.Divider, { orientation: "vertical", variant: "middle", flexItem: true }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.dialogActionsOk), { width: "100%" }), onClick: handleSelectTransferInternal, children: "Ok" })] }) }) })] }) }) }));
+                                }, children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.dialogActionsCancel), { width: "100%" }), onClick: function () { return handleSelectContinueTransferExternal(); }, children: "Keep continue" }), (0, jsx_runtime_1.jsx)(material_1.Divider, { orientation: "vertical", variant: "middle", flexItem: true }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.dialogActionsOk), { width: "100%" }), onClick: function () { return handleSelectTransferInternal(); }, children: "Ok" })] }) }) })] }) }) }));
 });
 WithdrawFunction.displayName = "WithdrawFunction";
 exports.default = WithdrawFunction;

package/package.json

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