added new function to redirect to order details page, changed logic f…

…or handling completed order notifications
binary-com · Sep 21, 2022 · 40a5f26 · 40a5f26
1 parent 6f76f3e
commit 40a5f26
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 9 deletions.
diff --git a/packages/core/src/Stores/notification-store.js b/packages/core/src/Stores/notification-store.js
@@ -47,6 +47,12 @@ export default class NotificationStore extends BaseStore {
                 this.filterNotificationMessages();
             }
         );
+        reaction(
+            () => this.p2p_order_props,
+            () => {
+                this.refreshNotifications();
+            }
+        );
         reaction(
             () => [
                 root_store.client.account_settings,
@@ -431,23 +437,39 @@ export default class NotificationStore extends BaseStore {
         }
     }
 
+    @action.bound
     showCompletedOrderNotification(advertiser_name, order_id) {
         const notification_key = `order-${order_id}`;
 
+        const notification_action =
+            routes.cashier_p2p === window.location.pathname
+                ? {
+                      onClick: () => {
+                          this.p2p_order_props.redirectToOrderDetails(order_id);
+                          this.setP2POrderProps({
+                              ...this.p2p_order_props,
+                              order_id,
+                          });
+                          if (this.is_notifications_visible) this.toggleNotificationsModal();
+                      },
+                      text: localize('Give feedback C'),
+                  }
+                : {
+                      route: `${routes.cashier_p2p}?order=${order_id}`,
+                      text: localize('Give feedback R'),
+                  };
+
         this.addNotificationMessage({
             action:
                 this.p2p_order_props?.order_id === order_id
                     ? {
                           onClick: () => {
                               this.p2p_order_props.setIsRatingModalOpen(true);
-                              this.toggleNotificationsModal();
+                              if (this.is_notifications_visible) this.toggleNotificationsModal();
                           },
-                          text: localize('Give feedback'),
+                          text: localize('Give feedback SAME'),
                       }
-                    : {
-                          route: `${routes.cashier_p2p}?order=${order_id}`,
-                          text: localize('Give feedback'),
-                      },
+                    : notification_action,
             header: <Localize i18n_default_text='Your order {{order_id}} is complete' values={{ order_id }} />,
             key: notification_key,
             message: (

diff --git a/packages/p2p/src/components/app.jsx b/packages/p2p/src/components/app.jsx
@@ -66,6 +66,17 @@ const App = props => {
         if (order_id) {
             general_store.redirectTo('orders');
             order_store.setOrderId(order_id);
+            general_store.props.setP2POrderProps({
+                order_id: order_store.order_id,
+                redirectToOrderDetails: general_store.redirectToOrderDetails,
+                setIsRatingModalOpen: order_store.setIsRatingModalOpen,
+            });
+        } else {
+            general_store.props.setP2POrderProps({
+                order_id,
+                redirectToOrderDetails: general_store.redirectToOrderDetails,
+                setIsRatingModalOpen: order_store.setIsRatingModalOpen,
+            });
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [order_id]);

diff --git a/packages/p2p/src/components/order-details/order-details.jsx b/packages/p2p/src/components/order-details/order-details.jsx
@@ -82,6 +82,7 @@ const OrderDetails = observer(() => {
         order_store.setIsRecommended(undefined);
         general_store.props.setP2POrderProps({
             order_id: order_store.order_id,
+            redirectToOrderDetails: general_store.redirectToOrderDetails,
             setIsRatingModalOpen: order_store.setIsRatingModalOpen,
         });
 
@@ -96,6 +97,11 @@ const OrderDetails = observer(() => {
             disposeReactions();
             order_store.setOrderPaymentMethodDetails(undefined);
             order_store.setOrderId(null);
+            general_store.props.setP2POrderProps({
+                order_id: order_store.order_id,
+                redirectToOrderDetails: general_store.redirectToOrderDetails,
+                setIsRatingModalOpen: order_store.setIsRatingModalOpen,
+            });
         };
     }, []); // eslint-disable-line react-hooks/exhaustive-deps
 

diff --git a/packages/p2p/src/stores/general-store.js b/packages/p2p/src/stores/general-store.js
@@ -201,6 +201,14 @@ export default class GeneralStore extends BaseStore {
         this.updateP2pNotifications(notifications);
     }
 
+    @action.bound
+    redirectToOrderDetails(order_id) {
+        const { order_store } = this.root_store;
+        this.redirectTo('orders');
+        this.setOrderTableType(order_list.INACTIVE);
+        order_store.setOrderId(order_id);
+    }
+
     @action.bound
     showCompletedOrderNotification(advertiser_name, order_id) {
         const { order_store } = this.root_store;
@@ -212,9 +220,7 @@ export default class GeneralStore extends BaseStore {
                     if (order_store.order_id === order_id) {
                         order_store.setIsRatingModalOpen(true);
                     }
-                    this.redirectTo('orders');
-                    this.setOrderTableType(order_list.INACTIVE);
-                    order_store.setOrderId(order_id);
+                    this.redirectToOrderDetails(order_id);
                 },
                 text: localize('Give feedback'),
             },