Merge pull request #4093 from beckn/develop-1.1.0

Develop 1.1.0

Author: aniketceminds

apps/OSC/locales/en.ts

@@ -171,7 +171,8 @@ const en: { [key: string]: string } = {
   merchantTakingTo: 'Merchant is taking too long',
   orderMistake: 'Ordered by mistake',
   iHaveChange: 'I’ve changed my mind',
-  unabletoTrack: 'Unable to get the track url',
+  unabletoTrack: 'Tracking details are unavailable. Please try again later or contact support.',
+
   cancelOrder: 'Cancel Order',
   callCustomer: 'Call Customer Service',
   emailCustomer: 'Email Customer Service',

apps/OSC/pages/orderDetails.tsx

@@ -200,13 +200,13 @@ const OrderDetails = () => {
       image: '/images/trackOrder.svg',
       text: t.trackOrder,
       onClick: () => {
-        if (trackingUrl) window.open(trackingUrl, '_blank')
-        else
-          dispatch(
-            feedbackActions.setToastData({
-              toastData: { message: t.error, display: true, type: 'error', description: t.unabletoTrack }
-            })
-          )
+        // if (trackingUrl) window.open(trackingUrl, '_blank')
+        // else
+        dispatch(
+          feedbackActions.setToastData({
+            toastData: { message: 'Warning', display: true, type: 'warning', description: t.unabletoTrack }
+          })
+        )
       }
     },
     {