From 09f2f2761fd5ce0c080091a8e992ae254408d55b Mon Sep 17 00:00:00 2001
From: Varun <varunv5000@gmail.com>
Date: Thu, 27 Jan 2022 12:45:21 -0500
Subject: [PATCH 1/8] increased size of connect wallet button

---
 packages/react-app/src/components/Account/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-app/src/components/Account/index.jsx b/packages/react-app/src/components/Account/index.jsx
index 7d298118..7c568cab 100644
--- a/packages/react-app/src/components/Account/index.jsx
+++ b/packages/react-app/src/components/Account/index.jsx
@@ -105,7 +105,7 @@ export default function Account({
         <Button
           key="loginbutton"
           style={{ verticalAlign: "top", marginLeft: 8, marginTop: 4, width: width }}
-          size="medium"
+          size="large"
           onClick={loadWeb3Modal}
           key="second"
           type="primary"

From e9c26f640690d3d57e59529cd360a7990efb1c4a Mon Sep 17 00:00:00 2001
From: Varun <varunv5000@gmail.com>
Date: Thu, 27 Jan 2022 14:00:19 -0500
Subject: [PATCH 2/8] Connect Wallet Button added to GuestRoom & HostRoom

---
 packages/react-app/src/App.jsx             |  1 +
 packages/react-app/src/views/GuestRoom.jsx | 14 ++++++++++++++
 packages/react-app/src/views/HostRoom.jsx  | 15 +++++++++++++++
 packages/react-app/src/views/Rooms.jsx     |  6 ++++++
 4 files changed, 36 insertions(+)

diff --git a/packages/react-app/src/App.jsx b/packages/react-app/src/App.jsx
index b4345152..ddad959a 100644
--- a/packages/react-app/src/App.jsx
+++ b/packages/react-app/src/App.jsx
@@ -621,6 +621,7 @@ function App(props) {
                   nativeCurrency={targetNetwork.nativeCurrency}
                   isHost={isHost}
                   isWalletConnected={isWalletConnected}
+                  loadWeb3Modal={loadWeb3Modal}
                 />
               </Route>
               {/* This is used when testing out smart contracts:
diff --git a/packages/react-app/src/views/GuestRoom.jsx b/packages/react-app/src/views/GuestRoom.jsx
index f00ba7af..a7c3eeb7 100644
--- a/packages/react-app/src/views/GuestRoom.jsx
+++ b/packages/react-app/src/views/GuestRoom.jsx
@@ -26,6 +26,8 @@ export default function GuestRoom({
   selectedChainId,
   tx,
   nativeCurrency,
+  isWalletConnected,
+  loadWeb3Modal,
 }) {
   const { room } = useParams();
 
@@ -168,6 +170,18 @@ export default function GuestRoom({
 
   return (
     <div className="bg-purple-darkpurple">
+      {!isWalletConnected && (
+        <Button 
+          style={{ height: "50px", fontSize: "20px", marginBottom: "40px" }}
+          key="loginbutton"
+          size="large"
+          onClick={loadWeb3Modal}
+          type="primary"
+          shape="round"
+        >
+          Connect Wallet to Sign In!
+        </Button>
+      )}
       <h2 id="title">Welcome to the Tip Party!</h2>
       <div
         className="Room"
diff --git a/packages/react-app/src/views/HostRoom.jsx b/packages/react-app/src/views/HostRoom.jsx
index 705fe97c..54e49ad8 100644
--- a/packages/react-app/src/views/HostRoom.jsx
+++ b/packages/react-app/src/views/HostRoom.jsx
@@ -26,6 +26,8 @@ export default function HostRoom({
   selectedChainId,
   tx,
   nativeCurrency,
+  isWalletConnected,
+  loadWeb3Modal
 }) {
   const { room } = useParams();
 
@@ -327,11 +329,24 @@ export default function HostRoom({
 
   return (
     <div className="bg-purple-darkpurple">
+            {! isWalletConnected &&
+        <Button
+          style={{height: "50px" , fontSize: "20px", marginBottom: "40px"}}
+          key="loginbutton"
+          size="large"
+          onClick={loadWeb3Modal}
+          type="primary"
+          shape="round"
+        >
+          Connect Wallet to Tip!
+        </Button>}
+
       <h2 id="title">Tip Your Party!</h2>
       <h3>
         {" "}
         You are the <b>Host</b> for "<b>{room}</b>" room{" "}
       </h3>
+
       <div
         className="Room"
         style={{
diff --git a/packages/react-app/src/views/Rooms.jsx b/packages/react-app/src/views/Rooms.jsx
index 25b83664..e26ca6f3 100644
--- a/packages/react-app/src/views/Rooms.jsx
+++ b/packages/react-app/src/views/Rooms.jsx
@@ -16,6 +16,8 @@ export default function Rooms({
   tx,
   nativeCurrency,
   isHost,
+  isWalletConnected,
+  loadWeb3Modal,
 }) {
   return (
     <div>
@@ -35,6 +37,8 @@ export default function Rooms({
             selectedChainId={selectedChainId}
             tx={tx}
             nativeCurrency={nativeCurrency}
+            isWalletConnected={isWalletConnected}
+            loadWeb3Modal={loadWeb3Modal}
           />
         )}
       </div>
@@ -54,6 +58,8 @@ export default function Rooms({
             selectedChainId={selectedChainId}
             tx={tx}
             nativeCurrency={nativeCurrency}
+            isWalletConnected={isWalletConnected}
+            loadWeb3Modal={loadWeb3Modal}
           />
         </div>
       )}

From cd9fd5801ec3e57f4a27d766270fe69ad94de243 Mon Sep 17 00:00:00 2001
From: Varun <varunv5000@gmail.com>
Date: Thu, 27 Jan 2022 14:23:51 -0500
Subject: [PATCH 3/8] Removed slight bug with connect button

---
 packages/react-app/src/App.jsx             |  2 --
 packages/react-app/src/views/GuestRoom.jsx |  2 +-
 packages/react-app/src/views/HostRoom.jsx  | 12 ++++++------
 packages/react-app/src/views/Rooms.jsx     |  3 ---
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/packages/react-app/src/App.jsx b/packages/react-app/src/App.jsx
index ddad959a..ab99500f 100644
--- a/packages/react-app/src/App.jsx
+++ b/packages/react-app/src/App.jsx
@@ -600,7 +600,6 @@ function App(props) {
                   address={address}
                   mainnetProvider={mainnetProvider}
                   tx={tx}
-                  isWalletConnected={isWalletConnected}
                   nativeCurrency={targetNetwork.nativeCurrency}
                 />
               </Route>
@@ -620,7 +619,6 @@ function App(props) {
                   tx={tx}
                   nativeCurrency={targetNetwork.nativeCurrency}
                   isHost={isHost}
-                  isWalletConnected={isWalletConnected}
                   loadWeb3Modal={loadWeb3Modal}
                 />
               </Route>
diff --git a/packages/react-app/src/views/GuestRoom.jsx b/packages/react-app/src/views/GuestRoom.jsx
index a7c3eeb7..baca05a4 100644
--- a/packages/react-app/src/views/GuestRoom.jsx
+++ b/packages/react-app/src/views/GuestRoom.jsx
@@ -170,7 +170,7 @@ export default function GuestRoom({
 
   return (
     <div className="bg-purple-darkpurple">
-      {!isWalletConnected && (
+      {!web3Modal && (
         <Button 
           style={{ height: "50px", fontSize: "20px", marginBottom: "40px" }}
           key="loginbutton"
diff --git a/packages/react-app/src/views/HostRoom.jsx b/packages/react-app/src/views/HostRoom.jsx
index 54e49ad8..5e2d8ca5 100644
--- a/packages/react-app/src/views/HostRoom.jsx
+++ b/packages/react-app/src/views/HostRoom.jsx
@@ -26,8 +26,7 @@ export default function HostRoom({
   selectedChainId,
   tx,
   nativeCurrency,
-  isWalletConnected,
-  loadWeb3Modal
+  loadWeb3Modal,
 }) {
   const { room } = useParams();
 
@@ -98,7 +97,7 @@ export default function HostRoom({
     // clean validation for only numbers (including decimal numbers): https://stackoverflow.com/a/43067857
     const re = /^\d*\.?\d*$/;
 
-    if ((e.target.value === "" || re.test(e.target.value))) {
+    if (e.target.value === "" || re.test(e.target.value)) {
       setAmount(e.target.value);
     }
   };
@@ -329,9 +328,9 @@ export default function HostRoom({
 
   return (
     <div className="bg-purple-darkpurple">
-            {! isWalletConnected &&
+      {!web3Modal && (
         <Button
-          style={{height: "50px" , fontSize: "20px", marginBottom: "40px"}}
+          style={{ height: "50px", fontSize: "20px", marginBottom: "40px" }}
           key="loginbutton"
           size="large"
           onClick={loadWeb3Modal}
@@ -339,7 +338,8 @@ export default function HostRoom({
           shape="round"
         >
           Connect Wallet to Tip!
-        </Button>}
+        </Button>
+      )}
 
       <h2 id="title">Tip Your Party!</h2>
       <h3>
diff --git a/packages/react-app/src/views/Rooms.jsx b/packages/react-app/src/views/Rooms.jsx
index e26ca6f3..68a52eb2 100644
--- a/packages/react-app/src/views/Rooms.jsx
+++ b/packages/react-app/src/views/Rooms.jsx
@@ -16,7 +16,6 @@ export default function Rooms({
   tx,
   nativeCurrency,
   isHost,
-  isWalletConnected,
   loadWeb3Modal,
 }) {
   return (
@@ -37,7 +36,6 @@ export default function Rooms({
             selectedChainId={selectedChainId}
             tx={tx}
             nativeCurrency={nativeCurrency}
-            isWalletConnected={isWalletConnected}
             loadWeb3Modal={loadWeb3Modal}
           />
         )}
@@ -58,7 +56,6 @@ export default function Rooms({
             selectedChainId={selectedChainId}
             tx={tx}
             nativeCurrency={nativeCurrency}
-            isWalletConnected={isWalletConnected}
             loadWeb3Modal={loadWeb3Modal}
           />
         </div>

From e3f8362041deeb52735c3edb85352c49f513d0ba Mon Sep 17 00:00:00 2001
From: Varun <varunv5000@gmail.com>
Date: Thu, 27 Jan 2022 15:43:35 -0500
Subject: [PATCH 4/8] fixed bug that wasn't making the button showing

---
 packages/react-app/src/views/GuestRoom.jsx | 2 +-
 packages/react-app/src/views/HostRoom.jsx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-app/src/views/GuestRoom.jsx b/packages/react-app/src/views/GuestRoom.jsx
index baca05a4..2b5b3eaf 100644
--- a/packages/react-app/src/views/GuestRoom.jsx
+++ b/packages/react-app/src/views/GuestRoom.jsx
@@ -170,7 +170,7 @@ export default function GuestRoom({
 
   return (
     <div className="bg-purple-darkpurple">
-      {!web3Modal && (
+      {(!web3Modal || !web3Modal.cachedProvider ) && (
         <Button 
           style={{ height: "50px", fontSize: "20px", marginBottom: "40px" }}
           key="loginbutton"
diff --git a/packages/react-app/src/views/HostRoom.jsx b/packages/react-app/src/views/HostRoom.jsx
index 5e2d8ca5..1b15cbf0 100644
--- a/packages/react-app/src/views/HostRoom.jsx
+++ b/packages/react-app/src/views/HostRoom.jsx
@@ -328,7 +328,7 @@ export default function HostRoom({
 
   return (
     <div className="bg-purple-darkpurple">
-      {!web3Modal && (
+      {(!web3Modal || !web3Modal.cachedProvider )&&(
         <Button
           style={{ height: "50px", fontSize: "20px", marginBottom: "40px" }}
           key="loginbutton"

From c582642dfae65fe1ad960eea0ef0838b267bc7af Mon Sep 17 00:00:00 2001
From: Varun <varunv5000@gmail.com>
Date: Tue, 1 Feb 2022 15:31:56 -0500
Subject: [PATCH 5/8] Made connect wallet stick to the top

---
 packages/react-app/src/components/Account/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-app/src/components/Account/index.jsx b/packages/react-app/src/components/Account/index.jsx
index 7c568cab..81889e9d 100644
--- a/packages/react-app/src/components/Account/index.jsx
+++ b/packages/react-app/src/components/Account/index.jsx
@@ -104,7 +104,7 @@ export default function Account({
       modalButtons.push(
         <Button
           key="loginbutton"
-          style={{ verticalAlign: "top", marginLeft: 8, marginTop: 4, width: width }}
+          style={{ verticalAlign: "top", position: "fixed", top: 20, right: 10, width: width }}
           size="large"
           onClick={loadWeb3Modal}
           key="second"

From b305addf3564dd06ef7dd0486292349a20ed8737 Mon Sep 17 00:00:00 2001
From: Varun <varunv5000@gmail.com>
Date: Tue, 1 Feb 2022 15:39:46 -0500
Subject: [PATCH 6/8] Copy changes to make it more clear

---
 packages/react-app/src/views/GuestRoom.jsx | 2 +-
 packages/react-app/src/views/HostRoom.jsx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-app/src/views/GuestRoom.jsx b/packages/react-app/src/views/GuestRoom.jsx
index 52562962..b019e28e 100644
--- a/packages/react-app/src/views/GuestRoom.jsx
+++ b/packages/react-app/src/views/GuestRoom.jsx
@@ -179,7 +179,7 @@ export default function GuestRoom({
           type="primary"
           shape="round"
         >
-          Connect Wallet to Sign In!
+          Connect Wallet to Use Tip Party!
         </Button>
       )}
       <h2 id="title">Welcome to the Tip Party!</h2>
diff --git a/packages/react-app/src/views/HostRoom.jsx b/packages/react-app/src/views/HostRoom.jsx
index 20990524..d24237de 100644
--- a/packages/react-app/src/views/HostRoom.jsx
+++ b/packages/react-app/src/views/HostRoom.jsx
@@ -364,7 +364,7 @@ export default function HostRoom({
           type="primary"
           shape="round"
         >
-          Connect Wallet to Tip!
+          Connect Wallet to Use Tip Party!
         </Button>
       )}
 

From e62542fb3e2607077dfaccf2b8ec33864b811a13 Mon Sep 17 00:00:00 2001
From: Varun <varunv5000@gmail.com>
Date: Wed, 2 Feb 2022 13:17:31 -0500
Subject: [PATCH 7/8] error notifications

---
 packages/react-app/src/views/HostRoom.jsx | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/react-app/src/views/HostRoom.jsx b/packages/react-app/src/views/HostRoom.jsx
index d24237de..6b823bdb 100644
--- a/packages/react-app/src/views/HostRoom.jsx
+++ b/packages/react-app/src/views/HostRoom.jsx
@@ -207,6 +207,13 @@ export default function HostRoom({
   };
 
   const ethPayHandler = async () => {
+    if (web3Modal.cachedProvider === "") {
+      return notification.error({
+        message: "Failed to Distribute!",
+        description: "Please Connect to a Wallet before distributing tokens",
+        placement: "bottomRight",
+      });
+    }
     const result = tx(
       writeContracts.TokenDistributor.splitEth(allAddresses, room, {
         value: ethers.utils.parseEther(numericalAmount),
@@ -252,6 +259,14 @@ export default function HostRoom({
   };
 
   const tokenPayHandler = async opts => {
+
+    if (web3Modal.cachedProvider === "") {
+      return notification.error({
+        message: "Failed to Distribute!",
+        description: "Please Connect to a Wallet before distributing tokens",
+        placement: "bottomRight",
+      });
+    }
     const result = tx(
       writeContracts.TokenDistributor.splitTokenFromUser(
         allAddresses,

From 1d047f10b7a277b9a8d40ef6216fb60a0680a0ab Mon Sep 17 00:00:00 2001
From: Varun <varunv5000@gmail.com>
Date: Wed, 2 Feb 2022 13:20:49 -0500
Subject: [PATCH 8/8] copy changed

---
 packages/react-app/src/views/HostRoom.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-app/src/views/HostRoom.jsx b/packages/react-app/src/views/HostRoom.jsx
index 6b823bdb..42862f74 100644
--- a/packages/react-app/src/views/HostRoom.jsx
+++ b/packages/react-app/src/views/HostRoom.jsx
@@ -210,7 +210,7 @@ export default function HostRoom({
     if (web3Modal.cachedProvider === "") {
       return notification.error({
         message: "Failed to Distribute!",
-        description: "Please Connect to a Wallet before distributing tokens",
+        description: "Please connect to a wallet before distributing tokens",
         placement: "bottomRight",
       });
     }
@@ -263,7 +263,7 @@ export default function HostRoom({
     if (web3Modal.cachedProvider === "") {
       return notification.error({
         message: "Failed to Distribute!",
-        description: "Please Connect to a Wallet before distributing tokens",
+        description: "Please connect to a wallet before distributing tokens",
         placement: "bottomRight",
       });
     }