feat: handle no notification settings found / fix ybx updates checkbox

mrgnlabs · Mar 7, 2024 · 276b605 · 276b605
1 parent 5ba77eb
commit 276b605
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/apps/marginfi-v2-ui/src/components/common/Wallet/WalletSettings.tsx b/apps/marginfi-v2-ui/src/components/common/Wallet/WalletSettings.tsx
@@ -107,7 +107,7 @@ export const WalletSettings = ({ walletAddress, tokens }: WalletSettingsProps) =
 
     if (!res.ok) {
       // document not found which means notifications have not been set
-      const { success } = await res.json();
+      const { success, message } = await res.json();
       if (success) {
         return;
       }
@@ -121,13 +121,13 @@ export const WalletSettings = ({ walletAddress, tokens }: WalletSettingsProps) =
     setEmail(data.email);
     setNotificationSettings({
       health: data.account_health,
-      ybx: data.product_updates,
+      ybx: data.ybx_updates,
     });
   }, [walletAddress]);
 
   React.useEffect(() => {
     fetchUsersNotificationSettings();
-  }, []);
+  }, [fetchUsersNotificationSettings]);
 
   return (
     <Accordion type="single" collapsible className="w-full space-y-4 mb-6">

diff --git a/apps/marginfi-v2-ui/src/pages/api/user/notifications.ts b/apps/marginfi-v2-ui/src/pages/api/user/notifications.ts
@@ -61,6 +61,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
         const data = await response.json();
         return res.status(200).json({ success: true, data });
       } else {
+        if (response.status === 404) {
+          return res.status(200).json({ success: true, data: {} });
+        }
+
         const errorData = await response.json();
         console.error("Error fetching notifications settings via API:", errorData);
         return res