From 17b8fc9f1abe11367373f1a1b246e90c6ee70940 Mon Sep 17 00:00:00 2001
From: Callum McIntyre <callum.mcintyre@solana.com>
Date: Fri, 21 Apr 2023 10:21:07 +0000
Subject: [PATCH 1/2] Change disconnect button disable logic

Instead of using wallet use connected, which also works for MWA
---
 packages/ui/ant-design/src/WalletDisconnectButton.tsx  | 4 ++--
 packages/ui/material-ui/src/WalletDisconnectButton.tsx | 4 ++--
 packages/ui/react-ui/src/WalletDisconnectButton.tsx    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/ui/ant-design/src/WalletDisconnectButton.tsx b/packages/ui/ant-design/src/WalletDisconnectButton.tsx
index c372a0fb1..c54ba7363 100644
--- a/packages/ui/ant-design/src/WalletDisconnectButton.tsx
+++ b/packages/ui/ant-design/src/WalletDisconnectButton.tsx
@@ -14,7 +14,7 @@ export const WalletDisconnectButton: FC<ButtonProps> = ({
     onClick,
     ...props
 }) => {
-    const { wallet, disconnect, disconnecting } = useWallet();
+    const { wallet, connected, disconnect, disconnecting } = useWallet();
 
     const handleClick: MouseEventHandler<HTMLButtonElement> = useCallback(
         (event) => {
@@ -38,7 +38,7 @@ export const WalletDisconnectButton: FC<ButtonProps> = ({
     return (
         <Button
             onClick={handleClick}
-            disabled={disabled || !wallet}
+            disabled={disabled || !connected}
             icon={<WalletIcon wallet={wallet} />}
             type={type}
             size={size}
diff --git a/packages/ui/material-ui/src/WalletDisconnectButton.tsx b/packages/ui/material-ui/src/WalletDisconnectButton.tsx
index 32bee627e..49986e732 100644
--- a/packages/ui/material-ui/src/WalletDisconnectButton.tsx
+++ b/packages/ui/material-ui/src/WalletDisconnectButton.tsx
@@ -14,7 +14,7 @@ export const WalletDisconnectButton: FC<ButtonProps> = ({
     onClick,
     ...props
 }) => {
-    const { wallet, disconnect, disconnecting } = useWallet();
+    const { wallet, connected, disconnect, disconnecting } = useWallet();
 
     const handleClick: MouseEventHandler<HTMLButtonElement> = useCallback(
         (event) => {
@@ -41,7 +41,7 @@ export const WalletDisconnectButton: FC<ButtonProps> = ({
             variant={variant}
             type={type}
             onClick={handleClick}
-            disabled={disabled || !wallet}
+            disabled={disabled || !connected}
             startIcon={<WalletIcon wallet={wallet} />}
             {...props}
         >
diff --git a/packages/ui/react-ui/src/WalletDisconnectButton.tsx b/packages/ui/react-ui/src/WalletDisconnectButton.tsx
index 909f68234..d3c0124b2 100644
--- a/packages/ui/react-ui/src/WalletDisconnectButton.tsx
+++ b/packages/ui/react-ui/src/WalletDisconnectButton.tsx
@@ -6,7 +6,7 @@ import { Button } from './Button.js';
 import { WalletIcon } from './WalletIcon.js';
 
 export const WalletDisconnectButton: FC<ButtonProps> = ({ children, disabled, onClick, ...props }) => {
-    const { wallet, disconnect, disconnecting } = useWallet();
+    const { wallet, connected, disconnect, disconnecting } = useWallet();
 
     const handleClick: MouseEventHandler<HTMLButtonElement> = useCallback(
         (event) => {
@@ -27,7 +27,7 @@ export const WalletDisconnectButton: FC<ButtonProps> = ({ children, disabled, on
     return (
         <Button
             className="wallet-adapter-button-trigger"
-            disabled={disabled || !wallet}
+            disabled={disabled || !connected}
             startIcon={wallet ? <WalletIcon wallet={wallet} /> : undefined}
             onClick={handleClick}
             {...props}

From 87922af225be843994f0b6b70dc7222b4380a3dd Mon Sep 17 00:00:00 2001
From: Callum McIntyre <callum.mcintyre@solana.com>
Date: Fri, 21 Apr 2023 10:28:31 +0000
Subject: [PATCH 2/2] Add changeset

---
 .changeset/dull-countries-carry.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changeset/dull-countries-carry.md

diff --git a/.changeset/dull-countries-carry.md b/.changeset/dull-countries-carry.md
new file mode 100644
index 000000000..8d6e33db2
--- /dev/null
+++ b/.changeset/dull-countries-carry.md
@@ -0,0 +1,7 @@
+---
+'@solana/wallet-adapter-material-ui': patch
+'@solana/wallet-adapter-ant-design': patch
+'@solana/wallet-adapter-react-ui': patch
+---
+
+Fix disconnect button disable for MWA