tek-wallet 0.0.296 → 0.0.298

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

@@ -107,13 +107,14 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
     var _c = (0, react_1.useState)(), selectedNetwork = _c[0], setSelectedNetwork = _c[1];
     var isAuthenticated = (0, useWalletData_1.default)().isAuthenticated;
     var _d = (0, useWithdrawData_1.default)(), withdrawTokens = _d.withdrawTokens, updateWithdrawToken = _d.updateWithdrawToken;
-    var _e = (0, react_1.useState)(), dialogContent = _e[0], setDialogContent = _e[1];
+    var _e = (0, react_1.useState)(), infoDialogContent = _e[0], setInfoDialogContent = _e[1];
     var _f = (0, react_1.useState)(""), amount = _f[0], setAmount = _f[1];
     var _g = (0, react_1.useState)(""), memo = _g[0], setMemo = _g[1];
     var _h = (0, react_1.useState)(""), recipientAddress = _h[0], setRecipientAddress = _h[1];
     var scannerAllQrCodeRef = (0, react_1.useRef)(null);
     var scannerAddressQrCodeRef = (0, react_1.useRef)(null);
     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 networks = (0, react_1.useMemo)(function () {
         console.warn("🚀 ~ networks ~ selectedToken:", selectedToken);
@@ -140,6 +141,9 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
         open: open,
         close: close,
     }); });
+    var handleClearInfoDialogContent = function () {
+        setInfoDialogContent(undefined);
+    };
     var handleChangeRecipientAddress = function (e) {
         setRecipientAddress(e.target.value);
     };
@@ -232,9 +236,9 @@ 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 _a, _b, _c, _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var _a, _b, _c, _d, _e;
+        return __generator(this, function (_f) {
+            switch (_f.label) {
                 case 0:
                     (_a = scannerAllQrCodeRef.current) === null || _a === void 0 ? void 0 : _a.close();
                     if (!result) return [3 /*break*/, 2];
@@ -248,13 +252,13 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                             network: (selectedNetwork === null || selectedNetwork === void 0 ? void 0 : selectedNetwork.slug) || "ton",
                         })];
                 case 1:
-                    validateWalletAddress = _e.sent();
+                    validateWalletAddress = _f.sent();
                     if (!validateWalletAddress) {
-                        alert("Unsupported QR");
+                        setInfoDialogContent("Unsupported QR");
                         return [2 /*return*/];
                     }
                     (_d = backDropRef.current) === null || _d === void 0 ? void 0 : _d.close();
-                    setDialogContent("Unsupported QR, please scan a valid QR code or enter the recipient address manually");
+                    setInfoDialogContent("Unsupported QR Code, please scan a valid QR code or enter the recipient address manually");
                     console.warn("validateWalletAddress", validateWalletAddress);
                     // if(validateWalletAddress?.is_current_wallet) {
                     //   return
@@ -262,6 +266,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");
+                        (_e = suggestUseTransferInternalDialogRef.current) === null || _e === void 0 ? void 0 : _e.open();
                     }
                     else if (!!(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.valid)) {
                         //external
@@ -271,7 +276,7 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                         //invalid
                         console.warn("invalid");
                     }
-                    _e.label = 2;
+                    _f.label = 2;
                 case 2: return [2 /*return*/];
             }
         });
@@ -325,7 +330,11 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                                                         placeholder: "Enter memo",
                                                         value: memo,
                                                         onChange: handleChangeMemo,
-                                                    } })] }), (0, jsx_runtime_1.jsx)(Button_1.default.Primary, { sx: { width: "100%" }, children: "Confirm" })] }) }, WithdrawStep.CONFIRM)] }, withdrawTokens === null || withdrawTokens === void 0 ? void 0 : withdrawTokens.length), (0, jsx_runtime_1.jsx)(QrCodeReader_1.default, { ref: scannerAllQrCodeRef, onResult: handleScanAllQrCode }), (0, jsx_runtime_1.jsx)(QrCodeReader_1.default, { ref: scannerAddressQrCodeRef, onResult: handleScanAddressQrCode }), (0, jsx_runtime_1.jsx)(AppBackDrop_1.default, { ref: backDropRef }), (0, jsx_runtime_1.jsx)(AppDialog_1.default, { overrideOpen: !!dialogContent, children: (0, jsx_runtime_1.jsx)(DialogContentLayout_1.default, { content: dialogContent, actions: (0, jsx_runtime_1.jsx)(Button_1.default.Primary, { children: "Confirm" }) }) })] }) }) }));
+                                                    } })] }), (0, jsx_runtime_1.jsx)(Button_1.default.Primary, { sx: { width: "100%" }, children: "Confirm" })] }) }, WithdrawStep.CONFIRM)] }, withdrawTokens === null || withdrawTokens === void 0 ? void 0 : withdrawTokens.length), (0, jsx_runtime_1.jsx)(QrCodeReader_1.default, { ref: scannerAllQrCodeRef, onResult: handleScanAllQrCode }), (0, jsx_runtime_1.jsx)(QrCodeReader_1.default, { ref: scannerAddressQrCodeRef, onResult: handleScanAddressQrCode }), (0, jsx_runtime_1.jsx)(AppBackDrop_1.default, { ref: backDropRef }), (0, jsx_runtime_1.jsx)(AppDialog_1.default, { overrideOpen: !!infoDialogContent, children: (0, jsx_runtime_1.jsx)(DialogContentLayout_1.default, { content: infoDialogContent, actions: (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.dialogActionsOk), { width: "100%" }), onClick: handleClearInfoDialogContent, children: "Ok" }) }) }), (0, jsx_runtime_1.jsx)(AppDialog_1.default, { ref: suggestUseTransferInternalDialogRef, children: (0, jsx_runtime_1.jsx)(DialogContentLayout_1.default, { content: "This wallet is supported transfer internal, use it for faster transaction?", actions: (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: {
+                                    display: "grid",
+                                    gridTemplate: "1fr 1fr",
+                                    gap: theme.mixins.gaps.g8,
+                                }, children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.dialogActionsCancel), { width: "100%" }), onClick: handleClearInfoDialogContent, 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: handleClearInfoDialogContent, children: "Ok" })] }) }) })] }) }) }));
 });
 WithdrawFunction.displayName = "WithdrawFunction";
 exports.default = WithdrawFunction;

package/dist/theme/mui/theme.js

@@ -272,8 +272,10 @@ var theme = (0, styles_1.createTheme)({
         },
         dialogActionsOk: {
             fontSize: typography.fontSize14,
-            lineHeight: typography.leading140,
+            lineHeight: typography.leading100,
             color: "#2482ff",
+            textAlign: "center",
+            padding: "".concat(customPadding.p8, " ").concat(customPadding.p16),
         },
         dialogActionsCancel: {
             fontSize: typography.fontSize14,

package/dist/utils/parseTonTransferUrl.d.ts

@@ -1,5 +1,5 @@
 export interface TonTransferUrlParams {
-    protocol: "ton" | "https";
+    protocol?: "ton" | "https";
     address: string;
     amount: string | undefined;
     text: string | undefined;

package/dist/utils/parseTonTransferUrl.js

@@ -3,94 +3,109 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = parseTonTransferUrl;
 var ton_core_1 = require("ton-core");
 function parseTonTransferUrl(url) {
-    var protocol;
-    var address;
-    var queryString = "";
-    var isDeepLinkFormat = false;
-    // Xác định loại URL
-    if (url.startsWith("ton://transfer/")) {
-        protocol = "ton";
-        var _a = url.split("?"), path = _a[0], query = _a[1];
-        address = path.split("/transfer/")[1];
-        queryString = query || "";
-    }
-    else if (url.startsWith("https://app.tonkeeper.com/transfer/")) {
-        protocol = "https";
-        var _b = url.split("?"), path = _b[0], query = _b[1];
-        address = path.split("/transfer/")[1];
-        queryString = query || "";
-    }
-    else if (url.startsWith("ton:")) {
-        protocol = "ton";
-        isDeepLinkFormat = true;
-        var _c = url.slice(4).split("?"), path = _c[0], query = _c[1];
-        address = path;
-        queryString = query || "";
-    }
-    else {
-        throw new Error('Invalid TON transfer URL. Must start with "ton://transfer/", "https://app.tonkeeper.com/transfer/", or "ton:"');
-    }
-    if (!address) {
-        throw new Error("Missing TON address in URL");
-    }
-    // Xác thực địa chỉ là TON address
     try {
-        ton_core_1.Address.parse(address); // Throws nếu không hợp lệ
-    }
-    catch (_d) {
-        throw new Error("Invalid TON address");
-    }
-    var result = {
-        protocol: protocol,
-        address: address,
-        amount: undefined,
-        text: undefined,
-        bin: undefined,
-        init: undefined,
-        jetton: undefined,
-        isDeepLinkFormat: isDeepLinkFormat,
-    };
-    if (queryString) {
-        var params = new URLSearchParams(queryString);
-        // amount
-        var amount = params.get("amount");
-        if (amount) {
-            if (!/^\d+(\.\d+)?$/.test(amount)) {
-                throw new Error("Invalid amount: must be a number");
-            }
-            result.amount = amount;
+        var protocol = void 0;
+        var address = void 0;
+        var queryString = "";
+        var isDeepLinkFormat = false;
+        // Xác định loại URL
+        if (url.startsWith("ton://transfer/")) {
+            protocol = "ton";
+            var _a = url.split("?"), path = _a[0], query = _a[1];
+            address = path.split("/transfer/")[1];
+            queryString = query || "";
         }
-        // text
-        if (params.has("text")) {
-            result.text = decodeURIComponent(params.get("text"));
+        else if (url.startsWith("https://app.tonkeeper.com/transfer/")) {
+            protocol = "https";
+            var _b = url.split("?"), path = _b[0], query = _b[1];
+            address = path.split("/transfer/")[1];
+            queryString = query || "";
         }
-        // bin
-        var bin = params.get("bin");
-        if (bin) {
-            if (!/^[A-Za-z0-9-_]+={0,2}$/.test(bin)) {
-                throw new Error("Invalid bin: must be Base64 URL-safe encoded");
-            }
-            result.bin = bin;
+        else if (url.startsWith("ton:")) {
+            protocol = "ton";
+            isDeepLinkFormat = true;
+            var _c = url.slice(4).split("?"), path = _c[0], query = _c[1];
+            address = path;
+            queryString = query || "";
         }
-        // init
-        var init = params.get("init");
-        if (init) {
-            if (!/^[A-Za-z0-9-_]+={0,2}$/.test(init)) {
-                throw new Error("Invalid init: must be Base64 URL-safe encoded");
-            }
-            result.init = init;
+        else {
+            throw new Error('Invalid TON transfer URL. Must start with "ton://transfer/", "https://app.tonkeeper.com/transfer/", or "ton:"');
+        }
+        if (!address) {
+            throw new Error("Missing TON address in URL");
+        }
+        // Xác thực địa chỉ là TON address
+        try {
+            ton_core_1.Address.parse(address); // Throws nếu không hợp lệ
+        }
+        catch (_d) {
+            throw new Error("Invalid TON address");
         }
-        // jetton
-        var jetton = params.get("jetton");
-        if (jetton) {
-            try {
-                ton_core_1.Address.parse(jetton); // kiểm tra hợp lệ
-                result.jetton = jetton;
+        var result = {
+            protocol: protocol,
+            address: address,
+            amount: undefined,
+            text: undefined,
+            bin: undefined,
+            init: undefined,
+            jetton: undefined,
+            isDeepLinkFormat: isDeepLinkFormat,
+        };
+        if (queryString) {
+            var params = new URLSearchParams(queryString);
+            // amount
+            var amount = params.get("amount");
+            if (amount) {
+                if (!/^\d+(\.\d+)?$/.test(amount)) {
+                    throw new Error("Invalid amount: must be a number");
+                }
+                result.amount = amount;
             }
-            catch (_e) {
-                throw new Error("Invalid jetton address");
+            // text
+            if (params.has("text")) {
+                result.text = decodeURIComponent(params.get("text"));
+            }
+            // bin
+            var bin = params.get("bin");
+            if (bin) {
+                if (!/^[A-Za-z0-9-_]+={0,2}$/.test(bin)) {
+                    throw new Error("Invalid bin: must be Base64 URL-safe encoded");
+                }
+                result.bin = bin;
+            }
+            // init
+            var init = params.get("init");
+            if (init) {
+                if (!/^[A-Za-z0-9-_]+={0,2}$/.test(init)) {
+                    throw new Error("Invalid init: must be Base64 URL-safe encoded");
+                }
+                result.init = init;
+            }
+            // jetton
+            var jetton = params.get("jetton");
+            if (jetton) {
+                try {
+                    ton_core_1.Address.parse(jetton); // kiểm tra hợp lệ
+                    result.jetton = jetton;
+                }
+                catch (_e) {
+                    throw new Error("Invalid jetton address");
+                }
             }
         }
+        return result;
+    }
+    catch (error) {
+        console.error("error", error);
+        return {
+            protocol: undefined,
+            address: url,
+            amount: undefined,
+            text: undefined,
+            bin: undefined,
+            init: undefined,
+            jetton: undefined,
+            isDeepLinkFormat: false,
+        };
     }
-    return result;
 }

package/package.json

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