tek-wallet 0.0.755 → 0.0.757

package/dist/components/TekWallet/components/ui/TokensBoard/index.js

@@ -76,8 +76,6 @@ var TokensBoard = function () {
                                 }, children: "PnL" })] })), tokens === null || tokens === void 0 ? void 0 : tokens.map(function (item) {
                         var stringifiedTokenData = JSON.stringify(__assign({}, item));
                         return ((0, jsx_runtime_1.jsx)(TokenItem_1.default, { showSmallAssets: showSmallAssets, tokenData: stringifiedTokenData }, item.id));
-                    }), !tokens && (0, jsx_runtime_1.jsx)(WaitingData_1.default, { sx: { margin: "auto" } })] }), (0, jsx_runtime_1.jsx)(material_1.Divider, { sx: {
-                    borderColor: theme.palette.border.accent,
-                } })] }));
+                    }), !tokens && (0, jsx_runtime_1.jsx)(WaitingData_1.default, { sx: { margin: "auto" } })] })] }));
 };
 exports.default = TokensBoard;

package/dist/components/TekWallet/components/views/ActivityView/index.d.ts

@@ -0,0 +1,10 @@
+import { GeneralProps } from "../../../types/ui";
+import { SxProps } from "@mui/material";
+interface ActivityViewProps extends GeneralProps {
+    sx?: SxProps;
+}
+export declare const ActivityView: {
+    (props: ActivityViewProps): import("react/jsx-runtime").JSX.Element;
+    displayName: string;
+};
+export default ActivityView;

package/dist/components/TekWallet/components/views/ActivityView/index.js

@@ -0,0 +1,64 @@
+"use strict";
+"use client";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActivityView = void 0;
+var jsx_runtime_1 = require("react/jsx-runtime");
+var react_1 = require("react");
+var ChildPageLayout_1 = __importDefault(require("../../layouts/ChildPageLayout"));
+var PageHeader_1 = __importDefault(require("../../ui/PageHeader"));
+var SwiperControlled_1 = __importDefault(require("../../ui/SwiperControlled"));
+var useActivities_1 = __importDefault(require("../../../hooks/useActivities"));
+var material_1 = require("@mui/material");
+var ThemeProvider_1 = require("../../../providers/ThemeProvider");
+var react_2 = require("swiper/react");
+var ActivitiesTypeSlice_1 = __importDefault(require("../../ui/ActivitiesTypeSlice"));
+var ActivityView = function (props) {
+    var sx = props.sx;
+    var theme = (0, ThemeProvider_1.useTheme)();
+    var swiperRef = (0, react_1.useRef)(null);
+    var activityTypes = (0, useActivities_1.default)().activityTypes;
+    var _a = (0, react_1.useState)(0), activeTab = _a[0], setActiveTab = _a[1];
+    var handleSlideChange = function (index) {
+        setActiveTab(index);
+    };
+    return ((0, jsx_runtime_1.jsx)(ChildPageLayout_1.default, { header: (0, jsx_runtime_1.jsx)(PageHeader_1.default, { title: "Activities" }), sx: sx, children: (0, jsx_runtime_1.jsx)(SwiperControlled_1.default, { ref: swiperRef, 
+            // tabParamName="activity-tab"
+            swiperProps: {
+                slidesPerView: 1,
+                spaceBetween: 40,
+            }, onTabChange: handleSlideChange, tabs: activityTypes === null || activityTypes === void 0 ? void 0 : activityTypes.map(function (type, index) {
+                return ((0, jsx_runtime_1.jsx)(material_1.Tab, { label: type.name, value: index, "data-index": index, sx: {
+                        padding: "".concat(theme.mixins.customPadding.p8, " ").concat(theme.mixins.customPadding.p16),
+                        minHeight: "unset",
+                        minWidth: "unset",
+                        textTransform: "capitalize",
+                        color: theme.palette.text.accent2,
+                        transition: "all 0.3s linear",
+                        fontSize: theme.typography.fontSize12,
+                        borderColor: "currentcolor",
+                        "&.Mui-selected": {
+                            color: theme.palette.text.primary,
+                        },
+                        "&.Mui-selected::after": {
+                            content: "''",
+                            position: "absolute",
+                            bottom: 0,
+                            left: 0,
+                        },
+                    } }, index));
+            }), sx: {
+                height: "100%",
+            }, swiperStyle: {
+                flex: 1,
+            }, children: activityTypes === null || activityTypes === void 0 ? void 0 : activityTypes.map(function (type, index) {
+                return ((0, jsx_runtime_1.jsx)(react_2.SwiperSlide, { style: {
+                        position: "relative",
+                    }, children: (0, jsx_runtime_1.jsx)(ActivitiesTypeSlice_1.default, { type: type, isActive: activeTab === index }) }, index));
+            }) }) }));
+};
+exports.ActivityView = ActivityView;
+exports.ActivityView.displayName = "Activities";
+exports.default = exports.ActivityView;

package/dist/components/TekWallet/components/views/AssetView/index.js

@@ -11,6 +11,50 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -28,20 +72,22 @@ var AmountGroupAndChart_1 = __importDefault(require("../../ui/AmountGroupAndChar
 var link_1 = __importDefault(require("next/link"));
 var react_1 = require("react");
 var TekWalletProvider_1 = require("../../../providers/TekWalletProvider");
-var ReceiveFunction_1 = __importDefault(require("../../ui/ReceiveFunction"));
+var ReceiveFunction_1 = __importStar(require("../../ui/ReceiveFunction"));
 var ChildPageLayout_1 = __importDefault(require("../../layouts/ChildPageLayout"));
 var Menu_1 = __importDefault(require("./Menu"));
+var ActivitiesTypeSlice_1 = __importDefault(require("../../ui/ActivitiesTypeSlice"));
+var const_1 = require("../../../providers/ActivitiesProvider/const");
+var Icon_1 = __importDefault(require("../../ui/Icon"));
 var AssetView = function (props) {
+    var sx = props.sx, rest = __rest(props, ["sx"]);
     var isInitPasscode = (0, useWalletData_1.default)().isInitPasscode;
     var theme = (0, ThemeProvider_1.useTheme)();
     var options = (0, TekWalletProvider_1.useWalletConfig)().options;
     var basePath = (0, react_1.useMemo)(function () {
         return (options === null || options === void 0 ? void 0 : options.basePath) || "";
     }, [options]);
-    return ((0, jsx_runtime_1.jsxs)(ChildPageLayout_1.default, { children: [!isInitPasscode && ((0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.sessionDescription), children: "Please connect your wallet to get asset information" })), !!isInitPasscode && ((0, jsx_runtime_1.jsxs)(DefaultPageLayout_1.default, __assign({}, props, { children: [(0, jsx_runtime_1.jsx)(AmountGroupAndChart_1.default, {}), (0, jsx_runtime_1.jsx)(Menu_1.default, { sx: {
-                            mb: theme.mixins.customMargin.m20,
-                        }, items: [
-                            (0, jsx_runtime_1.jsx)(ReceiveFunction_1.default, { children: (0, jsx_runtime_1.jsx)(material_1.ListItem, { sx: {
+    return ((0, jsx_runtime_1.jsxs)(ChildPageLayout_1.default, { children: [!isInitPasscode && ((0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.sessionDescription), children: "Please connect your wallet to get asset information" })), !!isInitPasscode && ((0, jsx_runtime_1.jsxs)(DefaultPageLayout_1.default, __assign({}, rest, { sx: __assign({ display: "flex", flexDirection: "column", gap: theme.mixins.gaps.g20 }, sx), children: [(0, jsx_runtime_1.jsx)(AmountGroupAndChart_1.default, {}), (0, jsx_runtime_1.jsx)(Menu_1.default, { items: [
+                            (0, jsx_runtime_1.jsx)(ReceiveFunction_1.default, { functionsList: Object.values(ReceiveFunction_1.ReceiveMethods), children: (0, jsx_runtime_1.jsx)(material_1.ListItem, { sx: {
                                         borderRight: "1px solid ".concat(theme.palette.border.accent3),
                                         placeContent: "center",
                                         columnSpan: 1,
@@ -62,7 +108,24 @@ var AssetView = function (props) {
                                         placeContent: "center",
                                         columnSpan: 1,
                                     }, children: (0, jsx_runtime_1.jsx)(FunctionItem_1.default, { icon: "IC_SWAP_FC", label: "Swap", sx: { width: "100%" } }) }) }, "swap"),
-                        ] }), (0, jsx_runtime_1.jsx)(TokensBoard_1.default, {})] })))] }));
+                        ] }), (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: {
+                                    display: "flex",
+                                    gap: theme.mixins.gaps.g20,
+                                }, children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: __assign({}, theme.mixins.sessionTitle), children: "Activity" }), (0, jsx_runtime_1.jsxs)(material_1.Box, { component: link_1.default, href: "".concat(basePath, "/tek-wallet/activity"), sx: {
+                                            marginLeft: "auto",
+                                            display: "flex",
+                                            alignItems: "center",
+                                        }, children: [(0, jsx_runtime_1.jsx)(Text_1.default, { sx: {
+                                                    fontSize: theme.typography.fontSize13,
+                                                    fontWeight: theme.typography.fontWeight400,
+                                                    color: theme.palette.text.black,
+                                                    cursor: "pointer",
+                                                }, children: "View all" }), (0, jsx_runtime_1.jsx)(Icon_1.default, { iconKey: "IC_ARROW_RIGHT", width: 18, height: 18 })] })] }), (0, jsx_runtime_1.jsx)(ActivitiesTypeSlice_1.default, { type: const_1.ACTIVITIES_TYPE_ALL, limitItems: 4, isActive: true, sx: {
+                                    paddingBottom: 0,
+                                    paddingTop: 0,
+                                    paddingLeft: 0,
+                                    paddingRight: 0,
+                                } })] }), (0, jsx_runtime_1.jsx)(TokensBoard_1.default, {})] })))] }));
 };
 exports.AssetView = AssetView;
 exports.default = exports.AssetView;

package/dist/components/TekWallet/components/views/TekWalletView/index.js

@@ -11,6 +11,6 @@ function TekWalletView() {
     var pathnameArray = (0, react_1.useMemo)(function () { return (typeof pathname === "string" ? [pathname] : pathname); }, [pathname]);
     var pathnameFull = (0, react_1.useMemo)(function () { return pathnameArray === null || pathnameArray === void 0 ? void 0 : pathnameArray.join("/"); }, [pathnameArray]);
     console.warn("🚀 ~ TekWalletView ~ pathnameFull:", pathname, pathnameFull);
-    var View = (0, react_1.useMemo)(function () { return (pathname === undefined ? (0, routes_1.getView)("/") : (0, routes_1.getView)(pathnameFull || "")); }, [pathnameFull, pathname]);
+    var View = (0, react_1.useMemo)(function () { return (pathname === undefined ? (0, routes_1.getView)("/") : (0, routes_1.getView)("/".concat(pathnameFull))); }, [pathnameFull, pathname]);
     return (0, jsx_runtime_1.jsx)(View, {});
 }

package/dist/components/TekWallet/components/views/TekWalletView/routes.d.ts

@@ -1,9 +1,10 @@
 import { ComponentType } from "react";
 export declare enum TekWalletViewRoutes {
-    SEND_INTERNAL = "send/internal",
-    SEND_EXTERNAL = "send/external",
-    SWAP = "swap",
+    SEND_INTERNAL = "/send/internal",
+    SEND_EXTERNAL = "/send/external",
+    SWAP = "/swap",
     ASSET = "/",
-    NOT_FOUND = "not-found"
+    NOT_FOUND = "/not-found",
+    ACTIVITY = "/activity"
 }
 export declare const getView: (path: string) => ComponentType;

package/dist/components/TekWallet/components/views/TekWalletView/routes.js

@@ -40,11 +40,12 @@ exports.getView = exports.TekWalletViewRoutes = void 0;
 var dynamic_1 = __importDefault(require("next/dynamic"));
 var TekWalletViewRoutes;
 (function (TekWalletViewRoutes) {
-    TekWalletViewRoutes["SEND_INTERNAL"] = "send/internal";
-    TekWalletViewRoutes["SEND_EXTERNAL"] = "send/external";
-    TekWalletViewRoutes["SWAP"] = "swap";
+    TekWalletViewRoutes["SEND_INTERNAL"] = "/send/internal";
+    TekWalletViewRoutes["SEND_EXTERNAL"] = "/send/external";
+    TekWalletViewRoutes["SWAP"] = "/swap";
     TekWalletViewRoutes["ASSET"] = "/";
-    TekWalletViewRoutes["NOT_FOUND"] = "not-found";
+    TekWalletViewRoutes["NOT_FOUND"] = "/not-found";
+    TekWalletViewRoutes["ACTIVITY"] = "/activity";
 })(TekWalletViewRoutes || (exports.TekWalletViewRoutes = TekWalletViewRoutes = {}));
 var getView = function (path) {
     if (path.startsWith(TekWalletViewRoutes.SEND_INTERNAL)) {
@@ -62,11 +63,16 @@ var getView = function (path) {
             ssr: false,
         });
     }
-    if (path.startsWith(TekWalletViewRoutes.ASSET)) {
+    if (path === TekWalletViewRoutes.ASSET) {
         return (0, dynamic_1.default)(function () { return Promise.resolve().then(function () { return __importStar(require("../AssetView")); }); }, {
             ssr: false,
         });
     }
+    if (path.startsWith(TekWalletViewRoutes.ACTIVITY)) {
+        return (0, dynamic_1.default)(function () { return Promise.resolve().then(function () { return __importStar(require("../ActivityView")); }); }, {
+            ssr: false,
+        });
+    }
     return (0, dynamic_1.default)(function () { return Promise.resolve().then(function () { return __importStar(require("../NotFoundView")); }); }, {
         ssr: false,
     });

package/dist/components/TekWallet/const/app.config.d.ts

@@ -0,0 +1 @@
+export declare const APP_NAME = "TekWallet";

package/dist/components/TekWallet/const/app.config.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.APP_NAME = void 0;
+exports.APP_NAME = "TekWallet";

package/dist/components/TekWallet/index.d.ts

@@ -5,7 +5,7 @@ export * from "./components/ui/ReceiveFunction";
 export * from "./components/ui/LockToken";
 export * from "./components/views/AssetView";
 export * from "./hooks/useWallet";
-export * from "./components/ui/Activities";
+export * from "./components/views/ActivityView";
 export * from "./components/ui/SwapToken";
 export * from "./components/ui/TransferInternal";
 export * from "./components/ui/WithdrawFunction";

package/dist/components/TekWallet/index.js

@@ -21,7 +21,7 @@ __exportStar(require("./components/ui/ReceiveFunction"), exports);
 __exportStar(require("./components/ui/LockToken"), exports);
 __exportStar(require("./components/views/AssetView"), exports);
 __exportStar(require("./hooks/useWallet"), exports);
-__exportStar(require("./components/ui/Activities"), exports);
+__exportStar(require("./components/views/ActivityView"), exports);
 __exportStar(require("./components/ui/SwapToken"), exports);
 __exportStar(require("./components/ui/TransferInternal"), exports);
 __exportStar(require("./components/ui/WithdrawFunction"), exports);

package/dist/components/TekWallet/providers/ActivitiesProvider/const.d.ts

@@ -1,3 +1,3 @@
 import { TransactionType } from "../../services/axios/get-activities-service/type";
-export declare const ACTIVITIES_PAGE_SIZE = 10;
+export declare const ACTIVITIES_PAGE_SIZE = 4;
 export declare const ACTIVITIES_TYPE_ALL: TransactionType;

package/dist/components/TekWallet/providers/ActivitiesProvider/const.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ACTIVITIES_TYPE_ALL = exports.ACTIVITIES_PAGE_SIZE = void 0;
 var type_1 = require("../../services/axios/get-activities-service/type");
-exports.ACTIVITIES_PAGE_SIZE = 10;
+exports.ACTIVITIES_PAGE_SIZE = 4;
 exports.ACTIVITIES_TYPE_ALL = {
     id: -1,
     status: "all",

package/dist/components/TekWallet/providers/ActivitiesProvider/functions/sortActivity.d.ts

@@ -0,0 +1,3 @@
+import { Transaction } from "../../../services/axios/get-activities-service/type";
+declare function sortActivity(activities: Transaction[]): Transaction[];
+export default sortActivity;

package/dist/components/TekWallet/providers/ActivitiesProvider/functions/sortActivity.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function sortActivity(activities) {
+    return activities.sort(function (a, b) {
+        return new Date(b.date_created).getTime() - new Date(a.date_created).getTime();
+    });
+}
+exports.default = sortActivity;

package/dist/components/TekWallet/providers/ActivitiesProvider/index.js

@@ -98,9 +98,9 @@ exports.ActivitiesProvider = ActivitiesProvider;
 var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = __importStar(require("react"));
 var useWalletData_1 = __importDefault(require("../../hooks/useWalletData"));
-var type_1 = require("./type");
 var get_activities_service_1 = __importDefault(require("../../services/axios/get-activities-service"));
 var const_1 = require("./const");
+var sortActivity_1 = __importDefault(require("./functions/sortActivity"));
 exports.initialActivities = {
     isLoadingActivities: {},
     activities: undefined,
@@ -108,7 +108,7 @@ exports.initialActivities = {
         return [2 /*return*/];
     }); }); },
     activityTypes: [const_1.ACTIVITIES_TYPE_ALL],
-    pages: {},
+    loadOutActivityType: {},
     loadActivities: function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
         return [2 /*return*/];
     }); }); },
@@ -121,15 +121,21 @@ function ActivitiesProvider(_a) {
     var _b = (0, react_1.useState)(exports.initialActivities.isLoadingActivities), isLoadingActivities = _b[0], setIsLoadingActivities = _b[1];
     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 _e = (0, react_1.useState)(exports.initialActivities.loadOutActivityType), loadOutActivityType = _e[0], setLoadOutActivityType = _e[1];
+    var getLatestDateCreated = (0, react_1.useCallback)(function (slug) {
+        var _a;
+        var currentLastActivity = (_a = activities === null || activities === void 0 ? void 0 : activities[slug]) === null || _a === void 0 ? void 0 : _a.at(-1);
+        if (!currentLastActivity)
+            return null;
+        return currentLastActivity === null || currentLastActivity === void 0 ? void 0 : currentLastActivity.date_created;
+    }, [activities]);
     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: 1,
+                        limit: 1,
                     })];
                 case 1:
                     response = _c.sent();
@@ -140,17 +146,17 @@ function ActivitiesProvider(_a) {
         });
     }); }, []);
     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;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        var slug, response_1, loadedActivities_1, error_1;
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     slug = (_a = query === null || query === void 0 ? void 0 : query.transaction_types) !== null && _a !== void 0 ? _a : const_1.ACTIVITIES_TYPE_ALL.slug;
-                    if (pages[slug] === type_1.MAX_PAGE)
+                    if (loadOutActivityType[slug])
                         return [2 /*return*/];
-                    _g.label = 1;
+                    _d.label = 1;
                 case 1:
-                    _g.trys.push([1, 3, , 4]);
+                    _d.trys.push([1, 3, , 4]);
                     if (!isInitPasscode) {
                         throw new Error("Authenticate to get receive tokens");
                     }
@@ -160,26 +166,21 @@ function ActivitiesProvider(_a) {
                         var _a;
                         return (__assign(__assign({}, prev), (_a = {}, _a[slug] = true, _a)));
                     });
-                    return [4 /*yield*/, (0, get_activities_service_1.default)(query)];
+                    return [4 /*yield*/, (0, get_activities_service_1.default)(__assign({}, query))];
                 case 2:
-                    response_1 = _g.sent();
-                    maxPage_1 = Math.ceil(((_d = (_c = (_b = response_1 === null || response_1 === void 0 ? void 0 : response_1.data) === null || _b === void 0 ? void 0 : _b.paginated) === null || _c === void 0 ? void 0 : _c.number_records) !== null && _d !== void 0 ? _d : 0) / const_1.ACTIVITIES_PAGE_SIZE);
-                    setActivityTypes(__spreadArray([const_1.ACTIVITIES_TYPE_ALL], ((_f = (_e = response_1 === null || response_1 === void 0 ? void 0 : response_1.data) === null || _e === void 0 ? void 0 : _e.transaction_types) !== null && _f !== void 0 ? _f : []), true));
+                    response_1 = _d.sent();
+                    loadedActivities_1 = (_c = (_b = response_1 === null || response_1 === void 0 ? void 0 : response_1.data) === null || _b === void 0 ? void 0 : _b.transactions) !== null && _c !== void 0 ? _c : [];
                     setActivities(function (prev) {
                         var _a;
-                        var _b, _c, _d, _e;
-                        var newestActivities = (_d = ((_c = (_b = response_1 === null || response_1 === void 0 ? void 0 : response_1.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; }));
+                        var _b, _c, _d, _e, _f;
+                        var retainedActivities = (_c = ((_b = prev === null || prev === void 0 ? void 0 : prev[slug]) !== null && _b !== void 0 ? _b : [])) === null || _c === void 0 ? void 0 : _c.filter(function (activity) {
+                            return !(loadedActivities_1 === null || loadedActivities_1 === void 0 ? void 0 : loadedActivities_1.some(function (item) { return item.id === activity.id; }));
                         });
-                        var newActivities = __spreadArray(__spreadArray([], ((_e = prev === null || prev === void 0 ? void 0 : prev[slug]) !== null && _e !== void 0 ? _e : []), true), newestActivities, true);
-                        var page = Math.floor(newActivities.length / const_1.ACTIVITIES_PAGE_SIZE);
-                        if (page >= maxPage_1) {
-                            page = type_1.MAX_PAGE;
-                        }
-                        setPages(function (prev) {
+                        var newActivities = (0, sortActivity_1.default)(__spreadArray(__spreadArray([], retainedActivities, true), loadedActivities_1, true));
+                        var isLoadOutActivityType = newActivities.length >= ((_f = (_e = (_d = response_1 === null || response_1 === void 0 ? void 0 : response_1.data) === null || _d === void 0 ? void 0 : _d.paginated) === null || _e === void 0 ? void 0 : _e.number_records) !== null && _f !== void 0 ? _f : 0);
+                        setLoadOutActivityType(function (prev) {
                             var _a;
-                            return (__assign(__assign({}, prev), (_a = {}, _a[slug] = page, _a)));
+                            return (__assign(__assign({}, prev), (_a = {}, _a[slug] = isLoadOutActivityType, _a)));
                         });
                         return __assign(__assign({}, (prev !== null && prev !== void 0 ? prev : {})), (_a = {}, _a[slug] = newActivities, _a));
                     });
@@ -189,7 +190,7 @@ function ActivitiesProvider(_a) {
                     });
                     return [3 /*break*/, 4];
                 case 3:
-                    error_1 = _g.sent();
+                    error_1 = _d.sent();
                     console.error("🚀 ~ getBalance ~ error:", error_1);
                     setIsLoadingActivities(function (prev) {
                         var _a;
@@ -199,16 +200,16 @@ function ActivitiesProvider(_a) {
                 case 4: return [2 /*return*/];
             }
         });
-    }); }, [isInitPasscode]);
+    }); }, [isInitPasscode, isLoadingActivities, loadOutActivityType]);
     var loadActivities = (0, react_1.useCallback)(function (slug) { return __awaiter(_this, void 0, void 0, function () {
-        var page, response, activitiesLoaded, exceptedActivities, newActivities, newPage;
-        var _a, _b, _c, _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var lastDateCreated, response, activitiesLoaded, numOfRecords, retainedActivities, newActivities;
+        var _a, _b, _c, _d, _e, _f, _g;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
                 case 0:
                     if (!isInitPasscode)
                         return [2 /*return*/];
-                    if (pages[slug] === type_1.MAX_PAGE)
+                    if (loadOutActivityType[slug])
                         return [2 /*return*/];
                     if (isLoadingActivities[slug])
                         return [2 /*return*/];
@@ -216,40 +217,43 @@ function ActivitiesProvider(_a) {
                         var _a;
                         return (__assign(__assign({}, prev), (_a = {}, _a[slug] = true, _a)));
                     });
-                    page = ((_a = pages[slug]) !== null && _a !== void 0 ? _a : 0) + 1;
+                    lastDateCreated = getLatestDateCreated(slug);
                     return [4 /*yield*/, (0, get_activities_service_1.default)({
-                            page: page,
-                            take: const_1.ACTIVITIES_PAGE_SIZE,
+                            limit: const_1.ACTIVITIES_PAGE_SIZE,
                             transaction_types: slug,
+                            last_date_created: lastDateCreated,
                         })];
                 case 1:
-                    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 : [];
-                    exceptedActivities = (_d = activitiesLoaded === null || activitiesLoaded === void 0 ? void 0 : activitiesLoaded.filter(function (loadedActivity) {
+                    response = _h.sent();
+                    setIsLoadingActivities(function (prev) {
                         var _a;
-                        return !((_a = activities === null || activities === void 0 ? void 0 : activities[slug]) === null || _a === void 0 ? void 0 : _a.some(function (activity) { return loadedActivity.id === activity.id; }));
-                    })) !== null && _d !== void 0 ? _d : [];
-                    newActivities = __spreadArray(__spreadArray([], (exceptedActivities !== null && exceptedActivities !== void 0 ? exceptedActivities : []), true), exceptedActivities, true);
-                    newPage = Math.floor(newActivities.length / const_1.ACTIVITIES_PAGE_SIZE);
+                        return (__assign(__assign({}, prev), (_a = {}, _a[slug] = false, _a)));
+                    });
+                    activitiesLoaded = (_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.transactions) !== null && _b !== void 0 ? _b : [];
+                    numOfRecords = (_e = (_d = (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.paginated) === null || _d === void 0 ? void 0 : _d.number_records) !== null && _e !== void 0 ? _e : 0;
+                    retainedActivities = (_g = (_f = activities === null || activities === void 0 ? void 0 : activities[slug]) === null || _f === void 0 ? void 0 : _f.filter(function (item) {
+                        return !(activitiesLoaded === null || activitiesLoaded === void 0 ? void 0 : activitiesLoaded.some(function (activity) { return item.id === activity.id; }));
+                    })) !== null && _g !== void 0 ? _g : [];
+                    newActivities = (0, sortActivity_1.default)(__spreadArray(__spreadArray([], retainedActivities, true), activitiesLoaded, true));
                     setActivities(function (prev) {
                         var _a;
                         return (__assign(__assign({}, prev), (_a = {}, _a[slug] = newActivities, _a)));
                     });
-                    if (exceptedActivities.length < const_1.ACTIVITIES_PAGE_SIZE) {
-                        setPages(function (prev) {
+                    if (newActivities.length >= numOfRecords) {
+                        setLoadOutActivityType(function (prev) {
                             var _a;
-                            return (__assign(__assign({}, prev), (_a = {}, _a[slug] = type_1.MAX_PAGE, _a)));
+                            return (__assign(__assign({}, prev), (_a = {}, _a[slug] = true, _a)));
                         });
                         return [2 /*return*/];
                     }
-                    setPages(function (prev) {
+                    setLoadOutActivityType(function (prev) {
                         var _a;
-                        return (__assign(__assign({}, prev), (_a = {}, _a[slug] = newPage, _a)));
+                        return (__assign(__assign({}, prev), (_a = {}, _a[slug] = false, _a)));
                     });
                     return [2 /*return*/];
             }
         });
-    }); }, [isInitPasscode, activities, pages, isLoadingActivities]);
+    }); }, [isInitPasscode, loadOutActivityType, isLoadingActivities, getLatestDateCreated, activities]);
     (0, react_1.useEffect)(function () {
         if (!isInitPasscode)
             return;
@@ -261,7 +265,7 @@ function ActivitiesProvider(_a) {
             activities: activities,
             updateActivities: updateActivities,
             activityTypes: activityTypes,
-            pages: pages,
+            loadOutActivityType: loadOutActivityType,
             loadActivities: loadActivities,
         }, children: children }));
 }

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

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

package/dist/components/TekWallet/providers/WalletDataProvider/index.js

@@ -101,6 +101,7 @@ exports.initialWalletData = {
     createWallet: function () { return Promise.resolve({}); },
     importWallet: function () { return Promise.resolve({}); },
     getSeedPhrase: function () { return Promise.resolve({}); },
+    updateBalanceAnalytic: function () { return Promise.resolve(null); },
 };
 exports.WalletDataContext = react_1.default.createContext(exports.initialWalletData);
 function WalletDataProvider(props) {
@@ -334,6 +335,7 @@ function WalletDataProvider(props) {
             createWallet: createWallet,
             importWallet: importWallet,
             getSeedPhrase: getSeedPhrase,
+            updateBalanceAnalytic: exports.initialWalletData.updateBalanceAnalytic,
         }, children: children }));
 }
 exports.default = WalletDataProvider;