From 8917aed479b2c148dfb65de9403d8ddf9fb85e7b Mon Sep 17 00:00:00 2001
From: Nicholas Gambino <nicholas.gambino@consensys.net>
Date: Mon, 7 Oct 2024 10:24:33 -0700
Subject: [PATCH 1/3] fix: Duplicate key in Settings and Privacy

---
 .../Views/Settings/SecuritySettings/SecuritySettings.tsx        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx b/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx
index 9a5a131f742..0e69d2b049d 100644
--- a/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx
+++ b/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx
@@ -667,7 +667,7 @@ const Settings: React.FC = () => {
 
           return (
             <Cell
-              key={chainId}
+              key={`${nickname}-${chainId}`}
               variant={CellVariant.Display}
               title={name}
               secondaryText={

From 0aa3794c70c4ccac572d3a4ec566562db329e567 Mon Sep 17 00:00:00 2001
From: Nicholas Gambino <nicholas.gambino@consensys.net>
Date: Mon, 7 Oct 2024 11:00:19 -0700
Subject: [PATCH 2/3] fix: Potential duplicate key in renderOtherNetworks

---
 .../Views/Settings/SecuritySettings/SecuritySettings.tsx        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx b/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx
index 0e69d2b049d..8537c3ba09c 100644
--- a/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx
+++ b/app/components/Views/Settings/SecuritySettings/SecuritySettings.tsx
@@ -709,7 +709,7 @@ const Settings: React.FC = () => {
         if (!chainId) return null;
         return (
           <Cell
-            key={chainId}
+            key={`${name}-${chainId}`}
             variant={CellVariant.Display}
             title={name}
             secondaryText={

From 46d323f35aee1d62a26627f9edebdb0c018b8ca5 Mon Sep 17 00:00:00 2001
From: Nicholas Gambino <nicholas.gambino@consensys.net>
Date: Mon, 7 Oct 2024 20:03:07 -0700
Subject: [PATCH 3/3] fix: Address duplicate key after merge conflicts

---
 .../Views/Settings/IncomingTransactionsSettings/index.tsx     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/components/Views/Settings/IncomingTransactionsSettings/index.tsx b/app/components/Views/Settings/IncomingTransactionsSettings/index.tsx
index c5061840251..34e0e70fa35 100644
--- a/app/components/Views/Settings/IncomingTransactionsSettings/index.tsx
+++ b/app/components/Views/Settings/IncomingTransactionsSettings/index.tsx
@@ -94,7 +94,7 @@ const IncomingTransactionsSettings = () => {
           supportedNetworks[chainId as keyof typeof supportedNetworks].domain;
         return (
           <NetworkCell
-            key={chainId}
+            key={`${nickname}-${chainId}`}
             name={name}
             chainId={chainId as EtherscanSupportedHexChainId}
             imageSource={image}
@@ -116,7 +116,7 @@ const IncomingTransactionsSettings = () => {
         supportedNetworks[chainId as keyof typeof supportedNetworks].domain;
       return (
         <NetworkCell
-          key={chainId}
+          key={`${name}-${chainId}`}
           name={name}
           chainId={chainId as keyof typeof supportedNetworks}
           imageSource={imageSource as ImageSourcePropType}