tek-wallet 0.0.386 → 0.0.388

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

@@ -1,5 +1,6 @@
 import { AccordionProps } from "@mui/material";
 export interface FeesProps extends Omit<AccordionProps, "children"> {
+    feesData: string;
 }
 declare function Fees(props: FeesProps): import("react/jsx-runtime").JSX.Element;
 export default Fees;

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

@@ -32,14 +32,12 @@ var getIcon_1 = __importDefault(require("../../../utils/getIcon"));
 var Text_1 = __importDefault(require("../Text"));
 var Formatter_1 = __importDefault(require("../Formatter"));
 var jsx_runtime_2 = require("react/jsx-runtime");
-var FeeDetail = function (_a) {
-    var feeName = _a.feeName, value = _a.value;
-    var theme = (0, material_1.useTheme)();
-    return ((0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g4 }), children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.fieldTitle), { whiteSpace: "nowrap" }), children: feeName }), (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { flex: 1, width: "fit-content", alignItems: "flex-end" }), children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.value), children: (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: value }) }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.valueDescription), children: (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: value, start: "~ " }) })] })] }));
-};
+var parsePropsData_1 = __importDefault(require("../../../utils/parsePropsData"));
 function Fees(props) {
+    var _a, _b;
     var sx = props.sx, rest = __rest(props, ["sx"]);
     var theme = (0, material_1.useTheme)();
+    var feesData = (0, parsePropsData_1.default)(props === null || props === void 0 ? void 0 : props.feesData);
     return ((0, jsx_runtime_1.jsxs)(material_1.Accordion, __assign({ defaultExpanded: true }, rest, { sx: __assign({ "&.MuiAccordion-root": {
                 backgroundColor: "transparent",
                 margin: 0,
@@ -58,9 +56,20 @@ function Fees(props) {
             }, "& .MuiAccordionDetails-root": {
                 paddingLeft: theme.mixins.customPadding.p12,
                 paddingRight: theme.mixins.customPadding.p12,
-            } }, sx), children: [(0, jsx_runtime_1.jsx)(material_1.AccordionSummary, { expandIcon: (0, jsx_runtime_1.jsx)(Icon_1.default, { src: (0, getIcon_1.default)("arrow_down"), width: 20 }), children: (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { width: "100%" }), children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.fieldTitle), children: "Total fees" }), (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: 1000 }) })] }) }), (0, jsx_runtime_1.jsx)(material_1.AccordionDetails, { children: (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { alignItems: "stretch" }), children: [(0, jsx_runtime_1.jsx)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { width: "fit-content", gap: theme.mixins.gaps.g8, alignItems: "center" }), children: [1, 2, 3].map(function (item, index) { return ((0, jsx_runtime_1.jsxs)(jsx_runtime_2.Fragment, { children: [index !== 0 && ((0, jsx_runtime_1.jsx)(material_1.Box, { sx: {
-                                            borderRight: "1px dashed ".concat(theme.palette.border.white24),
-                                            flex: 1,
-                                        } })), (0, jsx_runtime_1.jsx)(Icon_1.default, { src: (0, getIcon_1.default)("timeline_dot"), width: 16 })] }, item)); }) }), (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { flex: 1 }), children: [(0, jsx_runtime_1.jsx)(FeeDetail, { feeName: "Fee 1", value: 1000 }), (0, jsx_runtime_1.jsx)(FeeDetail, { feeName: "Fee 2", value: 1000 }), (0, jsx_runtime_1.jsx)(FeeDetail, { feeName: "Fee 3", value: 1000 })] })] }) })] })));
+            } }, sx), children: [(0, jsx_runtime_1.jsx)(material_1.AccordionSummary, { expandIcon: (0, jsx_runtime_1.jsx)(Icon_1.default, { src: (0, getIcon_1.default)("arrow_down"), width: 20 }), children: (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { width: "100%" }), children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.fieldTitle), children: "Total fees" }), (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: 1000 }) })] }) }), (0, jsx_runtime_1.jsx)(material_1.AccordionDetails, { children: (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { alignItems: "stretch" }), children: [(0, jsx_runtime_1.jsx)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { width: "fit-content", gap: theme.mixins.gaps.g8, alignItems: "center" }), children: (_a = feesData === null || feesData === void 0 ? void 0 : feesData.feeDetail) === null || _a === void 0 ? void 0 : _a.map(function (item, index) {
+                                var _a;
+                                return ((0, jsx_runtime_1.jsxs)(jsx_runtime_2.Fragment, { children: [index !== 0 && ((0, jsx_runtime_1.jsx)(material_1.Box, { sx: {
+                                                borderRight: "1px dashed ".concat(theme.palette.border.white24),
+                                                flex: 1,
+                                            } })), (0, jsx_runtime_1.jsx)(Icon_1.default, { src: (0, getIcon_1.default)("timeline_dot"), width: 16 })] }, (_a = item.feeType) === null || _a === void 0 ? void 0 : _a.name));
+                            }) }), (0, jsx_runtime_1.jsx)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { flex: 1, gap: theme.mixins.gaps.g8 }), children: (_b = feesData === null || feesData === void 0 ? void 0 : feesData.feeDetail) === null || _b === void 0 ? void 0 : _b.map(function (item) {
+                                var _a, _b;
+                                return ((0, jsx_runtime_1.jsx)(FeeDetail, { feeName: (_a = item.feeType) === null || _a === void 0 ? void 0 : _a.name, feeInCurrency: item.feeInCurrency, feeInUSD: item.feeInUSD, currencyName: "USDT" }, (_b = item.feeType) === null || _b === void 0 ? void 0 : _b.name));
+                            }) })] }) })] })));
 }
 exports.default = Fees;
+var FeeDetail = function (_a) {
+    var feeName = _a.feeName, feeInCurrency = _a.feeInCurrency, feeInUSD = _a.feeInUSD, currencyName = _a.currencyName;
+    var theme = (0, material_1.useTheme)();
+    return ((0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g4 }), children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.fieldTitle), { whiteSpace: "nowrap" }), children: feeName }), (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { flex: 1, width: "fit-content", alignItems: "flex-end" }), children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.value), children: (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: feeInCurrency, unit: " ".concat(currencyName) }) }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.valueDescription), children: (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: feeInUSD, start: "~ $" }) })] })] }));
+};

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

@@ -145,6 +145,7 @@ var AmountError;
 })(AmountError || (exports.AmountError = AmountError = {}));
 var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
     var swiperKey = (0, react_1.useId)();
+    console.warn("🚀 ~ swiperKey:", swiperKey);
     var drawerRef = (0, react_1.useRef)(null);
     var swiperRef = (0, react_1.useRef)(null);
     var theme = (0, material_1.useTheme)();
@@ -168,8 +169,8 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
     var _m = (0, react_1.useState)(), selectedMethod = _m[0], setSelectedMethod = _m[1];
     var _o = (0, react_1.useState)(), sendInfoGet = _o[0], setSendInfoGet = _o[1];
     var _p = (0, react_1.useState)(false), isLoadingEstimateFee = _p[0], setIsLoadingEstimateFee = _p[1];
-    // const [estimateFee, setEstimateFee] = useState<number>();
-    var _q = (0, react_1.useState)(), recipientAddressError = _q[0], setRecipientAddressError = _q[1];
+    var _q = (0, react_1.useState)(), estimateFee = _q[0], setEstimateFee = _q[1];
+    var _r = (0, react_1.useState)(), recipientAddressError = _r[0], setRecipientAddressError = _r[1];
     var onlyChangeAddress = (0, react_1.useRef)(false);
     var withdrawToken = (0, react_1.useMemo)(function () {
         return selectedMethod === SendMethods.TRANSFER_EXTERNAL
@@ -188,6 +189,11 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
         }
         return newNetWorks;
     }, [selectedToken, selectedNetwork]);
+    var estimateReceive = (0, react_1.useMemo)(function () {
+        if (!estimateFee || !amount)
+            return undefined;
+        return +amount - +(estimateFee === null || estimateFee === void 0 ? void 0 : estimateFee.feeInCurrency);
+    }, [estimateFee, amount]);
     var clearValues = function () {
         setSelectedToken(undefined);
         setSelectedNetwork(undefined);
@@ -304,12 +310,12 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
         var data = dataPromptly !== null && dataPromptly !== void 0 ? dataPromptly : sendInfoGet;
         console.warn("🚀 ~ data handleSelectContinueTransferExternal:", data);
         (_a = suggestUseTransferInternalDialogRef.current) === null || _a === void 0 ? void 0 : _a.close();
-        var tokenSet = findWithdrawToken((data === null || data === void 0 ? void 0 : data.jetton) || "");
         setSelectedMethod(SendMethods.TRANSFER_EXTERNAL);
         setRecipientAddress(data === null || data === void 0 ? void 0 : data.address);
         if (onlyChangeAddress.current) {
             return;
         }
+        var tokenSet = findWithdrawToken((data === null || data === void 0 ? void 0 : data.jetton) || "");
         if (!tokenSet) {
             gotoStep(WithdrawStep.SELECT_TOKEN);
         }
@@ -357,6 +363,7 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                     response = _a.sent();
                     console.warn("🚀 ~ handleGetEstimateFee ~ response:", response);
                     setIsLoadingEstimateFee(false);
+                    setEstimateFee(response === null || response === void 0 ? void 0 : response.data);
                     return [2 /*return*/];
             }
         });
@@ -604,11 +611,11 @@ var WithdrawFunction = (0, react_1.forwardRef)(function (props, ref) {
                                                         placeholder: "Enter memo",
                                                         value: memo,
                                                         onChange: handleChangeMemo,
-                                                    } })] })), (0, jsx_runtime_1.jsx)(Fees_1.default, {}), (0, jsx_runtime_1.jsx)(Button_1.default.Primary, { sx: { width: "100%" }, onClick: handleSend, status: !!amountError ||
+                                                    } })] })), (0, jsx_runtime_1.jsx)(Fees_1.default, { feesData: JSON.stringify(estimateFee) }), (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: "Estimate receive" }), (0, jsx_runtime_1.jsx)(material_1.Box, { onClick: handleReSelectNetwork, sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g6, ml: "auto", cursor: "pointer" }), children: (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.value), children: (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: estimateReceive }) }) })] }), (0, jsx_runtime_1.jsx)(Button_1.default.Primary, { sx: { width: "100%" }, onClick: handleSend, status: !!amountError ||
+                                                !!recipientAddressError ||
                                                 !recipientAddress ||
                                                 !amount ||
                                                 !selectedToken ||
-                                                !!recipientAddressError ||
                                                 isLoadingEstimateFee
                                                 ? Button_1.BUTTON_STATUS.DISABLED
                                                 : Button_1.BUTTON_STATUS.ENABLED, children: "Continue" })] }) }, WithdrawStep.FORM)] }, swiperKey), (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: {

package/dist/services/axios/get-est-fee-service/type.d.ts

@@ -6,10 +6,10 @@ export interface GetEstimateFeeServiceQuery {
 export interface GetEstimateFeeServiceResponse {
     success: boolean;
     message: string;
-    data: Data;
+    data: FeesDataType;
     timestamp: string;
 }
-interface Data {
+export interface FeesDataType {
     feeInUSD: number;
     feeInCurrency: number;
     originalAmountInUSD: number;
@@ -17,15 +17,14 @@ interface Data {
     originalCurrency: string;
     feeDetail: FeeDetail[];
 }
-interface FeeDetail {
+export interface FeeDetail {
     feeType: FeeType;
     feeInUSD: number;
     feeInCurrency: number;
     feePercent: number;
     feeFixed: number;
 }
-interface FeeType {
+export interface FeeType {
     name: string;
     slug: string;
 }
-export {};

package/package.json

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