Merge pull request #1967 from kaloudis/pos-order-unit-vs-total-displa…

…y-value POS: Order: clearly display per unit + total values
ZeusLN · Feb 2, 2024 · 5c6b75f · 5c6b75f
2 parents 256f0b2 + 9c8257c
commit 5c6b75f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/components/KeyValue.tsx b/components/KeyValue.tsx
@@ -119,7 +119,7 @@ export default class KeyValue extends React.Component<KeyValueProps, {}> {
 const styles = StyleSheet.create({
     key: {
         paddingRight: 35,
-        maxWidth: '50%'
+        maxWidth: '70%'
     },
     value: {
         flex: 1,
@@ -135,7 +135,6 @@ const styles = StyleSheet.create({
         justifyContent: 'flex-end'
     },
     rtlValue: {
-        paddingRight: 10,
-        maxWidth: '50%'
+        paddingRight: 10
     }
 });
diff --git a/views/Order.tsx b/views/Order.tsx
@@ -331,35 +331,43 @@ export default class OrderView extends React.Component<OrderProps, OrderState> {
                     keyboardShouldPersistTaps="handled"
                 >
                     {lineItems.map((item: any, index: number) => {
-                        const keyValue =
-                            item.quantity > 1
-                                ? `${item.name} (x${item.quantity})`
-                                : item.name;
-
                         const fiatPriced = item.base_price_money.amount > 0;
 
                         const unitPrice = fiatPriced
                             ? item.base_price_money.amount
                             : item.base_price_money.sats;
 
-                        let displayValue;
+                        let unitDisplayValue, totalDisplayValue;
                         if (fiatPriced) {
-                            displayValue = UnitsStore.getFormattedAmount(
+                            unitDisplayValue = UnitsStore.getFormattedAmount(
                                 unitPrice,
                                 'fiat'
                             );
+                            totalDisplayValue = UnitsStore.getFormattedAmount(
+                                unitPrice * item.quantity,
+                                'fiat'
+                            );
                         } else {
-                            displayValue = UnitsStore.getFormattedAmount(
+                            unitDisplayValue = UnitsStore.getFormattedAmount(
                                 unitPrice,
                                 'sats'
                             );
+                            totalDisplayValue = UnitsStore.getFormattedAmount(
+                                unitPrice * item.quantity,
+                                'sats'
+                            );
                         }
 
+                        const keyValue =
+                            item.quantity > 1
+                                ? `${item.name} (x${item.quantity} @ ${unitDisplayValue})`
+                                : item.name;
+
                         return (
                             <KeyValue
                                 key={index}
                                 keyValue={keyValue}
-                                value={displayValue}
+                                value={totalDisplayValue}
                             />
                         );
                     })}