added feature flag

MetaMask · Nov 17, 2023 · db6b4a4 · db6b4a4
1 parent 7465792
commit db6b4a4
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 26 deletions.
diff --git a/builds.yml b/builds.yml
@@ -254,7 +254,7 @@ env:
   - BLOCKAID_PUBLIC_KEY
   # Determines if feature flagged Multichain UI should be used
   - MULTICHAIN: ''
-
+  - NETWORK_ACCOUNT_DND: ''
   ###
   # Meta variables
   ###

diff --git a/ui/components/multichain/account-list-item-menu/account-list-item-menu.js b/ui/components/multichain/account-list-item-menu/account-list-item-menu.js
@@ -165,20 +165,22 @@ export const AccountListItemMenu = ({
             textProps={{ variant: TextVariant.bodySm }}
             address={identity.address}
           />
-          <MenuItem
-            data-testid="account-list-menu-pin"
-            onClick={() => {
-              isPinned
-                ? handleUnpinning(identity.address)
-                : handlePinning(identity.address);
-              onClose();
-            }}
-            iconName={isPinned ? IconName.Unpin : IconName.Pin}
-          >
-            <Text variant={TextVariant.bodySm}>
-              {isPinned ? t('unpin') : t('pinToTop')}
-            </Text>
-          </MenuItem>
+          {process.env.NETWORK_ACCOUNT_DND ? (
+            <MenuItem
+              data-testid="account-list-menu-pin"
+              onClick={() => {
+                isPinned
+                  ? handleUnpinning(identity.address)
+                  : handlePinning(identity.address);
+                onClose();
+              }}
+              iconName={isPinned ? IconName.Unpin : IconName.Pin}
+            >
+              <Text variant={TextVariant.bodySm}>
+                {isPinned ? t('unpin') : t('pinToTop')}
+              </Text>
+            </MenuItem>
+          ) : null}
           {isRemovable ? (
             <MenuItem
               ref={removeAccountItemRef}

diff --git a/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap b/ui/components/multichain/account-list-item/__snapshots__/account-list-item.test.js.snap
@@ -58,7 +58,7 @@ exports[`AccountListItem renders AccountListItem component and shows account nam
           class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
         >
           <div
-            class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2"
+            class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center"
           >
             <button
               class="mm-box mm-text multichain-account-list-item__account-name__button mm-text--body-md-medium mm-text--ellipsis mm-text--text-align-left mm-box--padding-0 mm-box--width-full mm-box--color-text-default mm-box--background-color-transparent"

diff --git a/ui/components/multichain/account-list-item/account-list-item.js b/ui/components/multichain/account-list-item/account-list-item.js
@@ -176,7 +176,7 @@ export const AccountListItem = ({
               alignItems={AlignItems.center}
               gap={2}
             >
-              {isPinned ? (
+              {process.env.NETWORK_ACCOUNT_DND && isPinned ? (
                 <Icon name={IconName.Pin} size={IconSize.Xs} />
               ) : null}
               <Text
@@ -328,7 +328,7 @@ export const AccountListItem = ({
           isOpen={accountOptionsMenuOpen}
           isRemovable={keyring?.type !== KeyringType.hdKeyTree}
           closeMenu={closeMenu}
-          isPinned={isPinned}
+          isPinned={process.env.NETWORK_ACCOUNT_DND ? isPinned : null}
         />
       ) : null}
     </Box>

diff --git a/ui/components/multichain/account-list-menu/account-list-menu.js b/ui/components/multichain/account-list-menu/account-list-menu.js
@@ -118,7 +118,7 @@ export const AccountListMenu = ({
     }
   }
 
-  if (pinnedAccounts.length > 0) {
+  if (process.env.NETWORK_ACCOUNT_DND && pinnedAccounts.length > 0) {
     accounts.forEach((account) => {
       if (pinnedAccounts.includes(account.address)) {
         account.pinned = true;
@@ -128,7 +128,7 @@ export const AccountListMenu = ({
     });
   }
 
-  const sortedSearchResults = searchResults.slice().sort((a, b) => {
+  let sortedSearchResults = searchResults.slice().sort((a, b) => {
     if (a.pinned && !b.pinned) {
       return -1; // a comes first
     } else if (!a.pinned && b.pinned) {
@@ -137,6 +137,10 @@ export const AccountListMenu = ({
     return 0; // keep the order unchanged
   });
 
+  sortedSearchResults = process.env.NETWORK_ACCOUNT_DND
+    ? sortedSearchResults
+    : searchResults;
+
   return (
     <Modal isOpen onClose={onClose}>
       <ModalOverlay />
@@ -366,7 +370,9 @@ export const AccountListMenu = ({
                       connectedAvatar={connectedSite?.iconUrl}
                       connectedAvatarName={connectedSite?.name}
                       showOptions
-                      isPinned={account.pinned}
+                      isPinned={
+                        process.env.NETWORK_ACCOUNT_DND ? account.pinned : null
+                      }
                       {...accountListItemProps}
                     />
                   </>

diff --git a/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap b/ui/components/multichain/pages/send/__snapshots__/send.test.js.snap
@@ -262,7 +262,7 @@ exports[`SendPage render renders correctly 1`] = `
                         class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
                       >
                         <div
-                          class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2"
+                          class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center"
                         >
                           <button
                             class="mm-box mm-text multichain-account-list-item__account-name__button mm-text--body-md-medium mm-text--ellipsis mm-text--text-align-left mm-box--padding-0 mm-box--width-full mm-box--color-text-default mm-box--background-color-transparent"
@@ -381,7 +381,7 @@ exports[`SendPage render renders correctly 1`] = `
                         class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
                       >
                         <div
-                          class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2"
+                          class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center"
                         >
                           <button
                             class="mm-box mm-text multichain-account-list-item__account-name__button mm-text--body-md-medium mm-text--ellipsis mm-text--text-align-left mm-box--padding-0 mm-box--width-full mm-box--color-text-default mm-box--background-color-transparent"
@@ -500,7 +500,7 @@ exports[`SendPage render renders correctly 1`] = `
                         class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
                       >
                         <div
-                          class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2"
+                          class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center"
                         >
                           <button
                             class="mm-box mm-text multichain-account-list-item__account-name__button mm-text--body-md-medium mm-text--ellipsis mm-text--text-align-left mm-box--padding-0 mm-box--width-full mm-box--color-text-default mm-box--background-color-transparent"
@@ -628,7 +628,7 @@ exports[`SendPage render renders correctly 1`] = `
                         class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
                       >
                         <div
-                          class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2"
+                          class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center"
                         >
                           <button
                             class="mm-box mm-text multichain-account-list-item__account-name__button mm-text--body-md-medium mm-text--ellipsis mm-text--text-align-left mm-box--padding-0 mm-box--width-full mm-box--color-text-default mm-box--background-color-transparent"
@@ -756,7 +756,7 @@ exports[`SendPage render renders correctly 1`] = `
                         class="mm-box mm-box--display-flex mm-box--justify-content-space-between"
                       >
                         <div
-                          class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2"
+                          class="mm-box multichain-account-list-item__account-name mm-box--margin-inline-end-2 mm-box--display-flex mm-box--gap-2 mm-box--align-items-center"
                         >
                           <button
                             class="mm-box mm-text multichain-account-list-item__account-name__button mm-text--body-md-medium mm-text--ellipsis mm-text--text-align-left mm-box--padding-0 mm-box--width-full mm-box--color-text-default mm-box--background-color-transparent"