From 9f73ee59ec90a6153a4715cd518f002620cf84d1 Mon Sep 17 00:00:00 2001
From: GuiBibeau <g.bibeaulaviolette@gmail.com>
Date: Wed, 5 Oct 2022 11:27:57 -0400
Subject: [PATCH] step 2

---
 README.md             |  2 +-
 components/Wallet.tsx | 32 +++++++++++++++++++++++++++++---
 hooks/useMetamask.tsx | 16 +++++++++-------
 3 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index c3698ec..b43cb8a 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Branches will be created with stages for the rest of the implementation
 
 You are presented with a Next.js application that has a basic layout and a Context Provider. Your goal is to learn how to use the Metamask API to make this an application that users can interact with.
 
-Few notes about the initial setup ans constraints:
+Few notes about the initial setup and constraints:
 
 - You do not need any additional dependencies.
 - The context provider is already setup so that any react code under [components](./components/) and [pages](./pages/) can access the context using a hook.
diff --git a/components/Wallet.tsx b/components/Wallet.tsx
index d163d50..0e50004 100644
--- a/components/Wallet.tsx
+++ b/components/Wallet.tsx
@@ -6,12 +6,13 @@ import { Loading } from "./Loading";
 export default function Wallet() {
   const {
     dispatch,
-    state: { status, isMetamaskInstalled },
+    state: { status, isMetamaskInstalled, wallet, balance },
   } = useMetamask();
 
   const showInstallMetamask =
     status !== "pageNotLoaded" && !isMetamaskInstalled;
-  const showConnectButton = status !== "pageNotLoaded" && isMetamaskInstalled;
+  const showConnectButton =
+    status !== "pageNotLoaded" && isMetamaskInstalled && !wallet;
 
   const handleConnect = async () => {
     dispatch({ type: "loading" });
@@ -20,7 +21,12 @@ export default function Wallet() {
     });
 
     if (accounts.length > 0) {
-      dispatch({ type: "connect", wallet: accounts[0] });
+      const balance = await window.ethereum!.request({
+        method: "eth_getBalance",
+        params: [accounts[0], "latest"],
+      });
+
+      dispatch({ type: "connect", wallet: accounts[0], balance });
     }
   };
 
@@ -40,6 +46,26 @@ export default function Wallet() {
           </Link>{" "}
           in order to learn how to use the Metamask API.
         </p>
+
+        {wallet && (
+          <div className=" px-4 py-5 sm:px-6">
+            <div className="-ml-4 -mt-4 flex flex-wrap items-center justify-between sm:flex-nowrap">
+              <div className="ml-4 mt-4">
+                <div className="flex items-center">
+                  <div className="ml-4">
+                    <h3 className="text-lg font-medium leading-6 text-white">
+                      Address: <span>{wallet}</span>
+                    </h3>
+                    <p className="text-sm text-white">
+                      Balance: <span>{balance}</span>
+                    </p>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        )}
+
         {showConnectButton && (
           <button
             onClick={handleConnect}
diff --git a/hooks/useMetamask.tsx b/hooks/useMetamask.tsx
index a55f886..180d3a3 100644
--- a/hooks/useMetamask.tsx
+++ b/hooks/useMetamask.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, type PropsWithChildren } from "react";
 
-type ConnectAction = { type: "connect"; wallet: string };
+type ConnectAction = { type: "connect"; wallet: string; balance: string };
 type DisconnectAction = { type: "disconnect" };
 type PageLoadedAction = { type: "pageLoaded"; isMetamaskInstalled: boolean };
 type LoadingAction = { type: "loading" };
@@ -19,23 +19,21 @@ type State = {
   wallet: string | null;
   isMetamaskInstalled: boolean;
   status: Status;
+  balance: string | null;
 };
 
-const MetamaskContext = React.createContext<
-  { state: State; dispatch: Dispatch } | undefined
->(undefined);
-
 const initialState: State = {
   wallet: null,
   isMetamaskInstalled: false,
   status: "loading",
+  balance: null,
 } as const;
 
 function metamaskReducer(state: State, action: Action): State {
   switch (action.type) {
     case "connect": {
-      const { wallet } = action;
-      return { ...state, wallet, status: "idle" };
+      const { wallet, balance } = action;
+      return { ...state, wallet, balance, status: "idle" };
     }
     case "disconnect": {
       return { ...state, wallet: null };
@@ -53,6 +51,10 @@ function metamaskReducer(state: State, action: Action): State {
   }
 }
 
+const MetamaskContext = React.createContext<
+  { state: State; dispatch: Dispatch } | undefined
+>(undefined);
+
 function MetamaskProvider({ children }: PropsWithChildren) {
   const [state, dispatch] = React.useReducer(metamaskReducer, initialState);
   const value = { state, dispatch };