Merge pull request #37 from oxygenpay/develop

fix(merchants): fix merchant screen

Author: swift1337

ui-dashboard/index.html

@@ -7,8 +7,7 @@
     <link rel="icon" type="image/png" sizes="32x32" href="/fav/favicon-32x32.png" />
     <link rel="icon" type="image/png" sizes="16x16" href="/fav/favicon-16x16.png" />
     <link rel="manifest" href="/fav/site.webmanifest" />
-    <link rel="mask-icon" href="/fav/safari-pinned-tab.svg" color="#5bbad5" />
-    <meta name="msapplication-TileColor" content="#333333" />
+    <link rel="mask-icon" href="/fav/safari-pinned-tab.svg" color="#50AF95" />
     <meta name="theme-color" content="#333333" />
     <title>O2Pay</title>
   </head>

ui-dashboard/src/app.tsx

@@ -156,20 +156,16 @@ const App: React.FC = () => {
         };
 
         const listMerchant = async () => {
-            if (!user) {
-                return;
+            if (user && newMerchantId) {
+                await getMerchant(newMerchantId);
             }
-
-            if (!newMerchantId) return;
-
-            await getMerchant(newMerchantId);
-            setIsLoading(false);
         };
 
         await getCookie();
         await getMe();
         await listMerchants();
         await listMerchant();
+        setIsLoading(false);
     };
 
     useMount(async () => {

ui-dashboard/src/hooks/use-merchant-id.ts

@@ -14,6 +14,8 @@ const useMerchantId = (): MerchantIdState => {
         setMerchantId(merchantId);
         if (merchantId) {
             localStorage.set("merchantId", merchantId);
+        } else {
+            localStorage.remove("merchantId");
         }
     };
 

ui-dashboard/src/pages/manage-merchants-page/manage-merchants-page.tsx

@@ -85,10 +85,7 @@ const ManageMerchantsPage: React.FC = () => {
             await getMerchants();
 
             const nextMerchant = merchants?.find((merchantItem) => merchantItem.id !== merchant.id);
-
-            if (nextMerchant) {
-                setMerchantId(nextMerchant.id);
-            }
+            setMerchantId(nextMerchant ? nextMerchant.id : null);
 
             openNotification(`Merchant ${merchant.name} has been deleted`, "Thank you for being with us");
         } catch (error) {

ui-payment/index.html

@@ -7,8 +7,7 @@
         <link rel="icon" type="image/png" sizes="32x32" href="/fav/favicon-32x32.png" />
         <link rel="icon" type="image/png" sizes="16x16" href="/fav/favicon-16x16.png" />
         <link rel="manifest" href="/fav/site.webmanifest" />
-        <link rel="mask-icon" href="/fav/safari-pinned-tab.svg" color="#4faf95" />
-        <meta name="msapplication-TileColor" content="#4faf95" />
+        <link rel="mask-icon" href="/fav/safari-pinned-tab.svg" color="#50AF95" />
         <meta name="theme-color" content="#4faf95" />
         <title>OxygenPay</title>
     </head>