tek-wallet 0.0.514 → 0.0.516

package/dist/components/ui/SendExternalToken/index.d.ts

@@ -8,10 +8,8 @@ interface SendExternalDataType extends Omit<SendExternalBody, "network" | "passc
 interface SendExternalTokenProps extends Omit<ConfirmLayoutProps, "action"> {
     sendExternalData: SendExternalDataType;
     onSuccess?: (data: SendExternalResponse) => any;
+    initFeeData?: FeesDataType;
     onStart?: () => void;
-    setEstimateFee?: (data: FeesDataType) => void;
-    setAmountError?: (data: number | undefined) => void;
-    setIsLoadingEstimateFee?: (data: boolean) => void;
 }
 export interface SendExternalTokenRef {
     open: () => void;

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

@@ -95,6 +95,7 @@ var ConfirmByPasscode_1 = __importDefault(require("../ConfirmByPasscode"));
 var react_1 = require("react");
 var Text_1 = __importDefault(require("../Text"));
 var RequireConnect_1 = __importDefault(require("../RequireConnect"));
+var useWalletData_1 = __importDefault(require("../../../hooks/useWalletData"));
 var useWithdrawData_1 = __importDefault(require("../../../hooks/useWithdrawData"));
 var send_external_service_1 = __importDefault(require("../../../services/axios/send-external-service"));
 var Icon_1 = __importDefault(require("../Icon"));
@@ -102,7 +103,6 @@ var Fees_1 = __importDefault(require("../Fees"));
 var get_est_fee_service_1 = __importDefault(require("../../../services/axios/get-est-fee-service"));
 var type_1 = require("../../../services/axios/get-activities-service/type");
 var Activities_1 = __importDefault(require("../Activities"));
-var createDebounce_1 = __importDefault(require("../../../utils/createDebounce"));
 var SendExternalTokenError;
 (function (SendExternalTokenError) {
     SendExternalTokenError["TOKEN_NOT_FOUND"] = "Token not found";
@@ -111,88 +111,71 @@ var SendExternalTokenError;
     SendExternalTokenError["MIN_AMOUNT"] = "Min amount";
     SendExternalTokenError["FAILED"] = "Failed";
 })(SendExternalTokenError || (exports.SendExternalTokenError = SendExternalTokenError = {}));
-var getEstimateFeeDebounce = (0, createDebounce_1.default)(1000);
 var transactionSlug = type_1.TransactionSlug.Withdrawn;
 var SendExternalToken = (0, react_1.forwardRef)(function (props, ref) {
-    var _a, _b, _c;
+    var _a;
     var theme = (0, material_1.useTheme)();
     var withdrawTokens = (0, useWithdrawData_1.default)().withdrawTokens;
+    var isAuthenticated = (0, useWalletData_1.default)().isAuthenticated;
     var confirmLayoutDrawerRef = (0, react_1.useRef)(null);
-    var _d = (0, react_1.useState)(undefined), token = _d[0], setToken = _d[1];
-    var _e = (0, react_1.useState)(undefined), error = _e[0], setError = _e[1];
-    var _f = (0, react_1.useState)(undefined), amountError = _f[0], setAmountError = _f[1];
-    var _g = (0, react_1.useState)(Button_1.BUTTON_STATUS.ENABLED), buttonStatus = _g[0], setButtonStatus = _g[1];
-    var _h = (0, react_1.useState)(), estimateFee = _h[0], setEstimateFee = _h[1];
-    var _j = (0, react_1.useState)(false), isLoadingEstimateFee = _j[0], setIsLoadingEstimateFee = _j[1];
+    var _b = (0, react_1.useState)(undefined), token = _b[0], setToken = _b[1];
+    var _c = (0, react_1.useState)(undefined), error = _c[0], setError = _c[1];
+    var _d = (0, react_1.useState)(undefined), errorAmount = _d[0], setErrorAmount = _d[1];
+    var _e = (0, react_1.useState)(Button_1.BUTTON_STATUS.ENABLED), buttonStatus = _e[0], setButtonStatus = _e[1];
+    var _f = (0, react_1.useState)(props.initFeeData), estimateFee = _f[0], setEstimateFee = _f[1];
+    var _g = (0, react_1.useState)(false), isLoadingEstimateFee = _g[0], setIsLoadingEstimateFee = _g[1];
     var activitiesRef = (0, react_1.useRef)(null);
     var amount = props.sendExternalData.amount;
     var network = props.sendExternalData.network;
     var memo = props.sendExternalData.memo;
     var toAddress = props.sendExternalData.to_address;
     var tokenSlug = props.sendExternalData.currency_slug;
-    var validateAmount = (0, react_1.useCallback)(function () {
-        var amount = +props.sendExternalData.amount;
-        var token = withdrawTokens === null || withdrawTokens === void 0 ? void 0 : withdrawTokens.find(function (token) { var _a; return token.slug === ((_a = props.sendExternalData) === null || _a === void 0 ? void 0 : _a.currency_slug); });
+    var getEstimateFee = (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 (!tokenSlug || !!errorAmount)
+                        return [2 /*return*/];
+                    setIsLoadingEstimateFee(true);
+                    return [4 /*yield*/, (0, get_est_fee_service_1.default)({
+                            amount: "".concat(amount),
+                            transaction_type: transactionSlug,
+                            currency: tokenSlug || "",
+                        })];
+                case 1:
+                    response = _a.sent();
+                    setIsLoadingEstimateFee(false);
+                    setEstimateFee(response === null || response === void 0 ? void 0 : response.data);
+                    return [2 /*return*/];
+            }
+        });
+    }); }, [amount, tokenSlug, errorAmount]);
+    var validateAmount = (0, react_1.useCallback)(function (sendExternalData) {
+        var token = withdrawTokens === null || withdrawTokens === void 0 ? void 0 : withdrawTokens.find(function (token) { return token.slug === sendExternalData.currency_slug; });
         setToken(token);
         if (!token) {
             setError(SendExternalTokenError.TOKEN_NOT_FOUND);
             return;
         }
-        if (amount > token.max_value) {
+        if (+sendExternalData.amount > token.max_value) {
             setError(SendExternalTokenError.MAX_AMOUNT);
-            setAmountError(token.max_value);
+            setErrorAmount(token.max_value);
             return;
         }
-        if (amount < token.min_value) {
+        if (+sendExternalData.amount < token.min_value) {
             setError(SendExternalTokenError.MIN_AMOUNT);
-            setAmountError(token.min_value);
+            setErrorAmount(token.min_value);
             return;
         }
-        if (amount > +token.balance) {
+        if (+sendExternalData.amount > +token.balance) {
             setError(SendExternalTokenError.NOT_ENOUGH_BALANCE);
-            setAmountError(token.balance);
+            setErrorAmount(token.balance);
             return;
         }
         setError(undefined);
-        setAmountError(undefined);
-        return true;
-    }, [withdrawTokens, (_a = props.sendExternalData) === null || _a === void 0 ? void 0 : _a.currency_slug, (_b = props.sendExternalData) === null || _b === void 0 ? void 0 : _b.amount]);
-    var getEstimateFee = (0, react_1.useCallback)(function () { return __awaiter(void 0, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            if (!tokenSlug) {
-                setIsLoadingEstimateFee(false);
-                return [2 /*return*/];
-            }
-            setIsLoadingEstimateFee(true);
-            getEstimateFeeDebounce(function () { return __awaiter(void 0, void 0, void 0, function () {
-                var isValidateAmount, response, fee;
-                var _a;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            isValidateAmount = validateAmount();
-                            if (!isValidateAmount) {
-                                setIsLoadingEstimateFee(false);
-                                return [2 /*return*/];
-                            }
-                            return [4 /*yield*/, (0, get_est_fee_service_1.default)({
-                                    amount: "".concat(amount),
-                                    transaction_type: transactionSlug,
-                                    currency: tokenSlug || "",
-                                })];
-                        case 1:
-                            response = _b.sent();
-                            setIsLoadingEstimateFee(false);
-                            fee = response === null || response === void 0 ? void 0 : response.data;
-                            setEstimateFee(fee);
-                            (_a = props.setEstimateFee) === null || _a === void 0 ? void 0 : _a.call(props, fee);
-                            return [2 /*return*/];
-                    }
-                });
-            }); });
-            return [2 /*return*/];
-        });
-    }); }, [validateAmount, tokenSlug, amount]);
+        setErrorAmount(undefined);
+    }, [withdrawTokens]);
     var handleSendExternalToken = function (passcode) { return __awaiter(void 0, void 0, void 0, function () {
         var response, err_1;
         var _a, _b;
@@ -231,10 +214,14 @@ var SendExternalToken = (0, react_1.forwardRef)(function (props, ref) {
     }); };
     var handleOpen = function () {
         var _a;
+        if (!isAuthenticated)
+            throw new Error("Please connect your wallet");
         (_a = confirmLayoutDrawerRef.current) === null || _a === void 0 ? void 0 : _a.open();
     };
     var handleClose = function () {
         var _a;
+        if (!isAuthenticated)
+            throw new Error("Please connect your wallet");
         (_a = confirmLayoutDrawerRef.current) === null || _a === void 0 ? void 0 : _a.close();
     };
     (0, react_1.useImperativeHandle)(ref, function () { return ({
@@ -249,12 +236,15 @@ var SendExternalToken = (0, react_1.forwardRef)(function (props, ref) {
     (0, react_1.useEffect)(function () {
         getEstimateFee();
     }, [getEstimateFee]);
+    (0, react_1.useEffect)(function () {
+        validateAmount(props.sendExternalData);
+    }, [validateAmount, props.sendExternalData]);
     return ((0, jsx_runtime_1.jsx)(RequireConnect_1.default, { children: (0, jsx_runtime_1.jsxs)(ConfirmLayout_1.default, { ref: confirmLayoutDrawerRef, action: transactionSlug, trigger: props.children, children: [(0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { gap: theme.mixins.gaps.g12 }), children: [(0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign({}, theme.mixins.paper), children: [(0, jsx_runtime_1.jsx)(LineValue_1.default, { field: "Recipient address", value: (0, jsx_runtime_1.jsx)(Text_1.default, { sx: {
                                             wordBreak: "break-all",
-                                        }, children: toAddress }) }), (0, jsx_runtime_1.jsx)(LineValue_1.default, { field: "Network", value: (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g6, ml: "auto" }), children: [(0, jsx_runtime_1.jsx)(Icon_1.default, { width: 20, src: network === null || network === void 0 ? void 0 : network.icon }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.value), children: network === null || network === void 0 ? void 0 : network.name })] }) }), (0, jsx_runtime_1.jsx)(LineValue_1.default, { field: "Amount", value: (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: amount, unit: " ".concat(token === null || token === void 0 ? void 0 : token.name) }) }), !!memo && (0, jsx_runtime_1.jsx)(LineValue_1.default, { field: "Memo", value: memo }), ((_c = estimateFee === null || estimateFee === void 0 ? void 0 : estimateFee.feeDetail) === null || _c === void 0 ? void 0 : _c.length) && !!amount && ((0, jsx_runtime_1.jsx)(Fees_1.default, { feesData: JSON.stringify(estimateFee), amount: +amount })), (0, jsx_runtime_1.jsx)(LineValue_1.default, { field: "Receive amount estimated", value: (0, jsx_runtime_1.jsx)(Text_1.default, { sx: {
+                                        }, children: toAddress }) }), (0, jsx_runtime_1.jsx)(LineValue_1.default, { field: "Network", value: (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g6, ml: "auto" }), children: [(0, jsx_runtime_1.jsx)(Icon_1.default, { width: 20, src: network === null || network === void 0 ? void 0 : network.icon }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.value), children: network === null || network === void 0 ? void 0 : network.name })] }) }), (0, jsx_runtime_1.jsx)(LineValue_1.default, { field: "Amount", value: (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: amount, unit: " ".concat(token === null || token === void 0 ? void 0 : token.name) }) }), !!memo && (0, jsx_runtime_1.jsx)(LineValue_1.default, { field: "Memo", value: memo }), ((_a = estimateFee === null || estimateFee === void 0 ? void 0 : estimateFee.feeDetail) === null || _a === void 0 ? void 0 : _a.length) && !!amount && ((0, jsx_runtime_1.jsx)(Fees_1.default, { feesData: JSON.stringify(estimateFee), amount: +amount })), (0, jsx_runtime_1.jsx)(LineValue_1.default, { field: "Receive amount estimated", value: (0, jsx_runtime_1.jsx)(Text_1.default, { sx: {
                                             fontWeight: theme.typography.fontWeight600,
                                             fontSize: theme.typography.fontSize16,
-                                        }, children: (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: estimateReceive, unit: " ".concat(token === null || token === void 0 ? void 0 : token.name) }) }) }), !!error && ((0, jsx_runtime_1.jsxs)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.validationError), { mt: theme.mixins.gaps.g6 }), children: [error, " ", !!amountError && (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: amountError, unit: " ".concat(token === null || token === void 0 ? void 0 : token.name) })] }))] }), (0, jsx_runtime_1.jsx)(ConfirmByPasscode_1.default, { action: transactionSlug, onConfirmSuccess: handleSendExternalToken, children: (0, jsx_runtime_1.jsx)(Button_1.default.Primary, { status: !!error || isLoadingEstimateFee ? Button_1.BUTTON_STATUS.DISABLED : buttonStatus, sx: { width: "100%" }, children: "Confirm" }) })] }), (0, jsx_runtime_1.jsx)(Activities_1.default, { ref: activitiesRef })] }) }));
+                                        }, children: (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: estimateReceive, unit: " ".concat(token === null || token === void 0 ? void 0 : token.name) }) }) }), !!error && ((0, jsx_runtime_1.jsxs)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.validationError), { mt: theme.mixins.gaps.g6 }), children: [error, " ", !!errorAmount && (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: errorAmount, unit: " ".concat(token === null || token === void 0 ? void 0 : token.name) })] }))] }), (0, jsx_runtime_1.jsx)(ConfirmByPasscode_1.default, { action: transactionSlug, onConfirmSuccess: handleSendExternalToken, children: (0, jsx_runtime_1.jsx)(Button_1.default.Primary, { status: !!error || isLoadingEstimateFee ? Button_1.BUTTON_STATUS.DISABLED : buttonStatus, sx: { width: "100%" }, children: "Confirm" }) })] }), (0, jsx_runtime_1.jsx)(Activities_1.default, { ref: activitiesRef })] }) }));
 });
 SendExternalToken.displayName = "SendExternalToken";
 exports.default = SendExternalToken;

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

@@ -113,10 +113,13 @@ var AppBackDrop_1 = __importDefault(require("../AppBackDrop"));
 var DialogContentLayout_1 = __importDefault(require("../DialogContentLayout"));
 var AppDialog_1 = __importDefault(require("../AppDialog"));
 var Formatter_1 = __importDefault(require("../Formatter"));
+var get_est_fee_service_1 = __importDefault(require("../../../services/axios/get-est-fee-service"));
 var Fees_1 = __importDefault(require("../Fees"));
-var SendExternalToken_1 = __importDefault(require("../SendExternalToken"));
+var type_1 = require("../../../services/axios/get-activities-service/type");
+// import SendExternalToken from "../SendExternalToken";
 var SendInternalToken_1 = __importDefault(require("../SendInternalToken"));
 var createDebounce_1 = __importDefault(require("../../../utils/createDebounce"));
+var type_2 = require("../../../services/axios/validate-wallet-address-service/type");
 var SendMethods;
 (function (SendMethods) {
     SendMethods["SCAN_QR_CODE"] = "scan qr code";
@@ -144,6 +147,7 @@ var AmountError;
     AmountError["MAX_LIMIT"] = "The maximum amount is";
     AmountError["MIN_LIMIT"] = "The minimum amount is";
 })(AmountError || (exports.AmountError = AmountError = {}));
+var getEstimateFeeDebounce = (0, createDebounce_1.default)(500);
 var validateAddressDebounce = (0, createDebounce_1.default)(500);
 var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
     var _a;
@@ -164,7 +168,7 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
     var _m = (0, react_1.useState)(), amountError = _m[0], setAmountError = _m[1];
     var scannerAllQrCodeRef = (0, react_1.useRef)(null);
     var scannerAddressQrCodeRef = (0, react_1.useRef)(null);
-    var backDropRef = (0, react_1.useRef)(null);
+    var loadingDropRef = (0, react_1.useRef)(null);
     var suggestUseTransferInternalDialogRef = (0, react_1.useRef)(null);
     var suggestUseTransferExternalDialogRef = (0, react_1.useRef)(null);
     var _o = (0, react_1.useState)(), selectedMethod = _o[0], setSelectedMethod = _o[1];
@@ -240,6 +244,28 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
         open: open,
         close: close,
     }); });
+    var validateAmount = (0, react_1.useCallback)(function () {
+        var _a, _b;
+        if (!selectedToken)
+            return false;
+        if (+amount < +(selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.min_value)) {
+            setAmountErrorMessage(AmountError.MIN_LIMIT);
+            setAmountError(+((_a = selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.min_value) !== null && _a !== void 0 ? _a : 0));
+            return false;
+        }
+        if (+amount > +(selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.max_value)) {
+            setAmountErrorMessage(AmountError.MAX_LIMIT);
+            setAmountError(+((_b = selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.max_value) !== null && _b !== void 0 ? _b : 0));
+            return false;
+        }
+        if (+amount > +(selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.balance)) {
+            setAmountErrorMessage(AmountError.INSUFFICIENT_BALANCE);
+            return false;
+        }
+        setAmountError(undefined);
+        setAmountErrorMessage(undefined);
+        return true;
+    }, [amount, selectedToken]);
     var handleClearInfoDialogContent = function () {
         setInfoDialogContent(undefined);
     };
@@ -329,6 +355,39 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                 break;
         }
     };
+    var getEstimateFee = (0, react_1.useCallback)(function () { return __awaiter(void 0, void 0, void 0, function () {
+        var isValidateAmount;
+        return __generator(this, function (_a) {
+            if (!selectedToken)
+                return [2 /*return*/];
+            isValidateAmount = validateAmount();
+            console.warn("🚀 ~ getEstimateFee ~ isValidateAmount:", isValidateAmount);
+            if (!isValidateAmount)
+                return [2 /*return*/];
+            console.warn("🚀 ~ getEstimateFee ~ isValidateAmount 2:", isValidateAmount);
+            setIsLoadingEstimateFee(true);
+            getEstimateFeeDebounce(function () { return __awaiter(void 0, void 0, void 0, function () {
+                var response;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, (0, get_est_fee_service_1.default)({
+                                amount: "".concat(amount),
+                                transaction_type: selectedMethod === SendMethods.TRANSFER_EXTERNAL
+                                    ? type_1.TransactionSlug.Withdrawn
+                                    : type_1.TransactionSlug.TransferInternal,
+                                currency: (selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.slug) || "",
+                            })];
+                        case 1:
+                            response = _a.sent();
+                            setIsLoadingEstimateFee(false);
+                            setEstimateFee(response === null || response === void 0 ? void 0 : response.data);
+                            return [2 /*return*/];
+                    }
+                });
+            }); });
+            return [2 /*return*/];
+        });
+    }); }, [selectedToken, validateAmount, amount, selectedMethod]);
     var openScannerAddressQrCode = function () {
         var _a;
         (_a = scannerAddressQrCodeRef.current) === null || _a === void 0 ? void 0 : _a.open();
@@ -365,7 +424,7 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
         return __generator(this, function (_a) {
             setIsValidatingAddress(true);
             validateAddressDebounce(function () { return __awaiter(void 0, void 0, void 0, function () {
-                var validateWalletAddress;
+                var result, message;
                 var _a;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
@@ -374,22 +433,28 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                                 network: network,
                             })];
                         case 1:
-                            validateWalletAddress = _b.sent();
+                            result = _b.sent();
+                            message = result.message;
                             setIsValidatingAddress(false);
-                            if (!!(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.valid)) {
-                                setRecipientAddressError(undefined);
+                            if (message === type_2.ValidateWalletAddressResultMessage.ERROR) {
+                                setRecipientAddressError("Something went wrong, please try again");
+                                return [2 /*return*/];
                             }
-                            if (!!(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.master_wallet_address)) {
+                            if (message === type_2.ValidateWalletAddressResultMessage.IN_VALID) {
+                                setRecipientAddressError("Invalid wallet address");
+                                return [2 /*return*/];
+                            }
+                            if (message === type_2.ValidateWalletAddressResultMessage.IS_CURRENT_WALLET) {
+                                setInfoDialogContent("You can not send to yourself wallet");
+                                return [2 /*return*/];
+                            }
+                            if (message === type_2.ValidateWalletAddressResultMessage.INTERNAL_WALLET) {
                                 (_a = suggestUseTransferInternalDialogRef.current) === null || _a === void 0 ? void 0 : _a.open();
                             }
-                            else if (!!(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.valid)) {
-                                //external
+                            if (message === type_2.ValidateWalletAddressResultMessage.EXTERNAL_WALLET) {
                                 handleSelectContinueTransferExternal();
                             }
-                            else {
-                                // setInfoDialogContent("Unsupported QR");
-                                setRecipientAddressError("Invalid wallet address");
-                            }
+                            setRecipientAddressError(undefined);
                             return [2 /*return*/];
                     }
                 });
@@ -398,7 +463,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, isReceiveInternal, tonTransferParam, validateWalletAddress;
+        var text, isReceiveInternal, tonTransferParam, validateResult, message, validateData;
         var _a, _b, _c, _d, _e, _f;
         return __generator(this, function (_g) {
             switch (_g.label) {
@@ -411,49 +476,47 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                     tonTransferParam = isReceiveInternal
                         ? JSON.parse(text)
                         : (0, parseTonTransferUrl_1.default)(text);
-                    (_c = backDropRef.current) === null || _c === void 0 ? void 0 : _c.open();
+                    (_c = loadingDropRef.current) === null || _c === void 0 ? void 0 : _c.open();
                     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 = _g.sent();
-                    if (!validateWalletAddress) {
-                        setInfoDialogContent("Unsupported QR");
+                    validateResult = _g.sent();
+                    message = validateResult.message, validateData = validateResult.data;
+                    if (message === type_2.ValidateWalletAddressResultMessage.ERROR) {
+                        setInfoDialogContent("Something went wrong, please try again");
+                        // setRecipientAddressError("Invalid wallet address");
                         return [2 /*return*/];
                     }
-                    if (validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.master_wallet_address) {
-                        tonTransferParam.address = validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.master_wallet_address;
-                    }
-                    setSendInfoGet(tonTransferParam);
-                    (_d = backDropRef.current) === null || _d === void 0 ? void 0 : _d.close();
-                    if (validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.is_current_wallet) {
-                        setInfoDialogContent("You can not send to your own wallet");
+                    if (message === type_2.ValidateWalletAddressResultMessage.IN_VALID) {
+                        setInfoDialogContent("Unsupported QR");
                         return [2 /*return*/];
                     }
-                    if (!!(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.valid)) {
-                        setRecipientAddressError(undefined);
+                    if (message === type_2.ValidateWalletAddressResultMessage.IS_CURRENT_WALLET) {
+                        setInfoDialogContent("You can not send to yourself wallet");
+                        return [2 /*return*/];
                     }
-                    if (!!(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.master_wallet_address)) {
+                    setRecipientAddressError(undefined);
+                    if (message === type_2.ValidateWalletAddressResultMessage.INTERNAL_WALLET) {
+                        tonTransferParam.address = validateData.master_wallet_address;
                         if (isReceiveInternal || selectedMethod === SendMethods.TRANSFER_INTERNAL) {
                             handleSelectTransferInternal(tonTransferParam);
                         }
                         else {
-                            (_e = suggestUseTransferInternalDialogRef.current) === null || _e === void 0 ? void 0 : _e.open();
+                            (_d = suggestUseTransferInternalDialogRef.current) === null || _d === void 0 ? void 0 : _d.open();
                         }
                     }
-                    else if (!!(validateWalletAddress === null || validateWalletAddress === void 0 ? void 0 : validateWalletAddress.valid)) {
+                    if (message === type_2.ValidateWalletAddressResultMessage.EXTERNAL_WALLET) {
                         if (selectedMethod === SendMethods.TRANSFER_EXTERNAL || selectedMethod === SendMethods.SCAN_QR_CODE) {
                             handleSelectContinueTransferExternal(tonTransferParam);
                         }
                         else {
-                            (_f = suggestUseTransferExternalDialogRef.current) === null || _f === void 0 ? void 0 : _f.open();
+                            (_e = suggestUseTransferExternalDialogRef.current) === null || _e === void 0 ? void 0 : _e.open();
                         }
                     }
-                    else {
-                        setInfoDialogContent("Unsupported QR");
-                        setRecipientAddressError("Invalid wallet address");
-                    }
+                    setSendInfoGet(tonTransferParam);
+                    (_f = loadingDropRef.current) === null || _f === void 0 ? void 0 : _f.close();
                     _g.label = 2;
                 case 2: return [2 /*return*/];
             }
@@ -476,6 +539,9 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
             updateSendInternalToken();
         }
     }, [isAuthenticated, withdrawTokens, sendInternalTokens]);
+    (0, react_1.useEffect)(function () {
+        getEstimateFee();
+    }, [getEstimateFee]);
     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",
@@ -521,21 +587,28 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                                                         placeholder: "Enter memo",
                                                         value: memo,
                                                         onChange: handleChangeMemo,
-                                                    } })] })), !!((_a = estimateFee === null || estimateFee === void 0 ? void 0 : estimateFee.feeDetail) === null || _a === void 0 ? void 0 : _a.length) && !!amount && ((0, jsx_runtime_1.jsx)(Fees_1.default, { feesData: JSON.stringify(estimateFee), amount: +amount })), estimateReceive !== undefined && !amountError && ((0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign({}, theme.mixins.row), children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.fieldTitle), children: "Receive amount estimated" }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.value), { ml: "auto" }), children: (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: estimateReceive }) })] })), selectedMethod === SendMethods.TRANSFER_EXTERNAL && ((0, jsx_runtime_1.jsx)(SendExternalToken_1.default, { setEstimateFee: setEstimateFee, setAmountError: setAmountError, setIsLoadingEstimateFee: setIsLoadingEstimateFee, sendExternalData: {
-                                                amount: "".concat(amount),
-                                                currency_slug: (selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.slug) || "",
-                                                to_address: recipientAddress || "",
-                                                network: selectedNetwork,
-                                                memo: memo || "",
-                                            }, onSuccess: close, children: (0, jsx_runtime_1.jsx)(Button_1.default.Primary, { sx: { width: "100%" }, status: !!amountError ||
-                                                    !!recipientAddressError ||
-                                                    !recipientAddress ||
-                                                    !amount ||
-                                                    !selectedToken ||
-                                                    isLoadingEstimateFee ||
-                                                    isValidatingAddress
-                                                    ? Button_1.BUTTON_STATUS.DISABLED
-                                                    : Button_1.BUTTON_STATUS.ENABLED, children: "Continue" }) })), selectedMethod === SendMethods.TRANSFER_INTERNAL && ((0, jsx_runtime_1.jsx)(SendInternalToken_1.default, { initFeeData: estimateFee, sendInternalData: {
+                                                    } })] })), !!((_a = estimateFee === null || estimateFee === void 0 ? void 0 : estimateFee.feeDetail) === null || _a === void 0 ? void 0 : _a.length) && !!amount && ((0, jsx_runtime_1.jsx)(Fees_1.default, { feesData: JSON.stringify(estimateFee), amount: +amount })), estimateReceive !== undefined && !amountError && ((0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign({}, theme.mixins.row), children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.fieldTitle), children: "Receive amount estimated" }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.value), { ml: "auto" }), children: (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: estimateReceive }) })] })), selectedMethod === SendMethods.TRANSFER_EXTERNAL && (
+                                        // <SendExternalToken
+                                        //   initFeeData={estimateFee}
+                                        //   sendExternalData={{
+                                        //     amount: `${amount}`,
+                                        //     currency_slug: selectedToken?.slug || "",
+                                        //     to_address: recipientAddress || "",
+                                        //     network: selectedNetwork as NetworkData,
+                                        //     memo: memo || "",
+                                        //   }}
+                                        //   onSuccess={close}
+                                        // >
+                                        // </SendExternalToken>
+                                        (0, jsx_runtime_1.jsx)(Button_1.default.Primary, { sx: { width: "100%" }, status: !!amountError ||
+                                                !!recipientAddressError ||
+                                                !recipientAddress ||
+                                                !amount ||
+                                                !selectedToken ||
+                                                isLoadingEstimateFee ||
+                                                isValidatingAddress
+                                                ? Button_1.BUTTON_STATUS.DISABLED
+                                                : Button_1.BUTTON_STATUS.ENABLED, children: "Continue" })), selectedMethod === SendMethods.TRANSFER_INTERNAL && ((0, jsx_runtime_1.jsx)(SendInternalToken_1.default, { initFeeData: estimateFee, sendInternalData: {
                                                 amount: "".concat(amount),
                                                 currency_slug: (selectedToken === null || selectedToken === void 0 ? void 0 : selectedToken.slug) || "",
                                                 to_address: recipientAddress || "",
@@ -547,7 +620,7 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                                                     isLoadingEstimateFee ||
                                                     isValidatingAddress
                                                     ? Button_1.BUTTON_STATUS.DISABLED
-                                                    : Button_1.BUTTON_STATUS.ENABLED, children: "Continue" }) }))] }) }, WithdrawStep.FORM)] }), (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: (0, jsx_runtime_1.jsx)(Text_1.default, { sx: {
+                                                    : Button_1.BUTTON_STATUS.ENABLED, children: "Continue" }) }))] }) }, WithdrawStep.FORM)] }), (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: loadingDropRef }), (0, jsx_runtime_1.jsx)(AppDialog_1.default, { overrideOpen: !!infoDialogContent, children: (0, jsx_runtime_1.jsx)(DialogContentLayout_1.default, { content: (0, jsx_runtime_1.jsx)(Text_1.default, { sx: {
                                     textAlign: "center",
                                     display: "inline-block",
                                     width: "100%",

package/dist/services/axios/validate-wallet-address-service/index.d.ts

@@ -1,3 +1,3 @@
-import { ValidateWalletAddressBody, ValidateWalletAddressData } from "./type";
-declare const validateWalletAddressService: (body: ValidateWalletAddressBody) => Promise<ValidateWalletAddressData | undefined>;
+import { ValidateWalletAddressBody, ValidateWalletAddressResult } from "./type";
+declare const validateWalletAddressService: (body: ValidateWalletAddressBody) => Promise<ValidateWalletAddressResult>;
 export default validateWalletAddressService;

package/dist/services/axios/validate-wallet-address-service/index.js

@@ -40,8 +40,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var userClientRequest_1 = __importDefault(require("../clients/userClientRequest"));
+var type_1 = require("./type");
 var validateWalletAddressService = function (body) { return __awaiter(void 0, void 0, void 0, function () {
-    var response, error_1;
+    var response, data, error_1;
     var _a;
     return __generator(this, function (_b) {
         switch (_b.label) {
@@ -50,11 +51,30 @@ var validateWalletAddressService = function (body) { return __awaiter(void 0, vo
                 return [4 /*yield*/, userClientRequest_1.default.get("/crypto/validate-address/".concat(body.network, "?address=").concat(body.address))];
             case 1:
                 response = _b.sent();
-                return [2 /*return*/, (_a = response.data) === null || _a === void 0 ? void 0 : _a.data];
+                data = (_a = response.data) === null || _a === void 0 ? void 0 : _a.data;
+                if (!(data === null || data === void 0 ? void 0 : data.valid)) {
+                    return [2 /*return*/, {
+                            message: type_1.ValidateWalletAddressResultMessage.IN_VALID,
+                            data: data,
+                        }];
+                }
+                if (data === null || data === void 0 ? void 0 : data.master_wallet_address) {
+                    return [2 /*return*/, {
+                            message: type_1.ValidateWalletAddressResultMessage.INTERNAL_WALLET,
+                            data: data,
+                        }];
+                }
+                return [2 /*return*/, {
+                        message: type_1.ValidateWalletAddressResultMessage.EXTERNAL_WALLET,
+                        data: data,
+                    }];
             case 2:
                 error_1 = _b.sent();
                 console.error(error_1);
-                return [2 /*return*/];
+                return [2 /*return*/, {
+                        message: type_1.ValidateWalletAddressResultMessage.ERROR,
+                        data: undefined,
+                    }];
             case 3: return [2 /*return*/];
         }
     });

package/dist/services/axios/validate-wallet-address-service/type.d.ts

@@ -16,3 +16,14 @@ export interface ValidateWalletAddressBody {
     address: string;
     network: string;
 }
+export interface ValidateWalletAddressResult {
+    message: ValidateWalletAddressResultMessage;
+    data: ValidateWalletAddressData | undefined;
+}
+export declare enum ValidateWalletAddressResultMessage {
+    IN_VALID = "invalid",
+    INTERNAL_WALLET = "internal wallet",
+    EXTERNAL_WALLET = "external wallet",
+    ERROR = "error",
+    IS_CURRENT_WALLET = "is current wallet"
+}

package/dist/services/axios/validate-wallet-address-service/type.js

@@ -1,2 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ValidateWalletAddressResultMessage = void 0;
+var ValidateWalletAddressResultMessage;
+(function (ValidateWalletAddressResultMessage) {
+    ValidateWalletAddressResultMessage["IN_VALID"] = "invalid";
+    ValidateWalletAddressResultMessage["INTERNAL_WALLET"] = "internal wallet";
+    ValidateWalletAddressResultMessage["EXTERNAL_WALLET"] = "external wallet";
+    ValidateWalletAddressResultMessage["ERROR"] = "error";
+    ValidateWalletAddressResultMessage["IS_CURRENT_WALLET"] = "is current wallet";
+})(ValidateWalletAddressResultMessage || (exports.ValidateWalletAddressResultMessage = ValidateWalletAddressResultMessage = {}));

package/package.json

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