From 2a709a517050198be387c6029b73e0e047867f82 Mon Sep 17 00:00:00 2001
From: cliffoo <41348973+cliffoo@users.noreply.github.com>
Date: Mon, 5 Jun 2023 17:41:56 -0400
Subject: [PATCH 1/2] dashboard: Notify if no connected Frame account

---
 .../Sidebar/Bottom/MenuButton/index.tsx       | 20 ++++++++++++++++++-
 .../src/utils/notifications/frame-wallet.tsx  | 14 +++++++++++++
 .../src/utils/notifications/index.ts          |  1 +
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 packages/dashboard/src/utils/notifications/frame-wallet.tsx

diff --git a/packages/dashboard/src/components/composed/Sidebar/Bottom/MenuButton/index.tsx b/packages/dashboard/src/components/composed/Sidebar/Bottom/MenuButton/index.tsx
index 244451f9bad..341f4284916 100644
--- a/packages/dashboard/src/components/composed/Sidebar/Bottom/MenuButton/index.tsx
+++ b/packages/dashboard/src/components/composed/Sidebar/Bottom/MenuButton/index.tsx
@@ -1,9 +1,14 @@
 import { Menu, Text, useMantineColorScheme, createStyles } from "@mantine/core";
+import { showNotification, hideNotification } from "@mantine/notifications";
 import { useAccount, useConnect, useDisconnect } from "wagmi";
 import { InjectedConnector } from "@wagmi/core";
 import { Slash } from "react-feather";
 import { useDash } from "src/hooks";
 import Button from "src/components/composed/Sidebar/Bottom/MenuButton/Button";
+import {
+  frameWalletNotifications,
+  frameWalletNotificationId
+} from "src/utils/notifications";
 
 const useStyles = createStyles((theme, _params, _getRef) => {
   const { colors, colorScheme, fn } = theme;
@@ -33,7 +38,20 @@ function MenuButton(): JSX.Element {
   const { classes } = useStyles();
 
   if (!isConnected) {
-    return <Button onClick={() => void connect()} />;
+    return (
+      <Button
+        onClick={async () => {
+          try {
+            await window.ethereum?.request({ method: "eth_requestAccounts" });
+            hideNotification(frameWalletNotificationId);
+          } catch (err) {
+            if (/^No Frame account selected$/i.test((err as any)?.message))
+              showNotification(frameWalletNotifications["no-account"]);
+          }
+          connect();
+        }}
+      />
+    );
   } else {
     return (
       <Menu
diff --git a/packages/dashboard/src/utils/notifications/frame-wallet.tsx b/packages/dashboard/src/utils/notifications/frame-wallet.tsx
new file mode 100644
index 00000000000..6da1f10f922
--- /dev/null
+++ b/packages/dashboard/src/utils/notifications/frame-wallet.tsx
@@ -0,0 +1,14 @@
+import type { NotificationProps } from "@mantine/notifications";
+
+export const frameWalletNotificationId = "frame-wallet";
+
+export const frameWalletNotifications: Record<"no-account", NotificationProps> =
+  {
+    "no-account": {
+      id: frameWalletNotificationId,
+      autoClose: false,
+      color: "yellow",
+      title: "Frame wallet not ready",
+      message: "Connect a Frame account to continue"
+    }
+  };
diff --git a/packages/dashboard/src/utils/notifications/index.ts b/packages/dashboard/src/utils/notifications/index.ts
index e09de4bc371..531b9d912ae 100644
--- a/packages/dashboard/src/utils/notifications/index.ts
+++ b/packages/dashboard/src/utils/notifications/index.ts
@@ -1,2 +1,3 @@
 export * from "src/utils/notifications/decode";
 export * from "src/utils/notifications/analytics";
+export * from "src/utils/notifications/frame-wallet";

From a17585676206e5a72436ce4c08ae3165ecf8b620 Mon Sep 17 00:00:00 2001
From: cliffoo <41348973+cliffoo@users.noreply.github.com>
Date: Tue, 6 Jun 2023 10:12:20 -0400
Subject: [PATCH 2/2] dashboard: Handle more wallet connection cases

---
 .../Sidebar/Bottom/MenuButton/index.tsx       | 18 +++++++---
 .../src/utils/notifications/frame-wallet.tsx  | 14 --------
 .../src/utils/notifications/index.ts          |  2 +-
 .../utils/notifications/wallet-connection.tsx | 33 +++++++++++++++++++
 4 files changed, 47 insertions(+), 20 deletions(-)
 delete mode 100644 packages/dashboard/src/utils/notifications/frame-wallet.tsx
 create mode 100644 packages/dashboard/src/utils/notifications/wallet-connection.tsx

diff --git a/packages/dashboard/src/components/composed/Sidebar/Bottom/MenuButton/index.tsx b/packages/dashboard/src/components/composed/Sidebar/Bottom/MenuButton/index.tsx
index 341f4284916..3a1af7ad06a 100644
--- a/packages/dashboard/src/components/composed/Sidebar/Bottom/MenuButton/index.tsx
+++ b/packages/dashboard/src/components/composed/Sidebar/Bottom/MenuButton/index.tsx
@@ -6,8 +6,8 @@ import { Slash } from "react-feather";
 import { useDash } from "src/hooks";
 import Button from "src/components/composed/Sidebar/Bottom/MenuButton/Button";
 import {
-  frameWalletNotifications,
-  frameWalletNotificationId
+  walletConnectionNotifications,
+  walletConnectionNotificationId
 } from "src/utils/notifications";
 
 const useStyles = createStyles((theme, _params, _getRef) => {
@@ -43,10 +43,18 @@ function MenuButton(): JSX.Element {
         onClick={async () => {
           try {
             await window.ethereum?.request({ method: "eth_requestAccounts" });
-            hideNotification(frameWalletNotificationId);
+            hideNotification(walletConnectionNotificationId);
           } catch (err) {
-            if (/^No Frame account selected$/i.test((err as any)?.message))
-              showNotification(frameWalletNotifications["no-account"]);
+            const { message } = (err as any) || {};
+            showNotification(
+              /^No Frame account selected$/i.test(message)
+                ? walletConnectionNotifications["no-frame-account"]()
+                : /^Permission denied, approve .* in Frame to continue$/i.test(
+                    message
+                  )
+                ? walletConnectionNotifications["no-frame-permission"]()
+                : walletConnectionNotifications["general"](message)
+            );
           }
           connect();
         }}
diff --git a/packages/dashboard/src/utils/notifications/frame-wallet.tsx b/packages/dashboard/src/utils/notifications/frame-wallet.tsx
deleted file mode 100644
index 6da1f10f922..00000000000
--- a/packages/dashboard/src/utils/notifications/frame-wallet.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import type { NotificationProps } from "@mantine/notifications";
-
-export const frameWalletNotificationId = "frame-wallet";
-
-export const frameWalletNotifications: Record<"no-account", NotificationProps> =
-  {
-    "no-account": {
-      id: frameWalletNotificationId,
-      autoClose: false,
-      color: "yellow",
-      title: "Frame wallet not ready",
-      message: "Connect a Frame account to continue"
-    }
-  };
diff --git a/packages/dashboard/src/utils/notifications/index.ts b/packages/dashboard/src/utils/notifications/index.ts
index 531b9d912ae..22f7dcb06d5 100644
--- a/packages/dashboard/src/utils/notifications/index.ts
+++ b/packages/dashboard/src/utils/notifications/index.ts
@@ -1,3 +1,3 @@
 export * from "src/utils/notifications/decode";
 export * from "src/utils/notifications/analytics";
-export * from "src/utils/notifications/frame-wallet";
+export * from "src/utils/notifications/wallet-connection";
diff --git a/packages/dashboard/src/utils/notifications/wallet-connection.tsx b/packages/dashboard/src/utils/notifications/wallet-connection.tsx
new file mode 100644
index 00000000000..43279c3aaad
--- /dev/null
+++ b/packages/dashboard/src/utils/notifications/wallet-connection.tsx
@@ -0,0 +1,33 @@
+import { Text, Code } from "@mantine/core";
+import type { NotificationProps } from "@mantine/notifications";
+
+export const walletConnectionNotificationId = "wallet-connection";
+
+const baseNotification = {
+  id: walletConnectionNotificationId,
+  autoClose: false,
+  color: "yellow"
+};
+
+export const walletConnectionNotifications = {
+  "no-frame-account": () => ({
+    ...baseNotification,
+    title: "Frame wallet not ready",
+    message: "Connect a Frame account to continue"
+  }),
+  "no-frame-permission": () => ({
+    ...baseNotification,
+    title: "Connection denied",
+    message: (
+      <Text>
+        Allow connection to {window.location.host}, under
+        <Code>DAPPS</Code> in your active Frame account
+      </Text>
+    )
+  }),
+  "general": (message: string) => ({
+    ...baseNotification,
+    title: "Cannot connect to wallet",
+    message
+  })
+} satisfies Record<string, (message: string) => NotificationProps>;