From 1c611e0bcf972d093a1bbb5ccafdba9c46bc5a0d Mon Sep 17 00:00:00 2001
From: gantunesr <17601467+gantunesr@users.noreply.github.com>
Date: Thu, 12 Sep 2024 18:50:49 -0300
Subject: [PATCH 1/3] fix: delete repeated account option

---
 .../account-list-menu/account-list-menu.tsx   | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/ui/components/multichain/account-list-menu/account-list-menu.tsx b/ui/components/multichain/account-list-menu/account-list-menu.tsx
index 2afbe6f1fcbc..c08feb2f4df0 100644
--- a/ui/components/multichain/account-list-menu/account-list-menu.tsx
+++ b/ui/components/multichain/account-list-menu/account-list-menu.tsx
@@ -395,31 +395,6 @@ export const AccountListMenu = ({
               )
               ///: END:ONLY_INCLUDE_IF
             }
-            {
-              ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
-              bitcoinTestnetSupportEnabled ? (
-                <Box marginTop={4}>
-                  <ButtonLink
-                    disabled={isBtcTestnetAccountAlreadyCreated}
-                    size={ButtonLinkSize.Sm}
-                    startIconName={IconName.Add}
-                    onClick={async () => {
-                      // The account creation + renaming is handled by the Snap account bridge, so
-                      // we need to close the current model
-                      onClose();
-
-                      await createBitcoinAccount(
-                        MultichainNetworks.BITCOIN_TESTNET,
-                      );
-                    }}
-                    data-testid="multichain-account-menu-popover-add-btc-account-testnet"
-                  >
-                    {t('addNewBitcoinTestnetAccount')}
-                  </ButtonLink>
-                </Box>
-              ) : null
-              ///: END:ONLY_INCLUDE_IF
-            }
             {
               ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
               bitcoinTestnetSupportEnabled ? (

From df40af38ffda5c75f735af79de17928a99d9f296 Mon Sep 17 00:00:00 2001
From: gantunesr <17601467+gantunesr@users.noreply.github.com>
Date: Mon, 16 Sep 2024 02:12:53 -0300
Subject: [PATCH 2/3] Revert "fix: delete repeated account option"

This reverts commit 1c611e0bcf972d093a1bbb5ccafdba9c46bc5a0d.
---
 .../account-list-menu/account-list-menu.tsx   | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/ui/components/multichain/account-list-menu/account-list-menu.tsx b/ui/components/multichain/account-list-menu/account-list-menu.tsx
index c08feb2f4df0..2afbe6f1fcbc 100644
--- a/ui/components/multichain/account-list-menu/account-list-menu.tsx
+++ b/ui/components/multichain/account-list-menu/account-list-menu.tsx
@@ -395,6 +395,31 @@ export const AccountListMenu = ({
               )
               ///: END:ONLY_INCLUDE_IF
             }
+            {
+              ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
+              bitcoinTestnetSupportEnabled ? (
+                <Box marginTop={4}>
+                  <ButtonLink
+                    disabled={isBtcTestnetAccountAlreadyCreated}
+                    size={ButtonLinkSize.Sm}
+                    startIconName={IconName.Add}
+                    onClick={async () => {
+                      // The account creation + renaming is handled by the Snap account bridge, so
+                      // we need to close the current model
+                      onClose();
+
+                      await createBitcoinAccount(
+                        MultichainNetworks.BITCOIN_TESTNET,
+                      );
+                    }}
+                    data-testid="multichain-account-menu-popover-add-btc-account-testnet"
+                  >
+                    {t('addNewBitcoinTestnetAccount')}
+                  </ButtonLink>
+                </Box>
+              ) : null
+              ///: END:ONLY_INCLUDE_IF
+            }
             {
               ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
               bitcoinTestnetSupportEnabled ? (

From dc527a5ff7563919d313d139b1789c24bbbe2549 Mon Sep 17 00:00:00 2001
From: gantunesr <17601467+gantunesr@users.noreply.github.com>
Date: Mon, 16 Sep 2024 02:14:38 -0300
Subject: [PATCH 3/3] fix: remove repeated account option

---
 .../account-list-menu/account-list-menu.tsx   | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/ui/components/multichain/account-list-menu/account-list-menu.tsx b/ui/components/multichain/account-list-menu/account-list-menu.tsx
index 2afbe6f1fcbc..653e6700c0a8 100644
--- a/ui/components/multichain/account-list-menu/account-list-menu.tsx
+++ b/ui/components/multichain/account-list-menu/account-list-menu.tsx
@@ -420,25 +420,6 @@ export const AccountListMenu = ({
               ) : null
               ///: END:ONLY_INCLUDE_IF
             }
-            {
-              ///: BEGIN:ONLY_INCLUDE_IF(build-flask)
-              bitcoinTestnetSupportEnabled ? (
-                <Box marginTop={4}>
-                  <ButtonLink
-                    disabled={isBtcTestnetAccountAlreadyCreated}
-                    size={ButtonLinkSize.Sm}
-                    startIconName={IconName.Add}
-                    onClick={() => {
-                      setActionMode(ACTION_MODES.ADD_BITCOIN_TESTNET);
-                    }}
-                    data-testid="multichain-account-menu-popover-add-account-testnet"
-                  >
-                    {t('addNewBitcoinTestnetAccount')}
-                  </ButtonLink>
-                </Box>
-              ) : null
-              ///: END:ONLY_INCLUDE_IF
-            }
             <Box marginTop={4}>
               <ButtonLink
                 size={ButtonLinkSize.Sm}