fix: when exporting in another ccy then received, table still showed …

…received ledger ccy
radynamics · Aug 17, 2022 · 682a415 · 682a415
1 parent 0d33e01
commit 682a415
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/com/radynamics/CryptoIso20022Interop/ui/paymentTable/PaymentTableModel.java b/src/main/java/com/radynamics/CryptoIso20022Interop/ui/paymentTable/PaymentTableModel.java
@@ -85,7 +85,7 @@ public Object getValueAt(int row, int col) {
         } else if (getColumnIndex(COL_AMOUNT) == col) {
             return item.getAmount(actor);
         } else if (getColumnIndex(COL_CCY) == col) {
-            return item.getCcy(actor);
+            return item.getCcy();
         } else if (getColumnIndex(COL_TRX_STATUS) == col) {
             return item.payment.getTransmission();
         } else if (getColumnIndex(COL_DETAIL) == col) {

diff --git a/src/main/java/com/radynamics/CryptoIso20022Interop/ui/paymentTable/Record.java b/src/main/java/com/radynamics/CryptoIso20022Interop/ui/paymentTable/Record.java
@@ -64,8 +64,11 @@ public void setAmount(Double value) {
         amount = value;
     }
 
-    public Object getCcy(Actor actor) {
-        return actor == Actor.Sender ? payment.getFiatCcy() : payment.getLedgerCcy();
+    public Object getCcy() {
+        // When exporting 'As received" return received ccy instance to let user know more about issuer.
+        return payment.getLedgerCcy().getCcy().equals(payment.getFiatCcy())
+                ? payment.getLedgerCcy()
+                : payment.getFiatCcy();
     }
 
     @Override