@tap-payments/os-micro-frontend-shared 0.0.152 → 0.0.155-jsonviewer-fix-v2

package/build/components/JSONViewer/context/Provider.js

@@ -7,7 +7,6 @@ export const JsonViewerDialogContextProvider = ({ children }) => {
     const [isWindowMinimized, setIsWindowMinimized] = useState(false);
     const [windowOrder, setWindowOrder] = useState(1);
     const handleJsonViewerDialogOpen = useCallback((jsonViewer) => {
-        var _a;
         if (jsonViewerList.length === 7) {
             alert('Maximum allowed active Json Viewer is 7 per table.');
             return;
@@ -15,8 +14,14 @@ export const JsonViewerDialogContextProvider = ({ children }) => {
         if (jsonViewerList.some((item) => item.json.id === jsonViewer.json.id)) {
             return;
         }
-        (_a = jsonViewer === null || jsonViewer === void 0 ? void 0 : jsonViewer.json) === null || _a === void 0 ? true : delete _a.request_body;
-        setJsonViewerList((prev) => [...prev, jsonViewer]);
+        const jsonCopy = Object.assign({}, jsonViewer.json);
+        const requestData = jsonCopy.request_body;
+        const processedJsonViewer = {
+            json: jsonCopy,
+            requestJson: jsonViewer.requestJson || requestData || undefined,
+        };
+        delete processedJsonViewer.json.request_body;
+        setJsonViewerList((prev) => [...prev, processedJsonViewer]);
     }, [jsonViewerList]);
     const handleJsonViewerDialogClose = (index) => {
         setJsonViewerList((prev) => prev.filter((_, idx) => index !== idx));

package/build/components/TableCells/CustomCells/AmountCell/AmountCell.js

@@ -20,8 +20,7 @@ import { FlagIcon } from '../style';
 function AmountCell(_a) {
     var { conversionType, amount, currency, tooltipLabel, amountTooltipLabel, isTextShown, tableMode } = _a, props = __rest(_a, ["conversionType", "amount", "currency", "tooltipLabel", "amountTooltipLabel", "isTextShown", "tableMode"]);
     const icon = currency && _jsx(FlagIcon, { src: getCurrenciesIcon(currency), alt: "customer icon" });
-    const { fullAmount } = formatAmountWithCurrency(amount, currency);
-    const [integerAmount, decimalAmount] = fullAmount.toString().split('.');
+    const { integerAmount, decimalAmount } = formatAmountWithCurrency(amount, currency);
     return (_jsx(TableCell, Object.assign({}, props, { children: _jsxs(AmountCellContainer, { children: [_jsx(Tooltip, Object.assign({ title: tooltipLabel || '' }, { children: conversionType && (_jsx(ConversionBadge, Object.assign({ tableMode: tableMode, className: "conversion-type" }, { children: conversionType }))) })), _jsx(Tooltip, Object.assign({ title: _jsx(CurrencyIcon, { currency: currency }) }, { children: isTextShown ? _jsx("span", {}) : _jsx(FlagContainer, { children: icon }) })), _jsx(Tooltip, Object.assign({ title: amountTooltipLabel }, { children: _jsx(CurrencySpan, Object.assign({ tableMode: tableMode }, { children: amount !== undefined ? (_jsxs(_Fragment, { children: [_jsx("span", { children: _jsx(CurrencyIcon, { currency: currency, fontSize: 10 }) }), ' ', integerAmount, decimalAmount && (_jsxs(_Fragment, { children: [".", _jsx(DecimalSpan, { children: decimalAmount })] }))] })) : (_jsx("span", { children: "-" })) })) }))] }) })));
 }
 export default AmountCell;

package/build/utils/currency.d.ts

@@ -10,22 +10,14 @@ export declare const isIntegerAmount: (charge: number) => boolean;
 export declare const isDecimalWithOneDigit: (charge: number) => boolean;
 export declare const hasOnlyOneDigitAfterDecimal: (charge: number) => boolean;
 export declare const formatCurrencyWithInput: (charge: number, selectedCurrency: CurrencyCodes) => string;
-export declare function formatAmount(amount: number, decimalPlaces?: number): {
+export declare function formatAmount(amount: number, decimal?: number): {
     integerAmount: string;
     decimalAmount: string;
     fullAmount: string;
-    raw: {
-        integer: number;
-        decimal: number;
-    };
 };
 export declare function formatAmountWithCurrency(amount?: number, currency?: string): {
     integerAmount: string;
     decimalAmount: string;
     fullAmount: string;
-    raw: {
-        integer: number;
-        decimal: number;
-    };
 };
 export declare const getSupportedCurrencies: (currencies: Currency[]) => Currency[];

package/build/utils/currency.js

@@ -55,33 +55,24 @@ export const formatCurrencyWithInput = (charge, selectedCurrency) => {
     }
     return chargeString;
 };
-function buildFormattedAmount(integer, decimal) {
-    return Number(decimal) > 0 ? `${integer}.${decimal}` : integer;
-}
-function getRawAmount(integer, decimalStr, isNegative) {
-    const sign = isNegative ? -1 : 1;
-    const decimal = Number(`0.${decimalStr}`) * sign;
-    return {
-        integer: integer * sign,
-        decimal,
-    };
-}
-export function formatAmount(amount, decimalPlaces = 2) {
-    var _a;
-    const isNegative = amount < 0;
-    amount = Math.abs(amount);
-    const integerAmount = Math.floor(amount);
-    let decimalStr = (amount - integerAmount).toString().split('.')[1] || '0';
-    decimalStr = decimalStr.padEnd(decimalPlaces, '0').slice(0, decimalPlaces);
-    const formattedIntegerAmount = Intl.NumberFormat('en-US').format(integerAmount);
-    const decimalStrWithoutRounding = (_a = amount.toString().split('.')[1]) === null || _a === void 0 ? void 0 : _a.slice(0, decimalPlaces);
-    const fullAmount = buildFormattedAmount(formattedIntegerAmount, decimalStrWithoutRounding);
-    const raw = getRawAmount(integerAmount, decimalStr, isNegative);
+export function formatAmount(amount, decimal = 2) {
+    const num = parseFloat(amount.toString());
+    if (isNaN(num)) {
+        const [integerAmount, decimalAmount] = (0).toFixed(decimal).split('.');
+        const fullAmount = `${integerAmount}.${decimalAmount}`;
+        return {
+            integerAmount,
+            decimalAmount,
+            fullAmount,
+        };
+    }
+    const fixedNumber = num.toFixed(decimal);
+    const [integerPart, decimalPart] = fixedNumber.split('.');
+    const formattedInteger = parseInt(integerPart).toLocaleString();
     return {
-        integerAmount: formattedIntegerAmount,
-        decimalAmount: decimalStr,
-        fullAmount,
-        raw,
+        integerAmount: formattedInteger,
+        decimalAmount: decimalPart,
+        fullAmount: `${formattedInteger}.${decimalPart}`,
     };
 }
 export function formatAmountWithCurrency(amount = 0, currency = '') {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tap-payments/os-micro-frontend-shared",
   "description": "Shared components and utilities for Tap Payments micro frontends",
-  "version": "0.0.152",
+  "version": "0.0.155-jsonviewer-fix-v2",
   "type": "module",
   "main": "build/index.js",
   "module": "build/index.js",