fixed loading of payment details (binary-com#6847)

adrienne-deriv · Nov 17, 2022 · 6b35025 · 6b35025
1 parent a6faeb2
commit 6b35025
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/packages/p2p/src/components/order-details/order-details.jsx b/packages/p2p/src/components/order-details/order-details.jsx
@@ -93,6 +93,7 @@ const OrderDetails = observer(() => {
             disposeReactions();
             order_store.setOrderPaymentMethodDetails(undefined);
             order_store.setOrderId(null);
+            order_store.setActiveOrder(null);
             general_store.props.setP2POrderProps({
                 order_id: order_store.order_id,
                 redirectToOrderDetails: general_store.redirectToOrderDetails,

diff --git a/packages/p2p/src/components/orders/order-table/order-table-row.jsx b/packages/p2p/src/components/orders/order-table/order-table-row.jsx
@@ -75,7 +75,7 @@ const OrderRow = ({ style, row: order }) => {
 
     const onRowClick = () => {
         if (should_show_order_details.current) {
-            return order_store.setQueryDetails(order);
+            return order_store.setOrderId(order.id);
         }
 
         return () => {};

diff --git a/packages/p2p/src/stores/order-store.js b/packages/p2p/src/stores/order-store.js
@@ -8,6 +8,7 @@ import { api_error_codes } from '../constants/api-error-codes';
 export default class OrderStore {
     constructor(root_store) {
         makeObservable(this, {
+            active_order: observable,
             api_error_message: observable,
             cancellation_block_duration: observable,
             cancellation_count_period: observable,
@@ -47,6 +48,7 @@ export default class OrderStore {
             onOrdersUpdate: action.bound,
             onPageReturn: action.bound,
             onUnmount: action.bound,
+            setActiveOrder: action.bound,
             setForceRerenderOrders: action.bound,
             setApiErrorMessage: action.bound,
             setCancellationBlockDuration: action.bound,
@@ -91,6 +93,7 @@ export default class OrderStore {
         );
     }
 
+    active_order = null;
     api_error_message = '';
     cancellation_block_duration = 0;
     cancellation_count_period = 0;
@@ -124,11 +127,7 @@ export default class OrderStore {
     }
 
     get order_information() {
-        const { general_store } = this.root_store;
-        const order = this.orders.find(o => o.id === this.order_id);
-        return order
-            ? createExtendedOrderDetails(order, general_store.client.loginid, general_store.props.server_time)
-            : null;
+        return this.active_order;
     }
 
     get nav() {
@@ -255,6 +254,7 @@ export default class OrderStore {
             this.root_store.general_store.redirectTo(this.nav.location);
         }
         this.setOrderId(null);
+        this.setActiveOrder(null);
     }
 
     loadMoreOrders({ startIndex }) {
@@ -370,6 +370,10 @@ export default class OrderStore {
         });
     }
 
+    setActiveOrder(active_order) {
+        this.active_order = active_order;
+    }
+
     setQueryDetails(input_order) {
         const { general_store } = this.root_store;
         const order_information = createExtendedOrderDetails(
@@ -386,6 +390,9 @@ export default class OrderStore {
         if (order_information?.payment_method_details) {
             this.setOrderPaymentMethodDetails(Object.values(order_information?.payment_method_details));
         }
+
+        this.setActiveOrder(order_information);
+
         // When viewing specific order, update its read state in localStorage.
         const { notifications } = this.root_store.general_store.getLocalStorageSettingsForLoginId();