@mezo-org/passport 0.10.0-dev.1 → 0.10.0-dev.3

package/dist/src/components/Dropdown/Root/WelcomeBlock.js

@@ -81,7 +81,7 @@ export default function WelcomeBlock(props) {
                         },
                     } }),
                 React.createElement(LabelLarge, { color: theme.colors.contentPrimary },
-                    React.createElement(SlotNumber, { formatFunction: formatNumberToCompactString }, data.mats.totalMats),
+                    React.createElement(SlotNumber, { formatFunction: formatNumberToCompactString }, data.totalMats),
                     " ",
                     "mats")))));
 }

package/dist/src/components/Dropdown/Root/WelcomeBlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"WelcomeBlock.js","sourceRoot":"","sources":["../../../../../src/components/Dropdown/Root/WelcomeBlock.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"WelcomeBlock.js","sourceRoot":"","sources":["../../../../../src/components/Dropdown/Root/WelcomeBlock.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAEL,aAAa,EACb,UAAU,EACV,IAAI,EACJ,cAAc,EACd,QAAQ,EACR,YAAY,GACb,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,aAAa,MAAM,+BAA+B,CAAA;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAA;AACpE,OAAO,YAAY,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAA;AACtE,OAAO,UAAU,MAAM,eAAe,CAAA;AAEtC,MAAM,mBAAmB,GAAG,QAAQ,CAAA;AAEpC,SAAS,oBAAoB;IAC3B,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,YAAY,EAAE,CAAA;IAEhC,OAAO,CACL,oBAAC,KAAK,IACJ,OAAO,EAAC,MAAM,EACd,UAAU,EAAC,QAAQ,EACnB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAC9B,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EACjC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EACpC,SAAS,EAAE;YACT,KAAK,EAAE;gBACL,KAAK,EAAE;oBACL,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ;iBAC3B;aACF;SACF;QAED,oBAAC,QAAQ,IACP,SAAS,QACT,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,EAC7B,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,EAC9B,SAAS,EAAE;gBACT,IAAI,EAAE;oBACJ,KAAK,EAAE;wBACL,YAAY,EAAE,MAAM;qBACrB;iBACF;aACF,GACD;QAEF,oBAAC,KAAK,IACJ,OAAO,EAAC,MAAM,EACd,aAAa,EAAC,QAAQ,EACtB,IAAI,EAAE,CAAC,EACP,SAAS,EAAE;gBACT,KAAK,EAAE;oBACL,KAAK,EAAE;wBACL,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ;qBAC3B;iBACF;aACF;YAED,oBAAC,QAAQ,IAAC,SAAS,QAAC,KAAK,EAAC,KAAK,EAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,GAAI;YACjE,oBAAC,QAAQ,IAAC,SAAS,QAAC,KAAK,EAAC,KAAK,EAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,GAAI,CAC3D,CACF,CACT,CAAA;AACH,CAAC;AAID,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,KAAwB;IAC3D,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,GAAG,KAAK,CAAA;IACzC,MAAM,EAAE,0BAA0B,EAAE,GAAG,kBAAkB,EAAE,CAAA;IAE3D,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,oBAAoB,CAAC;QACxD,SAAS,EAAE,0BAA0B;QACrC,eAAe,EAAE,0BAA0B;KAC5C,CAAC,CAAA;IACF,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,YAAY,EAAE,CAAA;IAEhC,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CACL,oBAAC,YAAY,IACX,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAC9B,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EACjC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EACpC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EACnC,KAAK,EAAC,qBAAqB,GAC3B,CACH,CAAA;IACH,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,oBAAC,oBAAoB,OAAG,CAAA;IACjC,CAAC;IAED,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAE7E,OAAO,CACL,oBAAC,KAAK,IACJ,OAAO,EAAC,MAAM,EACd,UAAU,EAAC,QAAQ,EACnB,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAClC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EACnC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EACjC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EACpC,SAAS,EAAE,cAAc,CAAC,SAAS,EAAE;YACnC,KAAK,EAAE;gBACL,KAAK,EAAE;oBACL,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ;iBAC3B;aACF;SACF,CAAC,KACE,SAAS;QAEb,oBAAC,KAAK,IACJ,EAAE,EAAE,aAAa,EACjB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,EAC7B,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,EAC9B,SAAS,EAAE;gBACT,KAAK,EAAE;oBACL,KAAK,EAAE;wBACL,YAAY,EAAE,MAAM;qBACrB;iBACF;aACF,GACD;QAEF,oBAAC,KAAK,IAAC,OAAO,EAAC,MAAM,EAAC,aAAa,EAAC,QAAQ;YACzC,MAAM,IAAI,YAAY,IAAI,CACzB,oBAAC,aAAa,IAAC,EAAE,EAAC,MAAM;gBACtB,oBAAC,KAAK,IAAC,EAAE,EAAC,MAAM,IAAE,MAAM,CAAS;gBACjC,oBAAC,KAAK,IAAC,EAAE,EAAC,MAAM,EAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,gBAAgB,IAClD,YAAY,CACP,CACM,CACjB;YAED,oBAAC,KAAK,IACJ,OAAO,EAAC,MAAM,EACd,UAAU,EAAC,QAAQ,EACnB,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,KAAK,EAAE;4BACL,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ;yBAC3B;qBACF;iBACF;gBAED,oBAAC,IAAI,IACH,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAC3B,SAAS,EAAE;wBACT,GAAG,EAAE;4BACH,KAAK,EAAE;gCACL,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,gBAAgB;6BAChD;yBACF;qBACF,GACD;gBAEF,oBAAC,UAAU,IAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,cAAc;oBAC5C,oBAAC,UAAU,IAAC,cAAc,EAAE,2BAA2B,IACpD,IAAI,CAAC,SAAS,CACJ;oBAAC,GAAG;2BAEN,CACP,CACF,CACF,CACT,CAAA;AACH,CAAC"}

package/dist/src/hooks/useGetCurrentAccount.d.ts

@@ -1,19 +1,15 @@
-import { UseQueryOptions } from "@tanstack/react-query";
-import type { GetCurrentAccountResponse } from "../api";
+import { UseQueryOptions, UseQueryResult } from "@tanstack/react-query";
+import type { GetCurrentAccountResponse, PortalMats, RewardsMats } from "../api";
 type GetCurrentAccountResponseWithMats = GetCurrentAccountResponse & {
-    mats: {
-        totalMats: number;
-    };
+    mats: (PortalMats | RewardsMats)[];
+    totalMats: number;
 };
-type UseGetCurrentAccountOptions<TSelected = GetCurrentAccountResponseWithMats> = Omit<UseQueryOptions<GetCurrentAccountResponseWithMats, Error, TSelected>, "queryKey" | "queryFn">;
-export declare function useGetCurrentAccount(queryOptions?: UseGetCurrentAccountOptions): import("@tanstack/react-query").UseQueryResult<Partial<{
-    mezoId: string;
-    hasModifiedMezoId: boolean;
-    linkedAccounts: import("../api").LinkedAccount[];
-}> & {
-    mats: {
-        totalMats: number;
-    };
-}, Error>;
+export declare const isRewardsMats: (value: unknown) => value is RewardsMats;
+export declare const isPortalMats: (value: unknown) => value is PortalMats;
+type UseGetCurrentAccountOptions<TSelected> = Omit<UseQueryOptions<GetCurrentAccountResponseWithMats, Error, TSelected>, "queryKey" | "queryFn">;
+/**
+ * Hook to fetch current account with mats
+ */
+export declare function useGetCurrentAccount<TSelected = GetCurrentAccountResponseWithMats>(options?: UseGetCurrentAccountOptions<TSelected>): UseQueryResult<TSelected, Error>;
 export {};
 //# sourceMappingURL=useGetCurrentAccount.d.ts.map

package/dist/src/hooks/useGetCurrentAccount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useGetCurrentAccount.d.ts","sourceRoot":"","sources":["../../../src/hooks/useGetCurrentAccount.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAKjE,OAAO,KAAK,EAAE,yBAAyB,EAA2B,MAAM,QAAQ,CAAA;AAIhF,KAAK,iCAAiC,GAAG,yBAAyB,GAAG;IACnE,IAAI,EAAE;QACJ,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;CACF,CAAA;AAED,KAAK,2BAA2B,CAC9B,SAAS,GAAG,iCAAiC,IAC3C,IAAI,CACN,eAAe,CAAC,iCAAiC,EAAE,KAAK,EAAE,SAAS,CAAC,EACpE,UAAU,GAAG,SAAS,CACvB,CAAA;AAED,wBAAgB,oBAAoB,CAClC,YAAY,GAAE,2BAAgC;;;;;UAbxC;QACJ,SAAS,EAAE,MAAM,CAAA;KAClB;UAoEF"}
+{"version":3,"file":"useGetCurrentAccount.d.ts","sourceRoot":"","sources":["../../../src/hooks/useGetCurrentAccount.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,eAAe,EACf,cAAc,EACf,MAAM,uBAAuB,CAAA;AAK9B,OAAO,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAA;AAIhF,KAAK,iCAAiC,GAAG,yBAAyB,GAAG;IACnE,IAAI,EAAE,CAAC,UAAU,GAAG,WAAW,CAAC,EAAE,CAAA;IAClC,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,WAUrD,CAAA;AAEH,eAAO,MAAM,YAAY,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,UAOpD,CAAA;AAEH,KAAK,2BAA2B,CAAC,SAAS,IAAI,IAAI,CAChD,eAAe,CAAC,iCAAiC,EAAE,KAAK,EAAE,SAAS,CAAC,EACpE,UAAU,GAAG,SAAS,CACvB,CAAA;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,GAAG,iCAAiC,EAE7C,OAAO,GAAE,2BAA2B,CAAC,SAAS,CAAM,GACnD,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,CAwDlC"}

package/dist/src/hooks/useGetCurrentAccount.js

@@ -1,12 +1,25 @@
 import { useContext } from "react";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery, } from "@tanstack/react-query";
 import { ONE_MINUTE_MS } from "../utils/time";
 import { QUERY_KEYS } from "./constants";
 import { useAuthApiClient } from "./useAuthApiClient";
 import { usePortalApiClient } from "./usePortalApiClient";
 import { useRewardsApiClient } from "./useRewardsApiClient";
 import { PassportContext } from "../provider";
-export function useGetCurrentAccount(queryOptions = {}) {
+export const isRewardsMats = (value) => !!value &&
+    typeof value === "object" &&
+    ["seasonOne", "seasonTwo"].every((seasonKey) => !!value[seasonKey] &&
+        typeof value[seasonKey] === "object" &&
+        ["mats", "rank"].every((fieldKey) => typeof value[seasonKey][fieldKey] === "number"));
+export const isPortalMats = (value) => !!value &&
+    typeof value === "object" &&
+    ["totalMats", "inactiveMats", "matsActivated"].every((fieldKey) => fieldKey === "matsActivated"
+        ? typeof value[fieldKey] === "boolean"
+        : typeof value[fieldKey] === "number");
+/**
+ * Hook to fetch current account with mats
+ */
+export function useGetCurrentAccount(options = {}) {
     const passportContext = useContext(PassportContext);
     const authApiClient = useAuthApiClient();
     const portalApiClient = usePortalApiClient();
@@ -25,6 +38,7 @@ export function useGetCurrentAccount(queryOptions = {}) {
             const addresses = linkedWallets.map((account) => passportContext?.useRewardsApi
                 ? account.evmAddress
                 : account.btcAddress || account.evmAddress);
+            /** Mats balances aggregated from all linked wallets */
             const mats = await Promise.all(addresses.map((address) => passportContext?.useRewardsApi
                 ? rewardsApiClient.getRewardsMats(address)
                 : portalApiClient.getPortalMats(address)));
@@ -34,14 +48,13 @@ export function useGetCurrentAccount(queryOptions = {}) {
                     : currentMats.totalMats), 0);
             return {
                 ...currentAccount,
-                mats: {
-                    totalMats,
-                },
+                mats,
+                totalMats,
             };
         },
-        staleTime: ONE_MINUTE_MS,
-        retry: 1,
-        ...queryOptions,
+        staleTime: options.staleTime ?? ONE_MINUTE_MS,
+        retry: options.retry ?? 1,
+        ...options,
     });
 }
 //# sourceMappingURL=useGetCurrentAccount.js.map

package/dist/src/hooks/useGetCurrentAccount.js.map

@@ -1 +1 @@
-{"version":3,"file":"useGetCurrentAccount.js","sourceRoot":"","sources":["../../../src/hooks/useGetCurrentAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAClC,OAAO,EAAE,QAAQ,EAAmB,MAAM,uBAAuB,CAAA;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAe7C,MAAM,UAAU,oBAAoB,CAClC,eAA4C,EAAE;IAE9C,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC,CAAA;IAEnD,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IACxC,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAA;IAC5C,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAA;IAE9C,OAAO,QAAQ,CAAC;QACd,QAAQ,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC;QAClD,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,iBAAiB,EAAE,CAAA;YAC9D,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;YAC7C,CAAC;YAED,MAAM,aAAa,GAAG,cAAc,EAAE,cAAc,EAAE,MAAM,CAC1D,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,CACvC,CAAA;YACD,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjD,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;YACpE,CAAC;YAED,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAC9C,eAAe,EAAE,aAAa;gBAC5B,CAAC,CAAC,OAAO,CAAC,UAAU;gBACpB,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAC7C,CAAA;YAED,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAC5B,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACxB,eAAe,EAAE,aAAa;gBAC5B,CAAC,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC1C,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,CAC3C,CACF,CAAA;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAC3B,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,CACvB,OAAO;gBACP,CAAC,eAAe,EAAE,aAAa;oBAC7B,CAAC,CAAE,WAA2B,CAAC,SAAS,CAAC,IAAI;oBAC7C,CAAC,CAAE,WAA0B,CAAC,SAAS,CAAC,EAC5C,CAAC,CACF,CAAA;YAED,OAAO;gBACL,GAAG,cAAc;gBACjB,IAAI,EAAE;oBACJ,SAAS;iBACV;aACF,CAAA;QACH,CAAC;QACD,SAAS,EAAE,aAAa;QACxB,KAAK,EAAE,CAAC;QACR,GAAG,YAAY;KAChB,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"useGetCurrentAccount.js","sourceRoot":"","sources":["../../../src/hooks/useGetCurrentAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAClC,OAAO,EACL,QAAQ,GAGT,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAO7C,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAc,EAAwB,EAAE,CACpE,CAAC,CAAC,KAAK;IACP,OAAO,KAAK,KAAK,QAAQ;IACzB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,KAAK,CAC9B,CAAC,SAAS,EAAE,EAAE,CACZ,CAAC,CAAE,KAAe,CAAC,SAAS,CAAC;QAC7B,OAAQ,KAAe,CAAC,SAAS,CAAC,KAAK,QAAQ;QAC/C,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,CACpB,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAQ,KAAe,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,KAAK,QAAQ,CACxE,CACJ,CAAA;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAc,EAAuB,EAAE,CAClE,CAAC,CAAC,KAAK;IACP,OAAO,KAAK,KAAK,QAAQ;IACzB,CAAC,WAAW,EAAE,cAAc,EAAE,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EAAE,CAChE,QAAQ,KAAK,eAAe;QAC1B,CAAC,CAAC,OAAQ,KAAe,CAAC,QAAQ,CAAC,KAAK,SAAS;QACjD,CAAC,CAAC,OAAQ,KAAe,CAAC,QAAQ,CAAC,KAAK,QAAQ,CACnD,CAAA;AAOH;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAGlC,UAAkD,EAAE;IAEpD,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC,CAAA;IAEnD,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAA;IACxC,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAA;IAC5C,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAA;IAE9C,OAAO,QAAQ,CAAsD;QACnE,QAAQ,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC;QAClD,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,iBAAiB,EAAE,CAAA;YAC9D,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;YAC7C,CAAC;YAED,MAAM,aAAa,GAAG,cAAc,EAAE,cAAc,EAAE,MAAM,CAC1D,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,CACvC,CAAA;YACD,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjD,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAA;YACpE,CAAC;YAED,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAC9C,eAAe,EAAE,aAAa;gBAC5B,CAAC,CAAC,OAAO,CAAC,UAAU;gBACpB,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAC7C,CAAA;YAED,uDAAuD;YACvD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAC5B,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACxB,eAAe,EAAE,aAAa;gBAC5B,CAAC,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC1C,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,CAC3C,CACF,CAAA;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAC3B,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,CACvB,OAAO;gBACP,CAAC,eAAe,EAAE,aAAa;oBAC7B,CAAC,CAAE,WAA2B,CAAC,SAAS,CAAC,IAAI;oBAC7C,CAAC,CAAE,WAA0B,CAAC,SAAS,CAAC,EAC5C,CAAC,CACF,CAAA;YAED,OAAO;gBACL,GAAG,cAAc;gBACjB,IAAI;gBACJ,SAAS;aACV,CAAA;QACH,CAAC;QACD,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,aAAa;QAC7C,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;QACzB,GAAG,OAAO;KACX,CAAC,CAAA;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mezo-org/passport",
-  "version": "0.10.0-dev.1",
+  "version": "0.10.0-dev.3",
   "main": "dist/src/index.js",
   "license": "GPL-3.0-only",
   "scripts": {

package/src/components/Dropdown/Root/WelcomeBlock.tsx

@@ -162,7 +162,7 @@ export default function WelcomeBlock(props: WelcomeBlockProps) {
 
           <LabelLarge color={theme.colors.contentPrimary}>
             <SlotNumber formatFunction={formatNumberToCompactString}>
-              {data.mats.totalMats}
+              {data.totalMats}
             </SlotNumber>{" "}
             mats
           </LabelLarge>

package/src/hooks/useGetCurrentAccount.ts

@@ -1,5 +1,9 @@
 import { useContext } from "react"
-import { useQuery, UseQueryOptions } from "@tanstack/react-query"
+import {
+  useQuery,
+  UseQueryOptions,
+  UseQueryResult,
+} from "@tanstack/react-query"
 import { ONE_MINUTE_MS } from "../utils/time"
 import { QUERY_KEYS } from "./constants"
 import { useAuthApiClient } from "./useAuthApiClient"
@@ -9,28 +13,51 @@ import { useRewardsApiClient } from "./useRewardsApiClient"
 import { PassportContext } from "../provider"
 
 type GetCurrentAccountResponseWithMats = GetCurrentAccountResponse & {
-  mats: {
-    totalMats: number
-  }
+  mats: (PortalMats | RewardsMats)[]
+  totalMats: number
 }
 
-type UseGetCurrentAccountOptions<
-  TSelected = GetCurrentAccountResponseWithMats,
-> = Omit<
+export const isRewardsMats = (value: unknown): value is RewardsMats =>
+  !!value &&
+  typeof value === "object" &&
+  ["seasonOne", "seasonTwo"].every(
+    (seasonKey) =>
+      !!(value as never)[seasonKey] &&
+      typeof (value as never)[seasonKey] === "object" &&
+      ["mats", "rank"].every(
+        (fieldKey) => typeof (value as never)[seasonKey][fieldKey] === "number",
+      ),
+  )
+
+export const isPortalMats = (value: unknown): value is PortalMats =>
+  !!value &&
+  typeof value === "object" &&
+  ["totalMats", "inactiveMats", "matsActivated"].every((fieldKey) =>
+    fieldKey === "matsActivated"
+      ? typeof (value as never)[fieldKey] === "boolean"
+      : typeof (value as never)[fieldKey] === "number",
+  )
+
+type UseGetCurrentAccountOptions<TSelected> = Omit<
   UseQueryOptions<GetCurrentAccountResponseWithMats, Error, TSelected>,
   "queryKey" | "queryFn"
 >
 
-export function useGetCurrentAccount(
-  queryOptions: UseGetCurrentAccountOptions = {},
-) {
+/**
+ * Hook to fetch current account with mats
+ */
+export function useGetCurrentAccount<
+  TSelected = GetCurrentAccountResponseWithMats,
+>(
+  options: UseGetCurrentAccountOptions<TSelected> = {},
+): UseQueryResult<TSelected, Error> {
   const passportContext = useContext(PassportContext)
 
   const authApiClient = useAuthApiClient()
   const portalApiClient = usePortalApiClient()
   const rewardsApiClient = useRewardsApiClient()
 
-  return useQuery({
+  return useQuery<GetCurrentAccountResponseWithMats, Error, TSelected>({
     queryKey: [QUERY_KEYS.ACCOUNT, QUERY_KEYS.CURRENT],
     queryFn: async () => {
       const currentAccount = await authApiClient.getCurrentAccount()
@@ -51,6 +78,7 @@ export function useGetCurrentAccount(
           : account.btcAddress || account.evmAddress,
       )
 
+      /** Mats balances aggregated from all linked wallets */
       const mats = await Promise.all(
         addresses.map((address) =>
           passportContext?.useRewardsApi
@@ -70,13 +98,12 @@ export function useGetCurrentAccount(
 
       return {
         ...currentAccount,
-        mats: {
-          totalMats,
-        },
+        mats,
+        totalMats,
       }
     },
-    staleTime: ONE_MINUTE_MS,
-    retry: 1,
-    ...queryOptions,
+    staleTime: options.staleTime ?? ONE_MINUTE_MS,
+    retry: options.retry ?? 1,
+    ...options,
   })
 }