tek-wallet 0.0.297 → 0.0.299

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 _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 _e = (0, react_1.useState)(), infoDialogContent = _e[0], setInfoDialogContent = _e[1];
+    var _f = (0, react_1.useState)(undefined), amount = _f[0], setAmount = _f[1];
+    var _g = (0, react_1.useState)(undefined), memo = _g[0], setMemo = _g[1];
+    var _h = (0, react_1.useState)(undefined), 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];
@@ -243,22 +247,20 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                     tonTransferParam = (0, parseTonTransferUrl_1.default)(text);
                     console.warn("🚀 ~ handleScanAllQrCode ~ tonTransferParam:", tonTransferParam);
                     (_c = backDropRef.current) === null || _c === void 0 ? void 0 : _c.open();
-                    if (!tonTransferParam) {
-                        alert("Unsupported QR");
-                        return [2 /*return*/];
-                    }
                     return [4 /*yield*/, (0, validate_wallet_address_service_1.default)({
                             address: tonTransferParam === null || tonTransferParam === void 0 ? void 0 : tonTransferParam.address,
                             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*/];
                     }
+                    setRecipientAddress(tonTransferParam === null || tonTransferParam === void 0 ? void 0 : tonTransferParam.address);
+                    setAmount(tonTransferParam === null || tonTransferParam === void 0 ? void 0 : tonTransferParam.amount);
+                    setMemo(tonTransferParam === null || tonTransferParam === void 0 ? void 0 : tonTransferParam.text);
                     (_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");
                     console.warn("validateWalletAddress", validateWalletAddress);
                     // if(validateWalletAddress?.is_current_wallet) {
                     //   return
@@ -266,21 +268,33 @@ 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
+                        handleSelectContinueTransferExternal();
                         console.warn("external");
                     }
                     else {
                         //invalid
                         console.warn("invalid");
                     }
-                    _e.label = 2;
+                    _f.label = 2;
                 case 2: return [2 /*return*/];
             }
         });
     }); };
     var handleScanAddressQrCode = function () { };
+    var handleSelectTransferInternal = function () {
+        var _a;
+        (_a = suggestUseTransferInternalDialogRef.current) === null || _a === void 0 ? void 0 : _a.close();
+        gotoStep(WithdrawStep.CONFIRM);
+    };
+    var handleSelectContinueTransferExternal = function () {
+        var _a;
+        (_a = suggestUseTransferInternalDialogRef.current) === null || _a === void 0 ? void 0 : _a.close();
+        gotoStep(WithdrawStep.CONFIRM);
+    };
     (0, react_1.useEffect)(function () {
         if (isAuthenticated && !withdrawTokens) {
             console.warn("🚀 ~ updateWithdrawToken ~ isAuthenticated:", isAuthenticated);
@@ -329,7 +343,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 send internally, use it for faster transaction?", actions: (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: {
+                                    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: 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" })] }) }) })] }) }) }));
 });
 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;
@@ -8,5 +8,4 @@ export interface TonTransferUrlParams {
     jetton: string | undefined;
     isDeepLinkFormat: boolean;
 }
-export type ParseTonTransferUrlResult = TonTransferUrlParams | undefined;
-export default function parseTonTransferUrl(url: string): ParseTonTransferUrlResult;
+export default function parseTonTransferUrl(url: string): TonTransferUrlParams;

package/dist/utils/parseTonTransferUrl.js

@@ -97,6 +97,15 @@ function parseTonTransferUrl(url) {
     }
     catch (error) {
         console.error("error", error);
-        return undefined;
+        return {
+            protocol: undefined,
+            address: url,
+            amount: undefined,
+            text: undefined,
+            bin: undefined,
+            init: undefined,
+            jetton: undefined,
+            isDeepLinkFormat: false,
+        };
     }
 }

package/package.json

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