From d4b0996ea8e03d4f47864e60e5ee5d7cc1bffa32 Mon Sep 17 00:00:00 2001
From: Nikhil Narayana <nikhil.narayana@live.com>
Date: Sun, 29 Aug 2021 15:49:46 -0700
Subject: [PATCH 1/4] feat: check nintendont version and display notif

---
 src/console/mirrorManager.ts                             | 2 ++
 src/console/types.ts                                     | 1 +
 src/renderer/containers/Console/SavedConnectionItem.tsx  | 5 +++++
 src/renderer/containers/Console/SavedConnectionsList.tsx | 1 +
 src/renderer/lib/hooks/useConsoleDiscovery.ts            | 5 ++++-
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/console/mirrorManager.ts b/src/console/mirrorManager.ts
index b3e7c6c18..8a7514cb3 100644
--- a/src/console/mirrorManager.ts
+++ b/src/console/mirrorManager.ts
@@ -96,6 +96,7 @@ export class MirrorManager extends EventEmitter {
           ip: config.ipAddress,
           info: {
             nickname: details.consoleNick,
+            nintendontVersion: details.version,
           },
         });
       });
@@ -197,6 +198,7 @@ export class MirrorManager extends EventEmitter {
         status: ConnectionStatus.DISCONNECTED,
         isMirroring: false,
         filename: null,
+        nintendontVersion: null,
       },
     });
   }
diff --git a/src/console/types.ts b/src/console/types.ts
index 1e19f9983..59ac4fe18 100644
--- a/src/console/types.ts
+++ b/src/console/types.ts
@@ -8,6 +8,7 @@ export interface ConsoleMirrorStatusUpdate {
   isMirroring: boolean;
   filename: string | null;
   nickname: string;
+  nintendontVersion: string | null;
 }
 
 export interface MirrorConfig {
diff --git a/src/renderer/containers/Console/SavedConnectionItem.tsx b/src/renderer/containers/Console/SavedConnectionItem.tsx
index 70e67d747..77276a0e1 100644
--- a/src/renderer/containers/Console/SavedConnectionItem.tsx
+++ b/src/renderer/containers/Console/SavedConnectionItem.tsx
@@ -14,6 +14,7 @@ import { StoredConnection } from "@settings/types";
 import { ConnectionStatus, Ports } from "@slippi/slippi-js";
 import React from "react";
 import { useToasts } from "react-toast-notifications";
+import { lt } from "semver";
 
 import { LabelledText } from "@/components/LabelledText";
 import { connectToConsole, disconnectFromConsole, startConsoleMirror } from "@/lib/consoleConnection";
@@ -26,6 +27,7 @@ export interface SavedConnectionItemProps {
   isMirroring: boolean;
   nickname?: string;
   currentFilename: string | null;
+  nintendontVersion: string | null;
   connection: StoredConnection;
   onOpenMenu: (index: number, element: HTMLElement) => void;
 }
@@ -39,6 +41,7 @@ export const SavedConnectionItem: React.FC<SavedConnectionItemProps> = ({
   nickname,
   isAvailable,
   currentFilename,
+  nintendontVersion,
 }) => {
   const { addToast } = useToasts();
   const onConnect = () => connectToConsole(connection);
@@ -53,6 +56,7 @@ export const SavedConnectionItem: React.FC<SavedConnectionItemProps> = ({
   const statusName = status === ConnectionStatus.DISCONNECTED && isAvailable ? "Available" : renderStatusName(status);
   const isConnected = status !== ConnectionStatus.DISCONNECTED;
   const title = nickname ? `${connection.ipAddress} (${nickname})` : connection.ipAddress;
+  const oldNintendont = lt(nintendontVersion ?? "1.8.0", "1.9.1");
   return (
     <Outer>
       <CardHeader
@@ -122,6 +126,7 @@ export const SavedConnectionItem: React.FC<SavedConnectionItemProps> = ({
             </span>
           </LabelledText>
         )}
+        {oldNintendont && "You are using an old Nintendont version, please update it."}
       </CardContent>
       <CardActions>
         <Button
diff --git a/src/renderer/containers/Console/SavedConnectionsList.tsx b/src/renderer/containers/Console/SavedConnectionsList.tsx
index 7e2f251b0..975b3d417 100644
--- a/src/renderer/containers/Console/SavedConnectionsList.tsx
+++ b/src/renderer/containers/Console/SavedConnectionsList.tsx
@@ -72,6 +72,7 @@ export const SavedConnectionsList: React.FC<SavedConnectionsListProps> = ({ avai
                 isMirroring={isMirroring ?? false}
                 isAvailable={Boolean(consoleInfo)}
                 currentFilename={consoleStatus?.filename ?? null}
+                nintendontVersion={consoleStatus.nintendontVersion ?? null}
                 nickname={consoleStatus?.nickname ?? consoleInfo?.name}
                 connection={conn}
                 index={index}
diff --git a/src/renderer/lib/hooks/useConsoleDiscovery.ts b/src/renderer/lib/hooks/useConsoleDiscovery.ts
index 53f1aacf4..33e8c7b42 100644
--- a/src/renderer/lib/hooks/useConsoleDiscovery.ts
+++ b/src/renderer/lib/hooks/useConsoleDiscovery.ts
@@ -24,10 +24,13 @@ export const useConsoleDiscoveryStore = create(
             draft.connectedConsoles[ip].status = info.status ?? existing?.status;
             draft.connectedConsoles[ip].isMirroring = info.isMirroring ?? existing?.isMirroring;
 
-            // This value can be null so check against undefined
+            // These values can be null so check against undefined
             if (info.filename !== undefined) {
               draft.connectedConsoles[ip].filename = info.filename;
             }
+            if (info.nintendontVersion !== undefined) {
+              draft.connectedConsoles[ip].nintendontVersion = info.nintendontVersion;
+            }
           }),
         ),
     }),

From 21fb012e4cdeb8675be797a46dfc525dff1ee18c Mon Sep 17 00:00:00 2001
From: Vince Au <vinceau09@gmail.com>
Date: Mon, 30 Aug 2021 18:45:47 +1000
Subject: [PATCH 2/4] feat: update outdated nintendont warning style

---
 .../Console/SavedConnectionItem.tsx           | 37 ++++++++++++++++++-
 .../Console/SavedConnectionsList.tsx          |  2 +-
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/renderer/containers/Console/SavedConnectionItem.tsx b/src/renderer/containers/Console/SavedConnectionItem.tsx
index 77276a0e1..e7336370f 100644
--- a/src/renderer/containers/Console/SavedConnectionItem.tsx
+++ b/src/renderer/containers/Console/SavedConnectionItem.tsx
@@ -10,12 +10,14 @@ import CardHeader from "@material-ui/core/CardHeader";
 import IconButton from "@material-ui/core/IconButton";
 import Tooltip from "@material-ui/core/Tooltip";
 import MoreVertIcon from "@material-ui/icons/MoreVert";
+import WarningIcon from "@material-ui/icons/Warning";
 import { StoredConnection } from "@settings/types";
 import { ConnectionStatus, Ports } from "@slippi/slippi-js";
 import React from "react";
 import { useToasts } from "react-toast-notifications";
 import { lt } from "semver";
 
+import { ExternalLink as A } from "@/components/ExternalLink";
 import { LabelledText } from "@/components/LabelledText";
 import { connectToConsole, disconnectFromConsole, startConsoleMirror } from "@/lib/consoleConnection";
 import { ReactComponent as WiiIcon } from "@/styles/images/wii-icon.svg";
@@ -56,7 +58,7 @@ export const SavedConnectionItem: React.FC<SavedConnectionItemProps> = ({
   const statusName = status === ConnectionStatus.DISCONNECTED && isAvailable ? "Available" : renderStatusName(status);
   const isConnected = status !== ConnectionStatus.DISCONNECTED;
   const title = nickname ? `${connection.ipAddress} (${nickname})` : connection.ipAddress;
-  const oldNintendont = lt(nintendontVersion ?? "1.8.0", "1.9.1");
+  const nintendontIsOutdated = nintendontVersion !== null && lt(nintendontVersion, "1.9.1");
   return (
     <Outer>
       <CardHeader
@@ -81,6 +83,7 @@ export const SavedConnectionItem: React.FC<SavedConnectionItemProps> = ({
           }
         `}
       >
+        {nintendontIsOutdated && <OutdatedNintendontWarning />}
         <div
           css={css`
             display: flex;
@@ -126,7 +129,6 @@ export const SavedConnectionItem: React.FC<SavedConnectionItemProps> = ({
             </span>
           </LabelledText>
         )}
-        {oldNintendont && "You are using an old Nintendont version, please update it."}
       </CardContent>
       <CardActions>
         <Button
@@ -164,3 +166,34 @@ const renderStatusName = (status: number) => {
       return `Unknown status: ${status}`;
   }
 };
+
+const OutdatedNintendontWarning: React.FC = () => {
+  return (
+    <div
+      css={css`
+        display: flex;
+        align-items: center;
+        padding: 5px 10px;
+        background-color: #f2d994;
+        color: #8d571a;
+        border: solid 2px #8d571a;
+        border-radius: 10px;
+        font-size: 14px;
+        svg {
+          padding: 5px;
+          margin-right: 5px;
+        }
+        margin-bottom: 20px;
+        a {
+          text-decoration: underline;
+        }
+      `}
+    >
+      <WarningIcon />
+      <span>
+        Your Nintendont is out of date and is no longer supported. Download the latest version from{" "}
+        <A href="https://slippi.gg/downloads">the Slippi website</A>.
+      </span>
+    </div>
+  );
+};
diff --git a/src/renderer/containers/Console/SavedConnectionsList.tsx b/src/renderer/containers/Console/SavedConnectionsList.tsx
index 975b3d417..903b8af7d 100644
--- a/src/renderer/containers/Console/SavedConnectionsList.tsx
+++ b/src/renderer/containers/Console/SavedConnectionsList.tsx
@@ -72,7 +72,7 @@ export const SavedConnectionsList: React.FC<SavedConnectionsListProps> = ({ avai
                 isMirroring={isMirroring ?? false}
                 isAvailable={Boolean(consoleInfo)}
                 currentFilename={consoleStatus?.filename ?? null}
-                nintendontVersion={consoleStatus.nintendontVersion ?? null}
+                nintendontVersion={consoleStatus?.nintendontVersion ?? null}
                 nickname={consoleStatus?.nickname ?? consoleInfo?.name}
                 connection={conn}
                 index={index}

From 603cd118076d50847bb91a473965d363a607d862 Mon Sep 17 00:00:00 2001
From: Nikhil Narayana <nikhil.narayana@live.com>
Date: Mon, 30 Aug 2021 08:40:38 -0700
Subject: [PATCH 3/4] style: font-weight 500 for outdated warning

---
 src/renderer/containers/Console/SavedConnectionItem.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/containers/Console/SavedConnectionItem.tsx b/src/renderer/containers/Console/SavedConnectionItem.tsx
index e7336370f..c77b43994 100644
--- a/src/renderer/containers/Console/SavedConnectionItem.tsx
+++ b/src/renderer/containers/Console/SavedConnectionItem.tsx
@@ -179,6 +179,7 @@ const OutdatedNintendontWarning: React.FC = () => {
         border: solid 2px #8d571a;
         border-radius: 10px;
         font-size: 14px;
+        font-weight: 500;
         svg {
           padding: 5px;
           margin-right: 5px;

From c26d4cfc2f88212f9da938175903b219443c9bab Mon Sep 17 00:00:00 2001
From: Nikhil Narayana <nikhil.narayana@live.com>
Date: Mon, 30 Aug 2021 08:50:07 -0700
Subject: [PATCH 4/4] refactor: minor outdated wording change

---
 src/renderer/containers/Console/SavedConnectionItem.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/containers/Console/SavedConnectionItem.tsx b/src/renderer/containers/Console/SavedConnectionItem.tsx
index c77b43994..dbc080511 100644
--- a/src/renderer/containers/Console/SavedConnectionItem.tsx
+++ b/src/renderer/containers/Console/SavedConnectionItem.tsx
@@ -192,7 +192,7 @@ const OutdatedNintendontWarning: React.FC = () => {
     >
       <WarningIcon />
       <span>
-        Your Nintendont is out of date and is no longer supported. Download the latest version from{" "}
+        Your Nintendont is out of date and no longer supported. Download the latest version from{" "}
         <A href="https://slippi.gg/downloads">the Slippi website</A>.
       </span>
     </div>