@designcrowd/fe-shared-lib 1.2.11-ml-currency-2 → 1.2.11-ml-currency-3

package/Dockerfile

@@ -29,7 +29,7 @@ COPY .npmignore ./
 RUN npm run bundle-translation
 
 RUN mkdir artifacts
-RUN npm publish --otp=143980 || (touch artifacts/npm_publish_failed && exit 1)
+RUN npm publish --otp=777231 || (touch artifacts/npm_publish_failed && exit 1)
 RUN cp package.json artifacts/
 
 ENTRYPOINT ["/bin/echo", "Nothing to do."]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@designcrowd/fe-shared-lib",
-  "version": "1.2.11-ml-currency-2",
+  "version": "1.2.11-ml-currency-3",
   "scripts": {
     "start": "run-p storybook watch:translation",
     "build": "npm run build:css --production",

package/src/atoms/components/Price/Price.stories.js

@@ -1,5 +1,8 @@
 import Price from './Price.vue';
 import { currencies, locales } from './Price.fixtures';
+import {setSharedLibLocaleAsync} from "../../../useSharedLibTranslate";
+
+await setSharedLibLocaleAsync();
 
 // noinspection JSUnusedGlobalSymbols
 export default {

package/src/atoms/components/Price/Price.vue

@@ -6,8 +6,7 @@
 </template>
 <script>
 
-import i18next from "i18next";
-import {setSharedLibLocaleAsync} from "../../../useSharedLibTranslate";
+import {formatCurrency} from "../../../useSharedLibTranslate";
 
 export default {
   props: {
@@ -57,9 +56,6 @@ export default {
       default: false,
     },
   },
-  setup() {
-    setSharedLibLocaleAsync();
-  },
   computed: {
     amountFormatted() {
       if (this.isDomainCredit) {
@@ -72,16 +68,13 @@ export default {
 
       if (this.locale != null)
       {
-        let amount = i18next.t('{{val, currency}}', {
-          ns: 'fe-shared-lib',
-          val: this.amount,
-          currency: this.currency.iso4127Code,
-          locale: this.locale,
-          maximumFractionDigits: this.fraction,
-          useGrouping: false,
-        });
-
-        return this.standardiseAmount(amount);
+        return formatCurrency(
+          this.amount,
+          this.locale,
+          this.currency,
+          this.fraction,
+          this.showAbbreviatiom
+        );
       }
 
       const parsedAmount = Number.parseFloat(this.amount);
@@ -128,33 +121,5 @@ export default {
       return this.wrapInParentheses ? ')' : '';
     },
   },
-  methods: {
-    standardiseAmount(amount) {
-      // i18next always uses iso code for ZAR, prefer symbol over iso code
-      if (amount.includes(this.currency.iso4127Code)) {
-        return amount.replace(this.currency.iso4127Code, this.currency.symbol);
-      }
-
-      // show abbreviation locale logic
-      // note: showAbbreviaton is only passed as true for symbol = "$"
-      if (this.currency.symbol != '$') {
-        return amount
-      }
-
-      // AUD edge case for en_US
-      if (this.currency.iso4127Code == 'AUD') {
-        amount = amount.replace('A$', this.currency.symbol);
-      }
-
-      if (this.showAbbreviation && !amount.includes(this.currency.abbreviation)) {
-        return `${this.currency?.abbreviation}${amount}`
-      
-      } else if (!this.showAbbreviation && amount.includes(this.currency.abbreviation)) {
-        return amount.replace(this.currency.abbreviation, '');
-      }
-
-      return amount;
-    }
-  },
 };
 </script>

package/src/useSharedLibTranslate.js

@@ -59,6 +59,42 @@ const getCurrentLocale = () => {
   return i18next.language || 'en-US';
 };
 
+const formatCurrency = (amount, locale, currency, fraction = 0, showAbbreviation = false) => {
+  let localeAmount = i18next.t('{{val, currency}}', {
+    ns: 'fe-shared-lib',
+    val: amount,
+    currency: currency.iso4127Code,
+    locale: locale,
+    maximumFractionDigits: fraction,
+    useGrouping: false,
+  });
+
+  // i18next always uses iso code for ZAR, prefer symbol over iso code
+  if (localeAmount.includes(currency.iso4127Code)) {
+    return localeAmount.replace(currency.iso4127Code, currency.symbol);
+  }
+
+  // show abbreviation locale logic
+  // note: showAbbreviaton is only passed as true for symbol = "$"
+  if (currency.symbol != '$') {
+    return localeAmount;
+  }
+
+  // AUD edge case for en_US
+  if (currency.iso4127Code == 'AUD') {
+    localeAmount = localeAmount.replace('A$', currency.symbol);
+  }
+
+  if (showAbbreviation && !localeAmount.includes(currency.abbreviation)) {
+    return `${currency?.abbreviation}${localeAmount}`;
+  
+  } else if (!showAbbreviation && localeAmount.includes(currency.abbreviation)) {
+    return localeAmount.replace(currency.abbreviation, '');
+  }
+
+  return localeAmount;
+}
+
 export {
   setSharedLibLocaleAsync,
   getCurrentLocale,
@@ -70,5 +106,6 @@ export {
   sellDomainNameModalApplicationTr,
   sellDomainNameListModalTr,
   sellDomainNameListTr,
+  formatCurrency,
 };