tek-wallet 0.0.557 → 0.0.559

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

@@ -38,7 +38,7 @@ var prefix = "activities_";
 function ActivitiesTypeSlice(props) {
     var _a, _b;
     var theme = (0, material_1.useTheme)();
-    var _c = (0, useActivities_1.default)(), activities = _c.activities, updateActivities = _c.updateActivities, loadMoreActivities = _c.loadMoreActivities, pages = _c.pages;
+    var _c = (0, useActivities_1.default)(), activities = _c.activities, loadActivities = _c.loadActivities, pages = _c.pages;
     var type = props.type, isActive = props.isActive;
     var _d = (0, react_1.useState)(undefined), detailActivity = _d[0], setDetailActivity = _d[1];
     var detailDrawerRef = (0, react_1.useRef)(null);
@@ -67,15 +67,11 @@ function ActivitiesTypeSlice(props) {
     (0, react_1.useEffect)(function () {
         if (!isActive || !!activitiesByType)
             return;
-        updateActivities({
-            transaction_types: type.slug,
-            page: 1,
-            take: 10,
-        });
-    }, [isActive, activitiesByType]);
+        loadActivities(type.slug);
+    }, [isActive, activitiesByType, loadActivities, type === null || type === void 0 ? void 0 : type.slug]);
     var loadMore = (0, react_1.useCallback)(function () {
-        loadMoreActivities(type.slug);
-    }, [loadMoreActivities, type.slug]);
+        loadActivities(type.slug);
+    }, [loadActivities, type.slug]);
     return ((0, jsx_runtime_1.jsxs)(material_1.Box, { sx: { width: "100%", height: "100%", display: "flex" }, children: [status === Status.Loading && (0, jsx_runtime_1.jsx)(WaitingData_1.default, { sx: { margin: "auto" } }), status === Status.Empty && ((0, jsx_runtime_1.jsx)(EmptyData_1.default, { sx: { margin: "auto" }, icon: (0, getIcon_1.default)(prefix + "empty_" + type.slug), description: "No ".concat((_a = type.name) === null || _a === void 0 ? void 0 : _a.toLowerCase(), " activity") })), status === Status.Filled && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(SmartList_1.default, { items: activitiesByType || [], loadMoreData: loadMore, hasMore: pages[type.slug] !== type_1.MAX_PAGE, loadingComponent: (0, jsx_runtime_1.jsx)(WaitingData_1.default, { sx: { margin: "auto" } }), children: (0, jsx_runtime_1.jsx)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { gap: theme.mixins.gaps.g12, paddingTop: theme.mixins.customPadding.p16 }), children: activitiesByType === null || activitiesByType === void 0 ? void 0 : activitiesByType.map(function (activity, index) {
                                 if (!activity)
                                     return null;

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

@@ -140,7 +140,7 @@ var SwapToken = (0, react_1.forwardRef)(function (props, ref) {
     var toAmount = (0, react_1.useMemo)(function () {
         if (!toToken)
             return undefined;
-        return +amount * +toToken.usd_rate;
+        return +amount / +toToken.usd_rate;
     }, [toToken, amount]);
     var getEstimateFee = (0, react_1.useCallback)(function () { return __awaiter(void 0, void 0, void 0, function () {
         var response;
@@ -259,7 +259,7 @@ var SwapToken = (0, react_1.forwardRef)(function (props, ref) {
             return undefined;
         return +toAmount - +(estimateFee === null || estimateFee === void 0 ? void 0 : estimateFee.feeInCurrency);
     }, [estimateFee, toAmount]);
-    return ((0, jsx_runtime_1.jsx)(RequireConnect_1.default, { children: (0, jsx_runtime_1.jsxs)(ConfirmLayout_1.default, { onOpen: validateAll, ref: confirmLayoutDrawerRef, action: transactionSlug, trigger: props.children, children: [!!fromToken && !!toToken && ((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.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { alignItems: "start", gap: theme.mixins.gaps.g12 }), children: [(0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g16, width: "100%" }), children: [(0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g6 }), children: [(0, jsx_runtime_1.jsx)(Icon_1.default, { src: fromToken === null || fromToken === void 0 ? void 0 : fromToken.icon }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.value), { fontWeight: theme.typography.fontWeight600 }), children: fromToken === null || fromToken === void 0 ? void 0 : fromToken.name })] }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.bigValue), { ml: "auto" }), children: (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: amount }) })] }), (0, jsx_runtime_1.jsx)(Icon_1.default, { src: (0, getIcon_1.default)("swap-one-direction"), width: 24 }), (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g16, width: "100%" }), children: [(0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g6 }), children: [(0, jsx_runtime_1.jsx)(Icon_1.default, { src: toToken === null || toToken === void 0 ? void 0 : toToken.icon }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.value), { fontWeight: theme.typography.fontWeight600 }), children: toToken === null || toToken === void 0 ? void 0 : toToken.name })] }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.bigValue), { ml: "auto" }), children: (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: toAmount }) })] })] }), (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign(__assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g12 }), theme.mixins.valueDescription), { width: "100%", justifyContent: "center" }), children: ["1 ", fromToken === null || fromToken === void 0 ? void 0 : fromToken.name, " ~ ", (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: 1 / +(toToken === null || toToken === void 0 ? void 0 : toToken.usd_rate) }), " ", toToken === null || toToken === void 0 ? void 0 : toToken.name] }), ((_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, { isFeePaidByAmount: true, feesData: JSON.stringify(estimateFee), amount: +amount, tokenSlug: fromTokenSlug })), !estimateFee && !!amount && ((0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g8, width: "100%" }), children: [(0, jsx_runtime_1.jsx)(material_1.CircularProgress, { size: 16, sx: { color: theme.palette.text.white } }), (0, jsx_runtime_1.jsx)(Text_1.default, { children: "Calculating fee..." })] })), (0, jsx_runtime_1.jsx)(LineValue_1.default, { field: "Receive amount estimated", value: (0, jsx_runtime_1.jsx)(Text_1.default, { sx: {
+    return ((0, jsx_runtime_1.jsx)(RequireConnect_1.default, { children: (0, jsx_runtime_1.jsxs)(ConfirmLayout_1.default, { onOpen: validateAll, ref: confirmLayoutDrawerRef, action: transactionSlug, trigger: props.children, children: [!!fromToken && !!toToken && ((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.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.column), { alignItems: "start", gap: theme.mixins.gaps.g12 }), children: [(0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g16, width: "100%" }), children: [(0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g6 }), children: [(0, jsx_runtime_1.jsx)(Icon_1.default, { src: fromToken === null || fromToken === void 0 ? void 0 : fromToken.icon }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.value), { fontWeight: theme.typography.fontWeight600 }), children: fromToken === null || fromToken === void 0 ? void 0 : fromToken.name })] }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.bigValue), { ml: "auto" }), children: (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: amount }) })] }), (0, jsx_runtime_1.jsx)(Icon_1.default, { src: (0, getIcon_1.default)("swap-one-direction"), width: 24 }), (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g16, width: "100%" }), children: [(0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g6 }), children: [(0, jsx_runtime_1.jsx)(Icon_1.default, { src: toToken === null || toToken === void 0 ? void 0 : toToken.icon }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.value), { fontWeight: theme.typography.fontWeight600 }), children: toToken === null || toToken === void 0 ? void 0 : toToken.name })] }), (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.bigValue), { ml: "auto" }), children: (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: toAmount }) })] })] }), (0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign(__assign({}, theme.mixins.row), theme.mixins.valueDescription), { width: "100%", justifyContent: "center" }), children: ["1 ", fromToken === null || fromToken === void 0 ? void 0 : fromToken.name, " ~ ", (0, jsx_runtime_1.jsx)(Formatter_1.default, { value: 1 / +(toToken === null || toToken === void 0 ? void 0 : toToken.usd_rate) }), " ", toToken === null || toToken === void 0 ? void 0 : toToken.name] }), ((_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, { isFeePaidByAmount: true, feesData: JSON.stringify(estimateFee), amount: +amount, tokenSlug: fromTokenSlug })), !estimateFee && !!amount && ((0, jsx_runtime_1.jsxs)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.row), { gap: theme.mixins.gaps.g8, width: "100%" }), children: [(0, jsx_runtime_1.jsx)(material_1.CircularProgress, { size: 16, sx: { color: theme.palette.text.white } }), (0, jsx_runtime_1.jsx)(Text_1.default, { children: "Calculating fee..." })] })), (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.customMargin.m6 }), 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: handleSwapToken, children: (0, jsx_runtime_1.jsx)(Button_1.default.Primary, { status: !!error || isLoadingEstimateFee ? Button_1.BUTTON_STATUS.DISABLED : buttonStatus, sx: { width: "100%" }, children: "Confirm" }) })] })), (!fromToken || !toToken) && ((0, jsx_runtime_1.jsx)(material_1.Box, { sx: __assign(__assign({}, theme.mixins.paper), { alignItems: "center", justifyContent: "center" }), children: (0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign(__assign({}, theme.mixins.validationError), { fontSize: theme.typography.fontSize16 }), children: SwapTokenError.TOKEN_NOT_FOUND }) }))] }) }));

package/dist/providers/ActivitiesProvider/index.js

@@ -108,7 +108,7 @@ exports.initialActivities = {
     }); }); },
     activityTypes: [const_1.ACTIVITIES_TYPE_ALL],
     pages: {},
-    loadMoreActivities: function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+    loadActivities: function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
         return [2 /*return*/];
     }); }); },
 };
@@ -121,6 +121,23 @@ function ActivitiesProvider(_a) {
     var _c = react_1.default.useState(exports.initialActivities.activities), activities = _c[0], setActivities = _c[1];
     var _d = react_1.default.useState(exports.initialActivities.activityTypes), activityTypes = _d[0], setActivityTypes = _d[1];
     var _e = (0, react_1.useState)(exports.initialActivities.pages), pages = _e[0], setPages = _e[1];
+    var updateActivityTypes = (0, react_1.useCallback)(function () { return __awaiter(_this, void 0, void 0, function () {
+        var response, newActivityTypes;
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0: return [4 /*yield*/, (0, get_activities_service_1.default)({
+                        page: 1,
+                        take: 0,
+                    })];
+                case 1:
+                    response = _c.sent();
+                    newActivityTypes = __spreadArray([const_1.ACTIVITIES_TYPE_ALL], ((_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.transaction_types) !== null && _b !== void 0 ? _b : []), true);
+                    setActivityTypes(newActivityTypes);
+                    return [2 /*return*/];
+            }
+        });
+    }); }, []);
     var updateActivities = (0, react_1.useCallback)(function (query) { return __awaiter(_this, void 0, void 0, function () {
         var slug, response_1, maxPage_1, error_1;
         var _a, _b, _c, _d, _e, _f;
@@ -186,65 +203,56 @@ function ActivitiesProvider(_a) {
             }
         });
     }); }, [isAuthenticated]);
-    var loadMoreActivities = (0, react_1.useCallback)(function (slug) { return __awaiter(_this, void 0, void 0, function () {
-        var currentPage, response, maxPage;
-        var _a, _b, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
+    var loadActivities = (0, react_1.useCallback)(function (slug) { return __awaiter(_this, void 0, void 0, function () {
+        var page, response, activitiesLoaded, newActivities;
+        var _a, _b, _c, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
                 case 0:
-                    if (pages[slug] === type_1.MAX_PAGE)
+                    if (!isAuthenticated)
                         return [2 /*return*/];
-                    currentPage = (pages[slug] || 1) + 1;
-                    console.warn("🚀 ~ loadMoreActivities slug:", slug);
+                    page = ((_a = pages[slug]) !== null && _a !== void 0 ? _a : 0) + 1;
                     return [4 /*yield*/, (0, get_activities_service_1.default)({
-                            page: currentPage,
+                            page: page,
                             take: const_1.ACTIVITIES_PAGE_SIZE,
                             transaction_types: slug,
                         })];
                 case 1:
-                    response = _d.sent();
-                    maxPage = Math.ceil(((_c = (_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.paginated) === null || _b === void 0 ? void 0 : _b.number_records) !== null && _c !== void 0 ? _c : 0) / const_1.ACTIVITIES_PAGE_SIZE);
-                    setActivities(function (prev) {
-                        var _a;
-                        var _b, _c, _d, _e;
-                        var newestActivities = (_d = ((_c = (_b = response === null || response === void 0 ? void 0 : response.data) === null || _b === void 0 ? void 0 : _b.transactions) !== null && _c !== void 0 ? _c : [])) === null || _d === void 0 ? void 0 : _d.filter(function (activity) {
-                            var _a;
-                            return !((_a = prev === null || prev === void 0 ? void 0 : prev[slug]) === null || _a === void 0 ? void 0 : _a.some(function (prevActivity) { return prevActivity.id === activity.id; }));
-                        });
-                        console.warn("🚀 ~ newestActivities ~ newestActivities:", newestActivities);
-                        var newActivities = __spreadArray(__spreadArray([], ((_e = prev === null || prev === void 0 ? void 0 : prev[slug]) !== null && _e !== void 0 ? _e : []), true), newestActivities, true);
-                        console.warn("🚀 ~ setActivities ~ newActivities:", newActivities);
-                        var page = Math.floor(newActivities.length / const_1.ACTIVITIES_PAGE_SIZE);
-                        if (page >= maxPage) {
-                            page = type_1.MAX_PAGE;
-                        }
-                        console.warn("🚀 ~ setActivities ~ page:", page);
+                    response = _e.sent();
+                    activitiesLoaded = (_c = (_b = response === null || response === void 0 ? void 0 : response.data) === null || _b === void 0 ? void 0 : _b.transactions) !== null && _c !== void 0 ? _c : [];
+                    if (activitiesLoaded.length === 0) {
                         setPages(function (prev) {
                             var _a;
-                            return (__assign(__assign({}, prev), (_a = {}, _a[slug] = page, _a)));
+                            return (__assign(__assign({}, prev), (_a = {}, _a[slug] = type_1.MAX_PAGE, _a)));
                         });
-                        return __assign(__assign({}, (prev !== null && prev !== void 0 ? prev : {})), (_a = {}, _a[slug] = newActivities, _a));
+                        return [2 /*return*/];
+                    }
+                    newActivities = __spreadArray(__spreadArray([], ((_d = activities === null || activities === void 0 ? void 0 : activities[slug]) !== null && _d !== void 0 ? _d : []), true), activitiesLoaded, true);
+                    setActivities(function (prev) {
+                        var _a;
+                        return (__assign(__assign({}, prev), (_a = {}, _a[slug] = newActivities, _a)));
+                    });
+                    setPages(function (prev) {
+                        var _a;
+                        return (__assign(__assign({}, prev), (_a = {}, _a[slug] = page, _a)));
                     });
                     return [2 /*return*/];
             }
         });
-    }); }, [pages]);
+    }); }, [isAuthenticated, activities, pages]);
     (0, react_1.useEffect)(function () {
-        var _a;
-        if (!!activities)
+        if (!!activityTypes || !isAuthenticated)
             return;
-        updateActivities({
-            page: (_a = pages[const_1.ACTIVITIES_TYPE_ALL.slug]) !== null && _a !== void 0 ? _a : 1,
-            take: const_1.ACTIVITIES_PAGE_SIZE,
-        });
-    }, [isAuthenticated]);
+        updateActivityTypes();
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [isAuthenticated, activityTypes]);
     return ((0, jsx_runtime_1.jsx)(exports.ActivitiesContext.Provider, { value: {
             isLoadingActivities: isLoadingActivities,
             activities: activities,
             updateActivities: updateActivities,
             activityTypes: activityTypes,
             pages: pages,
-            loadMoreActivities: loadMoreActivities,
+            loadActivities: loadActivities,
         }, children: children }));
 }
 exports.default = ActivitiesProvider;

package/dist/providers/ActivitiesProvider/type.d.ts

@@ -6,7 +6,7 @@ export interface ActivitiesProviderDataType {
     updateActivities: (query?: GetActivitiesServiceQuery) => Promise<void>;
     activityTypes: ActivityTypes[] | undefined;
     pages: Partial<Record<TransactionSlug, number | typeof MAX_PAGE>>;
-    loadMoreActivities: (slug: TransactionSlug) => Promise<void>;
+    loadActivities: (slug: TransactionSlug) => Promise<void>;
 }
 export type Activities = Partial<Record<TransactionSlug, Transaction[]>>;
 export interface ActivityTypes extends TransactionType {

package/package.json

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