fix: display price by current active curreny

apps/storefront/src/shared/service/bc/graphql/currency.ts

@@ -0,0 +1,21 @@
+import B3Request from '../../request/b3Fetch'
+
+const BcCurrencies = () => `{
+  site{
+    currencies{
+      edges{
+        node{
+          isActive
+          entityId
+        }
+      }
+    }
+  }
+}`
+
+const getActiveBcCurrency = (): CustomFieldItems =>
+  B3Request.graphqlBC({
+    query: BcCurrencies(),
+  })
+
+export default getActiveBcCurrency

apps/storefront/src/shared/service/bc/index.ts

@@ -2,5 +2,6 @@ export * from './api/cart'
 export * from './api/login'
 export { default as getBCProductVariantId } from './api/product'
 export { default as getBCRegisterCustomFields } from './api/register'
+export { default as getActiveBcCurrency } from './graphql/currency'
 export * from './graphql/login'
 export { default as getCustomerInfo } from './graphql/user'

apps/storefront/src/utils/b3CurrencyFormat.ts

@@ -1,4 +1,4 @@
-import getDefaultCurrencyInfo from './currencyUtils'
+import { getActiveCurrencyInfo } from './currencyUtils'
 
 interface MoneyFormat {
   currency_location: 'left' | 'right'
@@ -10,16 +10,19 @@ interface MoneyFormat {
 }
 
 const currencyFormat = (price: string | number, showCurrencyToken = true) => {
-  const currentCurrency = getDefaultCurrencyInfo()
+  const currentCurrency = getActiveCurrencyInfo()
 
   const moneyFormat: MoneyFormat = {
-    currency_location: currentCurrency?.token_location || 'left',
-    currency_token: currentCurrency?.token || '$',
-    decimal_token: currentCurrency?.decimal_token || '.',
-    decimal_places: currentCurrency?.decimal_places || 2,
-    thousands_token: currentCurrency?.thousands_token || ',',
+    currency_location: currentCurrency.token_location || 'left',
+    currency_token: currentCurrency.token || '$',
+    decimal_token: currentCurrency.decimal_token || '.',
+    decimal_places:
+      currentCurrency.decimal_places === 0
+        ? 0
+        : currentCurrency.decimal_places || 2,
+    thousands_token: currentCurrency.thousands_token || ',',
     currency_exchange_rate:
-      currentCurrency?.currency_exchange_rate || '1.0000000000',
+      currentCurrency.currency_exchange_rate || '1.0000000000',
   }
 
   try {
@@ -31,7 +34,7 @@ const currencyFormat = (price: string | number, showCurrencyToken = true) => {
     const newPrice = `${integerPart.replace(
       /\B(?=(\d{3})+(?!\d))/g,
       moneyFormat.thousands_token
-    )}${moneyFormat.decimal_token}${decimalPart}`
+    )}${decimalPart ? `${moneyFormat.decimal_token}${decimalPart}` : ''}`
     const priceStr =
       moneyFormat.currency_location === 'left'
         ? `${showCurrencyToken ? moneyFormat.currency_token : ''}${newPrice}`

apps/storefront/src/utils/currencyUtils.ts

@@ -19,19 +19,42 @@ interface CurrencyProps {
   token_location: 'left' | 'right'
 }
 
+interface ActiveCurrencyProps {
+  node: {
+    entityId: number
+    isActive: boolean
+  }
+}
+
+const getActiveCurrencyInfo = () => {
+  const { currencies } = B3SStorage.get('currencies')
+  const { node: activeCurrencyObj }: ActiveCurrencyProps =
+    B3SStorage.get('activeCurrency')
+  const activeCurrency: CurrencyProps = currencies.find(
+    (currency: CurrencyProps) => +currency.id === activeCurrencyObj.entityId
+  )
+
+  return activeCurrency
+}
+
 const getDefaultCurrencyInfo = () => {
   const currencies = B3SStorage.get('currencies')
-  if (currencies) {
-    const { currencies: currencyArr } = currencies
+  const { currencies: currencyArr } = currencies
+
+  const activeCurrency = getActiveCurrencyInfo()
 
-    const defaultCurrency = currencyArr.find(
+  let defaultCurrency: CurrencyProps
+  if (activeCurrency.enabled) {
+    defaultCurrency = currencyArr.find(
+      (currency: CurrencyProps) => +currency.id === +activeCurrency.id
+    )
+  } else {
+    defaultCurrency = currencyArr.find(
       (currency: CurrencyProps) => currency.is_default
     )
-
-    return defaultCurrency
   }
 
-  return undefined
+  return defaultCurrency
 }
 
-export default getDefaultCurrencyInfo
+export { getActiveCurrencyInfo, getDefaultCurrencyInfo }

apps/storefront/src/utils/index.ts

@@ -18,7 +18,7 @@ import { B3LStorage, B3SStorage } from './b3Storage'
 import { globalSnackbar, snackbar } from './b3Tip'
 import getCookie from './b3utils'
 import { captchaSetkey, storeHash } from './basicConfig'
-import getDefaultCurrencyInfo from './currencyUtils'
+import { getActiveCurrencyInfo, getDefaultCurrencyInfo } from './currencyUtils'
 import {
   convertArrayToGraphql,
   convertObjectToGraphql,
@@ -58,6 +58,7 @@ export {
   displayExtendedFormat,
   displayFormat,
   distanceDay,
+  getActiveCurrencyInfo,
   getCookie,
   getCurrentCustomerInfo,
   getCurrentJwt,

apps/storefront/src/utils/storefrontConfig.ts

@@ -9,6 +9,7 @@ import {
   getStorefrontConfigs,
   getTaxZoneRates,
 } from '@/shared/service/b2b'
+import { getActiveBcCurrency } from '@/shared/service/bc'
 import { setTaxZoneRates, store } from '@/store'
 import { B3SStorage } from '@/utils'
 
@@ -36,6 +37,13 @@ interface StoreforntKeysProps {
   name: string
 }
 
+interface CurrencyNodeProps {
+  node: {
+    entityId: number
+    isActive: boolean
+  }
+}
+
 const storeforntKeys: StoreforntKeysProps[] = [
   {
     key: 'quote_on_product_page',
@@ -168,10 +176,20 @@ const setStorefrontConfig = async (
   const {
     storefrontConfig: { config: storefrontConfig },
   } = await getStorefrontConfig()
-
   const { currencies } = await getCurrencies(currentChannelId)
-  B3SStorage.set('currencies', currencies)
+  const {
+    data: {
+      site: {
+        currencies: { edges },
+      },
+    },
+  } = await getActiveBcCurrency()
 
+  B3SStorage.set('currencies', currencies)
+  B3SStorage.set(
+    'activeCurrency',
+    edges.find((item: CurrencyNodeProps) => item.node.isActive)
+  )
   dispatch({
     type: 'common',
     payload: {