format amount

paypal · Oct 11, 2024 · 72fc8ed · 72fc8ed
1 parent 37176d3
commit 72fc8ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/components/modal/v2/parts/views/ProductList/Content.jsx b/src/components/modal/v2/parts/views/ProductList/Content.jsx
@@ -2,6 +2,7 @@
 import { h, Fragment } from 'preact';
 import { useServerData } from '../../../lib';
 import Tile from '../../Tile';
+import { currencyFormat } from '../../../lib/hooks/currency';
 import styles from './styles.scss';
 
 export const ProductList = ({ content: { instructions, disclosure, productTiles }, useV5Design, setViewName }) => {
@@ -43,7 +44,7 @@ export const ProductList = ({ content: { instructions, disclosure, productTiles
                         availableTiles.credit?.map(({ header, body, viewName }) => (
                             <Tile
                                 header={header}
-                                body={body}
+                                body={currencyFormat(body)}
                                 viewName={viewName}
                                 setViewName={setViewName}
                                 useV5Design={useV5Design}

diff --git a/src/server/message/parts/MutatedText.jsx b/src/server/message/parts/MutatedText.jsx
@@ -40,7 +40,7 @@ const MutatedText = ({ tagData, options }) => {
         // truncate zeros for non-qualifying messages
         const matchNQ = formattedStr.match(
             // eslint-disable-next-line security/detect-unsafe-regex
-            /((\$|£)?(\d{1,5}(\.|,)){1,3}00(€|(.|\s*)EUR)?(-|(\s(\D{1,3})\s))(\$|£)?(\d{1,5}(\.|,|\s)){1,3}00(€|(.|\s*)EUR)?)/g
+            /((\$|£)?(\d{1,5}(\.|,)){1,3}00(€|(.|\s*)EUR)?((-|(\s(\D{1,3})\s))(\$|£)?(\d{1,5}(\.|,|\s)){1,3}00(€|(.|\s*)EUR)?|\+))/g
         );
         if (matchNQ !== null) {
             matchNQ.forEach(foundString => {
@@ -49,7 +49,8 @@ const MutatedText = ({ tagData, options }) => {
                     .replace(/(\.|,)00$/g, '')
                     .replace(/(\.|,)00€/g, '€')
                     .replace(/(\.|,)00(.|\s*)EUR/g, '€')
-                    .replace(/(\s*EUR)/g, '€');
+                    .replace(/(\s*EUR)/g, '€')
+                    .replace(/(\.|,)00(\+)/g, '+');
                 formattedStr = formattedStr.replace(foundString, filteredString);
             });
         }