@tapcart/mobile-components 0.11.1 → 0.11.3

package/dist/components/hooks/use-block-conditional-rendering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-block-conditional-rendering.d.ts","sourceRoot":"","sources":["../../../components/hooks/use-block-conditional-rendering.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,YAAY,EAGb,MAAM,kBAAkB,CAAA;AAczB,eAAO,MAAM,4BAA4B,WAC/B;IACN,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,eAAe,EAAE,GAAG,CAAA;IACpB,iBAAiB,EAAE,GAAG,CAAA;CACvB,UACO,YAAY;;;CA8NrB,CAAA"}
+{"version":3,"file":"use-block-conditional-rendering.d.ts","sourceRoot":"","sources":["../../../components/hooks/use-block-conditional-rendering.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,YAAY,EAGb,MAAM,kBAAkB,CAAA;AAczB,eAAO,MAAM,4BAA4B,WAC/B;IACN,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,eAAe,EAAE,GAAG,CAAA;IACpB,iBAAiB,EAAE,GAAG,CAAA;CACvB,UACO,YAAY;;;CAqPrB,CAAA"}

package/dist/components/hooks/use-block-conditional-rendering.js

@@ -16,12 +16,10 @@ import { useCollection } from "./use-collection";
 import { useSearchParams } from "next/navigation";
 import { gidFromId, countNumberOfTagsInState, getEnvState, shouldShowBlock, evaluateConditions, } from "../../lib/utils";
 export const useBlockConditionalRendering = (_props, _block) => {
-    var _a, _b, _c, _d, _e;
-    const _f = ((_a = _block === null || _block === void 0 ? void 0 : _block.visibilityConditions) === null || _a === void 0 ? void 0 : _a.conditions) || {}, { enabled: conditionalsV1IsEnabled = false, exclude: isInverse = false } = _f, restOfProps = __rest(_f, ["enabled", "exclude"]);
+    var _a, _b, _c, _d, _e, _f;
+    const _g = ((_a = _block === null || _block === void 0 ? void 0 : _block.visibilityConditions) === null || _a === void 0 ? void 0 : _a.conditions) || {}, { enabled: conditionalsV1IsEnabled = false, exclude: isInverse = false } = _g, restOfProps = __rest(_g, ["enabled", "exclude"]);
     const { _version = 1, conditions, enabled: conditionalsV2IsEnabled = false, } = (_block === null || _block === void 0 ? void 0 : _block.visibilityConditions) || {};
-    if (!conditionalsV1IsEnabled && !conditionalsV2IsEnabled) {
-        return { shouldShow: true, isLoading: false };
-    }
+    const isConditionalsEnabled = conditionalsV1IsEnabled || conditionalsV2IsEnabled;
     const blockState = restOfProps;
     const { appId = "", apiUrl = "", deviceVariables, customerVariables } = _props;
     const searchParams = useSearchParams();
@@ -29,6 +27,7 @@ export const useBlockConditionalRendering = (_props, _block) => {
     const [language = "en", country = "US"] = ((_b = deviceVariables === null || deviceVariables === void 0 ? void 0 : deviceVariables.locale) === null || _b === void 0 ? void 0 : _b.split("_")) || [];
     const { id: deviceId = "" } = deviceVariables || {};
     const productId = (_c = searchParams === null || searchParams === void 0 ? void 0 : searchParams.get("productId")) !== null && _c !== void 0 ? _c : undefined;
+    const productHandle = (_d = searchParams === null || searchParams === void 0 ? void 0 : searchParams.get("productHandle")) !== null && _d !== void 0 ? _d : undefined;
     const location = {
         country,
         language,
@@ -36,6 +35,9 @@ export const useBlockConditionalRendering = (_props, _block) => {
     };
     const productMetafieldsQuery = useMemo(() => {
         var _a;
+        if (!isConditionalsEnabled) {
+            return [];
+        }
         if (conditionalsV1IsEnabled && (blockState === null || blockState === void 0 ? void 0 : blockState.productMetafield)) {
             return blockState.productMetafield;
         }
@@ -60,20 +62,26 @@ export const useBlockConditionalRendering = (_props, _block) => {
         conditionalsV1IsEnabled,
         conditionalsV2IsEnabled,
         _block === null || _block === void 0 ? void 0 : _block.visibilityConditions,
+        isConditionalsEnabled,
     ]);
-    // Fetch product if productId is present
-    const { products, error: useProductsError, isLoading: isProductsLoading, } = useProducts({
-        productIds: productId !== undefined ? [gidFromId(productId)] : [],
-        baseURL: apiUrl,
-        productHandles: [],
-        metafields: productMetafieldsQuery,
-        queryVariables: {
-            language,
-            country,
-        },
-    });
+    const shouldFetchProduct = isConditionalsEnabled && (productId || productHandle);
+    const { products, error: useProductsError, isLoading: isProductsLoading, } = useProducts(shouldFetchProduct
+        ? {
+            productIds: productId ? [gidFromId(productId)] : [],
+            baseURL: apiUrl,
+            productHandles: productHandle ? [productHandle] : [],
+            metafields: productMetafieldsQuery,
+            queryVariables: {
+                language,
+                country,
+            },
+        }
+        : null);
     const blockCollectionMetafields = useMemo(() => {
         var _a;
+        if (!isConditionalsEnabled) {
+            return [];
+        }
         if (conditionalsV1IsEnabled && (blockState === null || blockState === void 0 ? void 0 : blockState.collectionMetafield)) {
             return blockState.collectionMetafield;
         }
@@ -98,35 +106,47 @@ export const useBlockConditionalRendering = (_props, _block) => {
         conditionalsV1IsEnabled,
         conditionalsV2IsEnabled,
         _block === null || _block === void 0 ? void 0 : _block.visibilityConditions,
+        isConditionalsEnabled,
     ]);
-    const collectionMetafieldsQuery = useMemo(() => blockCollectionMetafields.map((item) => {
-        // these are the fields used in the query.
-        return {
-            namespace: item.namespace,
-            key: item.key,
-        };
-    }), [blockCollectionMetafields]);
-    const memoizedMetafields = useMemo(() => collectionMetafieldsQuery
-        ? collectionMetafieldsQuery
+    const collectionMetafieldsQuery = useMemo(() => {
+        if (!blockCollectionMetafields.length) {
+            return [];
+        }
+        return blockCollectionMetafields.map((item) => {
+            // these are the fields used in the query.
+            return {
+                namespace: item.namespace,
+                key: item.key,
+            };
+        });
+    }, [blockCollectionMetafields]);
+    const memoizedMetafields = useMemo(() => {
+        if (!isConditionalsEnabled || !collectionMetafieldsQuery.length) {
+            return undefined;
+        }
+        return collectionMetafieldsQuery
             .map((m) => `${m.namespace}.${m.key}`)
-            .join(",")
-        : undefined, [collectionMetafieldsQuery]);
-    const collectionId = (_d = searchParams === null || searchParams === void 0 ? void 0 : searchParams.get("collectionId")) !== null && _d !== void 0 ? _d : undefined;
-    const collectionHandle = (_e = searchParams === null || searchParams === void 0 ? void 0 : searchParams.get("collectionHandle")) !== null && _e !== void 0 ? _e : undefined;
+            .join(",");
+    }, [collectionMetafieldsQuery, isConditionalsEnabled]);
+    const collectionId = (_e = searchParams === null || searchParams === void 0 ? void 0 : searchParams.get("collectionId")) !== null && _e !== void 0 ? _e : undefined;
+    const collectionHandle = (_f = searchParams === null || searchParams === void 0 ? void 0 : searchParams.get("collectionHandle")) !== null && _f !== void 0 ? _f : undefined;
+    const shouldFetchCollection = isConditionalsEnabled && (collectionId || collectionHandle);
     const { specificCollection = {}, error: useCollectionError, loading: isCollectionLoading, } = useCollection({
         appId,
         apiUrl,
-        collectionId,
-        collectionHandle,
+        collectionId: shouldFetchCollection ? collectionId : undefined,
+        collectionHandle: shouldFetchCollection ? collectionHandle : undefined,
         language: location === null || location === void 0 ? void 0 : location.language,
-        metafields: memoizedMetafields,
+        metafields: shouldFetchCollection ? memoizedMetafields : undefined,
     });
     const isLoading = isProductsLoading || isCollectionLoading;
     if (useProductsError || useCollectionError) {
         console.error("Unable to load products in conditional block rendering hook: ", useProductsError !== null && useProductsError !== void 0 ? useProductsError : useCollectionError);
     }
+    if (!isConditionalsEnabled) {
+        return { shouldShow: true, isLoading: false };
+    }
     let shouldShow = true;
-    const blockConditionalsIsEnabled = conditionalsV1IsEnabled || conditionalsV2IsEnabled;
     const blockHasTags = countNumberOfTagsInState(blockState) > 0;
     const product = products.length === 1 ? products[0] : undefined;
     const envState = getEnvState({
@@ -150,7 +170,7 @@ export const useBlockConditionalRendering = (_props, _block) => {
         return evaluateConditions(conditions, envState);
     };
     try {
-        if (blockConditionalsIsEnabled) {
+        if (isConditionalsEnabled) {
             switch (_version) {
                 case 2:
                     shouldShow = evaluateV2Conditions();

package/dist/components/hooks/use-infinite-scroll.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-infinite-scroll.d.ts","sourceRoot":"","sources":["../../../components/hooks/use-infinite-scroll.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,uBAAuB,EAAmB,MAAM,iBAAiB,CAAA;AAE1E,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAE5D,UAAU,QAAQ;IAChB,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,GAAG,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAA;CACxC;AAED,UAAU,sBAAsB;IAE9B,YAAY,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAGxC,WAAW,CAAC,EAAE,QAAQ,CAAA;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAGpC,SAAS,CAAC,EAAE,UAAU,GAAG,YAAY,CAAA;IACrC,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,aAAa,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAChD,YAAY,CAAC,EAAE,CACb,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,GAAG,GAAG,IAAI,EAC5B,GAAG,IAAI,EAAE,GAAG,EAAE,KACX,GAAG,CAAA;CACT;AAED,UAAU,uBAAuB;IAC/B,IAAI,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAA;IAC5B,KAAK,EAAE,GAAG,CAAA;IACV,oBAAoB,EAAE,OAAO,CAAA;IAC7B,aAAa,EAAE,OAAO,GAAG,SAAS,CAAA;IAClC,OAAO,EAAE,OAAO,CAAA;IAChB,aAAa,EAAE,OAAO,CAAA;IACtB,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,KAAK,IAAI,CAAA;IAChD,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,oBAAoB,EAAE,GAAG,EAAE,CAAA;IAC3B,SAAS,EAAE,OAAO,CAAA;IAClB,YAAY,EAAE,OAAO,CAAA;CACtB;AAED,eAAO,MAAM,sCAAsC,iBACnC,uBAAuB,OAsBtC,CAAA;AAED,QAAA,MAAM,YAAY,WAAY,MAAM,WAGnC,CAAA;AAED,QAAA,MAAM,iBAAiB,kJAepB,sBAAsB,KAAG,uBAkO3B,CAAA;AAED,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"use-infinite-scroll.d.ts","sourceRoot":"","sources":["../../../components/hooks/use-infinite-scroll.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,uBAAuB,EAAmB,MAAM,iBAAiB,CAAA;AAE1E,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AAE5D,UAAU,QAAQ;IAChB,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,EAAE,GAAG,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAA;CACxC;AAED,UAAU,sBAAsB;IAE9B,YAAY,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAA;IAGxC,WAAW,CAAC,EAAE,QAAQ,CAAA;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IAGpC,SAAS,CAAC,EAAE,UAAU,GAAG,YAAY,CAAA;IACrC,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,aAAa,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;IAChD,YAAY,CAAC,EAAE,CACb,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,GAAG,GAAG,IAAI,EAC5B,GAAG,IAAI,EAAE,GAAG,EAAE,KACX,GAAG,CAAA;CACT;AAED,UAAU,uBAAuB;IAC/B,IAAI,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAA;IAC5B,KAAK,EAAE,GAAG,CAAA;IACV,oBAAoB,EAAE,OAAO,CAAA;IAC7B,aAAa,EAAE,OAAO,GAAG,SAAS,CAAA;IAClC,OAAO,EAAE,OAAO,CAAA;IAChB,aAAa,EAAE,OAAO,CAAA;IACtB,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,KAAK,IAAI,CAAA;IAChD,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,oBAAoB,EAAE,GAAG,EAAE,CAAA;IAC3B,SAAS,EAAE,OAAO,CAAA;IAClB,YAAY,EAAE,OAAO,CAAA;CACtB;AAED,eAAO,MAAM,sCAAsC,iBACnC,uBAAuB,OAsBtC,CAAA;AAED,QAAA,MAAM,YAAY,WAAY,MAAM,WAGnC,CAAA;AAED,QAAA,MAAM,iBAAiB,kJAepB,sBAAsB,KAAG,uBAmP3B,CAAA;AAED,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,CAAA"}

package/dist/components/hooks/use-infinite-scroll.js

@@ -65,12 +65,22 @@ customFetcher, customGetKey, }) => {
         return Boolean((searchParams === null || searchParams === void 0 ? void 0 : searchParams.get("collectionId")) ||
             (searchParams === null || searchParams === void 0 ? void 0 : searchParams.get("collectionHandle")) ||
             handle ||
-            id);
-    }, [searchParams, handle, id]);
+            id ||
+            (queryVariableProps === null || queryVariableProps === void 0 ? void 0 : queryVariableProps.collectionId) ||
+            (queryVariableProps === null || queryVariableProps === void 0 ? void 0 : queryVariableProps.collectionHandle));
+    }, [
+        searchParams,
+        handle,
+        id,
+        queryVariableProps === null || queryVariableProps === void 0 ? void 0 : queryVariableProps.collectionId,
+        queryVariableProps === null || queryVariableProps === void 0 ? void 0 : queryVariableProps.collectionHandle,
+    ]);
     const hasQuery = useMemo(() => {
-        return Boolean(searchParams === null || searchParams === void 0 ? void 0 : searchParams.get("searchQuery")) || query;
-    }, [searchParams, query]);
-    const shouldSkipSearchClientFetch = usingSearchClient && !hasCollection && !hasQuery;
+        return (Boolean(searchParams === null || searchParams === void 0 ? void 0 : searchParams.get("searchQuery")) ||
+            query ||
+            (queryVariableProps === null || queryVariableProps === void 0 ? void 0 : queryVariableProps.searchQuery));
+    }, [searchParams, query, queryVariableProps === null || queryVariableProps === void 0 ? void 0 : queryVariableProps.searchQuery]);
+    const shouldSkipFetch = !hasCollection && !hasQuery;
     // Search client approach - getKey and fetcher
     const searchClientGetKey = useMemo(() => customGetKey || (searchClient === null || searchClient === void 0 ? void 0 : searchClient.getKey), [customGetKey, searchClient === null || searchClient === void 0 ? void 0 : searchClient.getKey]);
     const searchClientFetcher = useMemo(() => customFetcher || (searchClient === null || searchClient === void 0 ? void 0 : searchClient.fetcher), [customFetcher, searchClient === null || searchClient === void 0 ? void 0 : searchClient.fetcher]);
@@ -106,17 +116,17 @@ customFetcher, customGetKey, }) => {
     // Determine which approach to use
     const getKey = usingSearchClient
         ? (pageIndex, previousPageData) => {
-            if (shouldSkipSearchClientFetch)
-                return null;
             if (!searchClientGetKey)
                 return null;
             return searchClientGetKey(pageIndex, previousPageData);
         }
-        : (pageIndex, previousPageData) => (customGetKey || apiGetKey)(pageIndex, previousPageData, queryVariables !== null && queryVariables !== void 0 ? queryVariables : {});
+        : (pageIndex, previousPageData) => {
+            return (customGetKey || apiGetKey)(pageIndex, previousPageData, queryVariables !== null && queryVariables !== void 0 ? queryVariables : {});
+        };
     const fetcher = usingSearchClient
         ? (...args) => __awaiter(void 0, void 0, void 0, function* () {
             var _h, _j;
-            if (shouldSkipSearchClientFetch)
+            if (shouldSkipFetch)
                 return null;
             if (!searchClientFetcher)
                 return null;
@@ -124,7 +134,12 @@ customFetcher, customGetKey, }) => {
             productCount.current += (_j = (_h = result === null || result === void 0 ? void 0 : result.products) === null || _h === void 0 ? void 0 : _h.length) !== null && _j !== void 0 ? _j : 0;
             return result;
         })
-        : customFetcher || apiFetcher;
+        : (...args) => __awaiter(void 0, void 0, void 0, function* () {
+            if (shouldSkipFetch)
+                return null;
+            const effectiveFetcher = customFetcher || apiFetcher;
+            return effectiveFetcher(...args);
+        });
     const { data, error, size, setSize, isLoading, isValidating, mutate, } = useSWRInfinite(getKey, fetcher, {
         revalidateFirstPage: false,
         initialSize: 1,
@@ -190,7 +205,7 @@ customFetcher, customGetKey, }) => {
         return data.map((page) => { var _a; return (_a = page === null || page === void 0 ? void 0 : page.integrationResponse) !== null && _a !== void 0 ? _a : null; });
     }, [data, usingSearchClient]);
     // Elegant conditional overrides when skipping
-    const applySkip = (value, override) => shouldSkipSearchClientFetch ? override : value;
+    const applySkip = useCallback((value, override) => (shouldSkipFetch ? override : value), [shouldSkipFetch]);
     return useMemo(() => ({
         data,
         error,
@@ -215,7 +230,7 @@ customFetcher, customGetKey, }) => {
         integrationResponses,
         isLoading,
         isValidating,
-        shouldSkipSearchClientFetch,
+        applySkip,
     ]);
 };
 export { useInfiniteScroll, constructURL };

package/dist/components/ui/money.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"money.d.ts","sourceRoot":"","sources":["../../../components/ui/money.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAO,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAEjE,UAAU,SAAS;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;CACd;AAED,QAAA,MAAM,aAAa,gGAMjB,CAAA;AAEF,MAAM,WAAW,UACf,SAAQ,SAAS,EACf,YAAY,CAAC,OAAO,aAAa,CAAC;IACpC,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,CAAA;CAC7B;AAED,iBAAS,KAAK,CAAC,EACb,KAAK,EACL,MAAM,EACN,QAAQ,EACR,aAAqB,EACrB,MAAM,EACN,GAAG,KAAK,EACT,EAAE,UAAU,2CA6BZ;AAED,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,CAAA"}
+{"version":3,"file":"money.d.ts","sourceRoot":"","sources":["../../../components/ui/money.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAO,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAGjE,UAAU,SAAS;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;CACd;AAED,QAAA,MAAM,aAAa,gGAMjB,CAAA;AAEF,MAAM,WAAW,UACf,SAAQ,SAAS,EACf,YAAY,CAAC,OAAO,aAAa,CAAC;IACpC,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,CAAA;CAC7B;AAED,iBAAS,KAAK,CAAC,EACb,KAAK,EACL,MAAM,EACN,QAAQ,EACR,aAAqB,EACrB,MAAM,EACN,GAAG,KAAK,EACT,EAAE,UAAU,2CAgCZ;AAED,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,CAAA"}

package/dist/components/ui/money.js

@@ -1,3 +1,4 @@
+"use client";
 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)
@@ -12,6 +13,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from "react";
 import { cva } from "class-variance-authority";
+import { usePathname } from "next/navigation";
 const moneyVariants = cva("", {
     variants: {},
     defaultVariants: {
@@ -20,8 +22,12 @@ const moneyVariants = cva("", {
     },
 });
 function Money(_a) {
+    var _b, _c;
     var { price, locale, currency, hideZeroCents = false, styles } = _a, props = __rest(_a, ["price", "locale", "currency", "hideZeroCents", "styles"]);
-    let language = locale;
+    // Only use routeLocale if it contains a hyphen (e.g., "en-US")
+    const routeLocale = ((_c = (_b = usePathname()) === null || _b === void 0 ? void 0 : _b.split("/")) === null || _c === void 0 ? void 0 : _c.pop()) || "";
+    const isValidLocale = routeLocale && routeLocale.includes("-");
+    let language = isValidLocale ? routeLocale : locale;
     // Fix for when we want to format in USD in english
     // but language only contains two letter region
     if (currency === "USD" && !(locale === null || locale === void 0 ? void 0 : locale.includes("-"))) {
@@ -31,7 +37,7 @@ function Money(_a) {
         style: "currency",
         currency: currency,
         currencyDisplay: "narrowSymbol",
-    }), [locale, currency]);
+    }), [language, currency]);
     const formattedPrice = React.useMemo(() => {
         const formatted = formatter.format(Number(price));
         return hideZeroCents ? formatted.replace(/(\.|,)00$/, "") : formatted;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tapcart/mobile-components",
-  "version": "0.11.1",
+  "version": "0.11.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "style": "dist/styles.css",