From 5ebceecf92b1ed84bc64d798c08e8249282c701b Mon Sep 17 00:00:00 2001
From: Franck Royer <franck@status.im>
Date: Fri, 23 Apr 2021 14:40:28 +1000
Subject: [PATCH] Use separate state per var

---
 web-chat/src/App.tsx | 42 +++++++++++++++++-------------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/web-chat/src/App.tsx b/web-chat/src/App.tsx
index 4b1437261d..a6133afcec 100644
--- a/web-chat/src/App.tsx
+++ b/web-chat/src/App.tsx
@@ -12,13 +12,9 @@ import { WakuContext } from './WakuContext';
 
 export const ChatContentTopic = 'dingpu';
 
-interface State {
-  messages: ChatMessage[];
-  waku?: Waku;
-}
-
 export default function App() {
-  let [state, setState] = useState<State>({ messages: [] });
+  let [stateMessages, setMessages] = useState<ChatMessage[]>([]);
+  let [stateWaku, setWaku] = useState<Waku | undefined>(undefined);
 
   useEffect(() => {
     async function initWaku() {
@@ -32,9 +28,7 @@ export default function App() {
           },
         });
 
-        setState(({ messages }) => {
-          return { waku, messages };
-        });
+        setWaku(waku);
 
         // FIXME: Connect to a go-waku instance by default, temporary hack until
         //  we have a go-waku instance in the fleet
@@ -53,23 +47,23 @@ export default function App() {
       const wakuMsg = WakuMessage.decode(event.data);
       if (wakuMsg.payload) {
         const chatMsg = ChatMessage.decode(wakuMsg.payload);
-        const messages = state.messages.slice();
+        const messages = stateMessages.slice();
         messages.push(chatMsg);
         console.log('setState on ', messages);
-        setState({ messages, waku: state.waku });
+        setMessages(messages);
       }
     };
 
-    if (!state.waku) {
+    if (!stateWaku) {
       initWaku()
         .then(() => console.log('Waku init done'))
         .catch((e) => console.log('Waku init failed ', e));
     } else {
-      state.waku.libp2p.pubsub.on(RelayDefaultTopic, handleNewMessages);
+      stateWaku.libp2p.pubsub.on(RelayDefaultTopic, handleNewMessages);
 
       // To clean up listener when component unmounts
       return () => {
-        state.waku?.libp2p.pubsub.removeListener(
+        stateWaku?.libp2p.pubsub.removeListener(
           RelayDefaultTopic,
           handleNewMessages
         );
@@ -81,8 +75,7 @@ export default function App() {
     let commandResponses: string[] = [];
     const args = input.split(' ');
     const cmd = args.shift()!;
-    const waku = state.waku;
-    if (!waku) {
+    if (!stateWaku) {
       commandResponses.push('Waku is not yet initialized');
     } else {
       switch (cmd) {
@@ -103,7 +96,7 @@ export default function App() {
               if (!peerId) {
                 commandResponses.push('Peer Id needed to dial');
               } else {
-                waku.libp2p.peerStore.addressBook.add(
+                stateWaku.libp2p.peerStore.addressBook.add(
                   PeerId.createFromB58String(peerId),
                   [peerMultiaddr]
                 );
@@ -114,7 +107,7 @@ export default function App() {
           }
           break;
         case '/peers':
-          waku.libp2p.peerStore.peers.forEach((peer, peerId) => {
+          stateWaku.libp2p.peerStore.peers.forEach((peer, peerId) => {
             commandResponses.push(peerId + ':');
             let addresses = '  addresses: [';
             peer.addresses.forEach(({ multiaddr }) => {
@@ -133,20 +126,19 @@ export default function App() {
           commandResponses.push('Unknown Command');
       }
     }
-    setState(({ waku, messages }) => {
-      commandResponses.forEach((res) => {
-        messages.push(new ChatMessage(new Date(), cmd, res));
-      });
-      return { waku, messages };
+    const messages = stateMessages.slice();
+    commandResponses.forEach((res) => {
+      messages.push(new ChatMessage(new Date(), cmd, res));
     });
+    setMessages(messages);
   };
 
   return (
     <div className="App">
       <div className="chat-room">
-        <WakuContext.Provider value={{ waku: state.waku }}>
+        <WakuContext.Provider value={{ waku: stateWaku }}>
           <Paper>
-            <Room lines={state.messages} commandHandler={commandHandler} />
+            <Room lines={stateMessages} commandHandler={commandHandler} />
           </Paper>
         </WakuContext.Provider>
       </div>