tek-wallet 0.0.512 → 0.0.513

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

@@ -8,8 +8,10 @@ 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,7 +95,6 @@ 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"));
@@ -103,6 +102,7 @@ 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,18 +111,18 @@ 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;
     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 _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 _d = (0, react_1.useState)(undefined), amountError = _d[0], setAmountError = _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 _f = (0, react_1.useState)(), 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;
@@ -130,27 +130,6 @@ var SendExternalToken = (0, react_1.forwardRef)(function (props, ref) {
     var memo = props.sendExternalData.memo;
     var toAddress = props.sendExternalData.to_address;
     var tokenSlug = props.sendExternalData.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);
@@ -160,22 +139,58 @@ var SendExternalToken = (0, react_1.forwardRef)(function (props, ref) {
         }
         if (+sendExternalData.amount > token.max_value) {
             setError(SendExternalTokenError.MAX_AMOUNT);
-            setErrorAmount(token.max_value);
+            setAmountError(token.max_value);
             return;
         }
         if (+sendExternalData.amount < token.min_value) {
             setError(SendExternalTokenError.MIN_AMOUNT);
-            setErrorAmount(token.min_value);
+            setAmountError(token.min_value);
             return;
         }
         if (+sendExternalData.amount > +token.balance) {
             setError(SendExternalTokenError.NOT_ENOUGH_BALANCE);
-            setErrorAmount(token.balance);
+            setAmountError(token.balance);
             return;
         }
         setError(undefined);
-        setErrorAmount(undefined);
+        setAmountError(undefined);
+        return true;
     }, [withdrawTokens]);
+    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;
+                var _a;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            isValidateAmount = validateAmount(props.sendExternalData);
+                            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);
+                            setEstimateFee(response === null || response === void 0 ? void 0 : response.data);
+                            (_a = props.setEstimateFee) === null || _a === void 0 ? void 0 : _a.call(props, response === null || response === void 0 ? void 0 : response.data);
+                            return [2 /*return*/];
+                    }
+                });
+            }); });
+            return [2 /*return*/];
+        });
+    }); }, [amount, props.sendExternalData, tokenSlug, validateAmount]);
     var handleSendExternalToken = function (passcode) { return __awaiter(void 0, void 0, void 0, function () {
         var response, err_1;
         var _a, _b;
@@ -214,14 +229,10 @@ 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 ({
@@ -236,15 +247,12 @@ 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 }), ((_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, " ", !!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 })] }) }));
+                                        }, 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 })] }) }));
 });
 SendExternalToken.displayName = "SendExternalToken";
 exports.default = SendExternalToken;

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

@@ -113,9 +113,7 @@ 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 type_1 = require("../../../services/axios/get-activities-service/type");
 var SendExternalToken_1 = __importDefault(require("../SendExternalToken"));
 var SendInternalToken_1 = __importDefault(require("../SendInternalToken"));
 var createDebounce_1 = __importDefault(require("../../../utils/createDebounce"));
@@ -146,7 +144,6 @@ 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;
@@ -243,28 +240,6 @@ 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);
     };
@@ -354,39 +329,6 @@ 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();
@@ -534,9 +476,6 @@ 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",
@@ -582,7 +521,7 @@ 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, { initFeeData: estimateFee, sendExternalData: {
+                                                    } })] })), !!((_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 || "",

package/package.json

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