tek-wallet 0.0.444 → 0.0.446

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

@@ -52,12 +52,12 @@ function ActivitiesTypeSlice(props) {
         if (!!activitiesByType)
             return;
         updateActivities({
-            transaction_type: type.slug,
+            transaction_types: type.slug,
             page: 1,
             take: 10,
         });
     }, [isActive, type, activitiesByType, updateActivities]);
-    return ((0, jsx_runtime_1.jsxs)(material_1.Box, { children: [status === Status.Empty && ((0, jsx_runtime_1.jsx)(EmptyData_1.default, { 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.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) {
+    return ((0, jsx_runtime_1.jsxs)(material_1.Box, { sx: { width: "100%" }, children: [status === Status.Empty && ((0, jsx_runtime_1.jsx)(EmptyData_1.default, { 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.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;
                     var dataAsJson = JSON.stringify(activity);

package/dist/providers/ActivitiesProvider/index.js

@@ -100,7 +100,7 @@ var useWalletData_1 = __importDefault(require("../../hooks/useWalletData"));
 var get_activities_service_1 = __importDefault(require("../../services/axios/get-activities-service"));
 var const_1 = require("./const");
 exports.initialActivities = {
-    isLoadingActivities: true,
+    isLoadingActivities: {},
     activities: undefined,
     updateActivities: function () { },
     activityTypes: [const_1.ACTIVITIES_TYPE_ALL],
@@ -112,7 +112,7 @@ function ActivitiesProvider(_a) {
     var _this = this;
     var children = _a.children;
     var isAuthenticated = (0, useWalletData_1.default)().isAuthenticated;
-    var _b = (0, react_1.useState)(true), isLoadingActivities = _b[0], setIsLoadingActivities = _b[1];
+    var _b = (0, react_1.useState)({}), isLoadingActivities = _b[0], setIsLoadingActivities = _b[1];
     var _c = react_1.default.useState(undefined), activities = _c[0], setActivities = _c[1];
     var _d = react_1.default.useState(undefined), activityTypes = _d[0], setActivityTypes = _d[1];
     var _e = (0, react_1.useState)(1), page = _e[0], setPage = _e[1];
@@ -120,48 +120,59 @@ function ActivitiesProvider(_a) {
         setPage(page);
     }, []);
     var updateActivities = (0, react_1.useCallback)(function (query) { return __awaiter(_this, void 0, void 0, function () {
-        var response_1, error_1;
-        var _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var slug, response_1, error_1;
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
-                    _c.trys.push([0, 2, , 3]);
+                    slug = (_a = query === null || query === void 0 ? void 0 : query.transaction_types) !== null && _a !== void 0 ? _a : const_1.ACTIVITIES_TYPE_ALL.slug;
+                    _d.label = 1;
+                case 1:
+                    _d.trys.push([1, 3, , 4]);
                     if (!isAuthenticated) {
                         throw new Error("Authenticate to get receive tokens");
                     }
-                    setIsLoadingActivities(true);
+                    setIsLoadingActivities(function (prev) {
+                        var _a;
+                        return (__assign(__assign({}, prev), (_a = {}, _a[slug] = true, _a)));
+                    });
                     return [4 /*yield*/, (0, get_activities_service_1.default)(query)];
-                case 1:
-                    response_1 = _c.sent();
+                case 2:
+                    response_1 = _d.sent();
                     console.warn("🚀 ~ getBalance ~ response:", response_1);
                     setActivityTypes(__spreadArray([
                         const_1.ACTIVITIES_TYPE_ALL
-                    ], ((_b = (_a = response_1 === null || response_1 === void 0 ? void 0 : response_1.data) === null || _a === void 0 ? void 0 : _a.transaction_types) !== null && _b !== void 0 ? _b : []), true));
+                    ], ((_c = (_b = response_1 === null || response_1 === void 0 ? void 0 : response_1.data) === null || _b === void 0 ? void 0 : _b.transaction_types) !== null && _c !== void 0 ? _c : []), true));
                     setActivities(function (prev) {
                         var _a;
                         var _b, _c, _d;
-                        var slug = (query === null || query === void 0 ? void 0 : query.transaction_type) || const_1.ACTIVITIES_TYPE_ALL.slug;
                         return __assign(__assign({}, (prev !== null && prev !== void 0 ? prev : {})), (_a = {}, _a[slug] = __spreadArray(__spreadArray([], ((_b = prev === null || prev === void 0 ? void 0 : prev[slug]) !== null && _b !== void 0 ? _b : []), true), ((_d = (_c = response_1 === null || response_1 === void 0 ? void 0 : response_1.data) === null || _c === void 0 ? void 0 : _c.transactions) !== null && _d !== void 0 ? _d : []), true), _a));
                     });
-                    setIsLoadingActivities(false);
-                    return [3 /*break*/, 3];
-                case 2:
-                    error_1 = _c.sent();
+                    setIsLoadingActivities(function (prev) {
+                        var _a;
+                        return (__assign(__assign({}, prev), (_a = {}, _a[slug] = false, _a)));
+                    });
+                    return [3 /*break*/, 4];
+                case 3:
+                    error_1 = _d.sent();
                     console.error("🚀 ~ getBalance ~ error:", error_1);
-                    setIsLoadingActivities(false);
-                    return [3 /*break*/, 3];
-                case 3: return [2 /*return*/];
+                    setIsLoadingActivities(function (prev) {
+                        var _a;
+                        return (__assign(__assign({}, prev), (_a = {}, _a[slug] = false, _a)));
+                    });
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
             }
         });
     }); }, [isAuthenticated]);
     (0, react_1.useEffect)(function () {
-        if (isAuthenticated && !activities) {
-            updateActivities({
-                page: page,
-                take: const_1.ACTIVITIES_PAGE_SIZE,
-            });
-        }
-    }, [isAuthenticated, activities]);
+        if (!!activities)
+            return;
+        updateActivities({
+            page: page,
+            take: const_1.ACTIVITIES_PAGE_SIZE,
+        });
+    }, [updateActivities, activities]);
     return ((0, jsx_runtime_1.jsx)(exports.ActivitiesContext.Provider, { value: {
             isLoadingActivities: isLoadingActivities,
             activities: activities,

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

@@ -1,6 +1,6 @@
 import { GetActivitiesServiceQuery, Transaction, TransactionSlug, TransactionType } from "../../services/axios/get-activities-service/type";
 export interface ActivitiesProviderDataType {
-    isLoadingActivities: boolean;
+    isLoadingActivities: Partial<Record<TransactionSlug, boolean>>;
     activities: Activities | undefined;
     updateActivities: (query?: GetActivitiesServiceQuery) => void;
     activityTypes: ActivityTypes[] | undefined;

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

@@ -4,7 +4,7 @@ export interface GetActivitiesServiceQuery {
     take?: number;
     from_date?: string;
     to_date?: string;
-    transaction_type?: TransactionSlug;
+    transaction_types?: TransactionSlug;
 }
 export interface GetActivitiesServiceResponse {
     success: boolean;

package/package.json

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