feat: add setting to dismiss prompt to enable smart contract

app/scripts/controllers/preferences-controller.test.ts

@@ -708,6 +708,7 @@ describe('preferences controller', () => {
         hideZeroBalanceTokens: false,
         petnamesEnabled: true,
         shouldShowAggregatedBalancePopover: true,
+        dismissSmartAccountSuggestionEnabled: false,
         featureNotificationsEnabled: false,
         showConfirmationAdvancedDetails: false,
         showMultiRpcModal: false,
@@ -736,6 +737,7 @@ describe('preferences controller', () => {
         petnamesEnabled: true,
         privacyMode: false,
         shouldShowAggregatedBalancePopover: true,
+        dismissSmartAccountSuggestionEnabled: false,
         featureNotificationsEnabled: false,
         showConfirmationAdvancedDetails: true,
         showMultiRpcModal: false,

app/scripts/controllers/preferences-controller.ts

@@ -106,6 +106,7 @@ export type Preferences = {
   };
   tokenNetworkFilter: Record<string, boolean>;
   shouldShowAggregatedBalancePopover: boolean;
+  dismissSmartAccountSuggestionEnabled: boolean;
 };
 
 // Omitting properties that already exist in the PreferencesState, as part of the preferences property.
@@ -201,6 +202,7 @@ export const getDefaultPreferencesControllerState =
       showMultiRpcModal: false,
       privacyMode: false,
       shouldShowAggregatedBalancePopover: true, // by default user should see popover;
+      dismissSmartAccountSuggestionEnabled: false,
       tokenSortConfig: {
         key: 'tokenFiatAmount',
         order: 'dsc',

app/scripts/lib/transaction/eip5792.test.ts

@@ -90,6 +90,8 @@ describe('EIP-5792', () => {
     Parameters<typeof processSendCalls>[0]['validateSecurity']
   >;
 
+  let getDismissSmartAccountSuggestionEnabledMock: jest.MockedFn<() => boolean>;
+
   let messenger: EIP5792Messenger;
 
   beforeEach(() => {
@@ -100,6 +102,7 @@ describe('EIP-5792', () => {
     getNetworkClientByIdMock = jest.fn();
     getDisabledAccountUpgradeChainsMock = jest.fn();
     validateSecurityMock = jest.fn();
+    getDismissSmartAccountSuggestionEnabledMock = jest.fn();
 
     messenger = new Messenger();
 
@@ -133,6 +136,8 @@ describe('EIP-5792', () => {
           addTransactionBatch: addTransactionBatchMock,
           getDisabledAccountUpgradeChains: getDisabledAccountUpgradeChainsMock,
           validateSecurity: validateSecurityMock,
+          getDismissSmartAccountSuggestionEnabled:
+            getDismissSmartAccountSuggestionEnabledMock,
         },
         messenger,
         SEND_CALLS_MOCK,
@@ -157,6 +162,8 @@ describe('EIP-5792', () => {
             getDisabledAccountUpgradeChains:
               getDisabledAccountUpgradeChainsMock,
             validateSecurity: validateSecurityMock,
+            getDismissSmartAccountSuggestionEnabled:
+              getDismissSmartAccountSuggestionEnabledMock,
           },
           messenger,
           SEND_CALLS_MOCK,
@@ -173,6 +180,8 @@ describe('EIP-5792', () => {
             getDisabledAccountUpgradeChains:
               getDisabledAccountUpgradeChainsMock,
             validateSecurity: validateSecurityMock,
+            getDismissSmartAccountSuggestionEnabled:
+              getDismissSmartAccountSuggestionEnabledMock,
           },
           messenger,
           { ...SEND_CALLS_MOCK, version: '2.0' },
@@ -189,6 +198,8 @@ describe('EIP-5792', () => {
             getDisabledAccountUpgradeChains:
               getDisabledAccountUpgradeChainsMock,
             validateSecurity: validateSecurityMock,
+            getDismissSmartAccountSuggestionEnabled:
+              getDismissSmartAccountSuggestionEnabledMock,
           },
           messenger,
           { ...SEND_CALLS_MOCK, chainId: CHAIN_ID_2_MOCK },
@@ -209,6 +220,30 @@ describe('EIP-5792', () => {
             getDisabledAccountUpgradeChains:
               getDisabledAccountUpgradeChainsMock,
             validateSecurity: validateSecurityMock,
+            getDismissSmartAccountSuggestionEnabled:
+              getDismissSmartAccountSuggestionEnabledMock,
+          },
+          messenger,
+          SEND_CALLS_MOCK,
+          REQUEST_MOCK,
+        ),
+      ).rejects.toThrow(
+        `EIP-5792 is not supported for this chain and account - Chain ID: ${CHAIN_ID_MOCK}, Account: ${SEND_CALLS_MOCK.from}`,
+      );
+    });
+
+    it('throws if user enabled preference to dismiss option to upgrade account', async () => {
+      getDismissSmartAccountSuggestionEnabledMock.mockReturnValue(true);
+
+      await expect(
+        processSendCalls(
+          {
+            addTransactionBatch: addTransactionBatchMock,
+            getDisabledAccountUpgradeChains:
+              getDisabledAccountUpgradeChainsMock,
+            validateSecurity: validateSecurityMock,
+            getDismissSmartAccountSuggestionEnabled:
+              getDismissSmartAccountSuggestionEnabledMock,
           },
           messenger,
           SEND_CALLS_MOCK,
@@ -227,6 +262,8 @@ describe('EIP-5792', () => {
             getDisabledAccountUpgradeChains:
               getDisabledAccountUpgradeChainsMock,
             validateSecurity: validateSecurityMock,
+            getDismissSmartAccountSuggestionEnabled:
+              getDismissSmartAccountSuggestionEnabledMock,
           },
           messenger,
           {
@@ -250,6 +287,8 @@ describe('EIP-5792', () => {
             getDisabledAccountUpgradeChains:
               getDisabledAccountUpgradeChainsMock,
             validateSecurity: validateSecurityMock,
+            getDismissSmartAccountSuggestionEnabled:
+              getDismissSmartAccountSuggestionEnabledMock,
           },
           messenger,
           {

app/scripts/lib/transaction/eip5792.ts

@@ -37,6 +37,7 @@ export async function processSendCalls(
       request: ValidateSecurityRequest,
       chainId: Hex,
     ) => Promise<void>;
+    getDismissSmartAccountSuggestionEnabled: () => boolean;
   },
   messenger: EIP5792Messenger,
   params: SendCalls,
@@ -46,6 +47,7 @@ export async function processSendCalls(
     addTransactionBatch,
     getDisabledAccountUpgradeChains,
     validateSecurity: validateSecurityHook,
+    getDismissSmartAccountSuggestionEnabled,
   } = hooks;
 
   const { calls, from } = params;
@@ -58,8 +60,15 @@ export async function processSendCalls(
   ).configuration.chainId;
 
   const disabledChains = getDisabledAccountUpgradeChains();
-
-  validateSendCalls(params, dappChainId, disabledChains);
+  const dismissSmartAccountSuggestionEnabled =
+    getDismissSmartAccountSuggestionEnabled();
+
+  validateSendCalls(
+    params,
+    dappChainId,
+    disabledChains,
+    dismissSmartAccountSuggestionEnabled,
+  );
 
   const securityAlertId = generateSecurityAlertId();
   const validateSecurity = validateSecurityHook.bind(null, securityAlertId);
@@ -127,11 +136,17 @@ function validateSendCalls(
   sendCalls: SendCalls,
   dappChainId: Hex,
   disabledChains: Hex[],
+  dismissSmartAccountSuggestionEnabled: boolean,
 ) {
   validateSendCallsVersion(sendCalls);
   validateSendCallsChainId(sendCalls, dappChainId);
   validateCapabilities(sendCalls);
-  validateUserDisabled(sendCalls, disabledChains, dappChainId);
+  validateUserDisabled(
+    sendCalls,
+    disabledChains,
+    dappChainId,
+    dismissSmartAccountSuggestionEnabled,
+  );
 }
 
 function validateSendCallsVersion(sendCalls: SendCalls) {
@@ -188,11 +203,12 @@ function validateUserDisabled(
   sendCalls: SendCalls,
   disabledChains: Hex[],
   dappChainId: Hex,
+  dismissSmartAccountSuggestionEnabled: boolean,
 ) {
   const { from } = sendCalls;
   const isDisabled = disabledChains.includes(dappChainId);
 
-  if (isDisabled) {
+  if (isDisabled || dismissSmartAccountSuggestionEnabled) {
     throw rpcErrors.methodNotSupported(
       `EIP-5792 is not supported for this chain and account - Chain ID: ${dappChainId}, Account: ${from}`,
     );

app/scripts/metamask-controller.js

@@ -2008,6 +2008,9 @@ export default class MetamaskController extends EventEmitter {
               updateSecurityAlertResponse:
                 this.updateSecurityAlertResponse.bind(this),
             }),
+          getDismissSmartAccountSuggestionEnabled: () =>
+            this.preferencesController.state.preferences
+              .dismissSmartAccountSuggestionEnabled,
         },
         this.controllerMessenger,
       ),

ui/pages/settings/advanced-tab/__snapshots__/advanced-tab.component.test.js.snap

@@ -66,6 +66,74 @@ exports[`AdvancedTab Component should match snapshot 1`] = `
         </div>
       </div>
     </div>
+    <div
+      class="mm-box settings-page__content-row mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--justify-content-space-between"
+      data-testid="advanced-setting-dismiss-smart-account-suggestion-enabled"
+    >
+      <div
+        class="settings-page__content-item"
+      >
+        <span>
+
+          Dismiss "Switch to Smart Account" suggestion
+        </span>
+        <div
+          class="settings-page__content-description"
+        >
+          Turn this on to no longer see the "Switch to Smart Account" suggestion on any account. Smart accounts unlocks faster transactions, lower network fees and more flexibility on payment for those.
+        </div>
+      </div>
+      <div
+        class="settings-page__content-item-col"
+      >
+        <label
+          class="toggle-button toggle-button--off"
+          tabindex="0"
+        >
+          <div
+            style="display: flex; width: 52px; align-items: center; justify-content: flex-start; position: relative; cursor: pointer; background-color: transparent; border: 0px; padding: 0px; user-select: none;"
+          >
+            <div
+              style="width: 40px; height: 24px; padding: 0px; border-radius: 26px; display: flex; align-items: center; justify-content: center; background-color: rgb(133, 139, 154);"
+            >
+              <div
+                style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgb(250, 250, 250); margin-top: auto; margin-bottom: auto; line-height: 0; opacity: 0; width: 26px; height: 20px; left: 4px;"
+              />
+              <div
+                style="font-size: 11px; display: flex; align-items: center; justify-content: center; font-family: 'Helvetica Neue', Helvetica, sans-serif; position: relative; color: rgba(255, 255, 255, 0.6); bottom: 0px; margin-top: auto; margin-bottom: auto; padding-right: 5px; line-height: 0; width: 26px; height: 20px; opacity: 1;"
+              />
+            </div>
+            <div
+              style="position: absolute; height: 100%; top: 0px; left: 0px; display: flex; flex: 1; align-self: stretch; align-items: center; justify-content: flex-start;"
+            >
+              <div
+                style="width: 18px; height: 18px; display: flex; align-self: center; box-shadow: var(--shadow-size-xs) var(--color-shadow-default); border-radius: 50%; box-sizing: border-box; position: relative; background-color: rgb(255, 255, 255); left: 3px;"
+              />
+            </div>
+            <input
+              data-testid="settings-page-dismiss-smart-account-suggestion-enabled-toggle"
+              style="border: 0px; height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px;"
+              type="checkbox"
+              value="false"
+            />
+          </div>
+          <div
+            class="toggle-button__status"
+          >
+            <span
+              class="toggle-button__label-off"
+            >
+              Off
+            </span>
+            <span
+              class="toggle-button__label-on"
+            >
+              On
+            </span>
+          </div>
+        </label>
+      </div>
+    </div>
     <div
       class="mm-box settings-page__content-row mm-box--display-flex mm-box--gap-4 mm-box--flex-direction-row mm-box--justify-content-space-between"
       data-testid="advanced-setting-enable-smart-transactions"

ui/pages/settings/advanced-tab/advanced-tab.component.js

@@ -58,6 +58,8 @@ export default class AdvancedTab extends PureComponent {
     setShowExtensionInFullSizeView: PropTypes.func.isRequired,
     manageInstitutionalWallets: PropTypes.bool,
     setManageInstitutionalWallets: PropTypes.func.isRequired,
+    dismissSmartAccountSuggestionEnabled: PropTypes.bool.isRequired,
+    setDismissSmartAccountSuggestionEnabled: PropTypes.func.isRequired,
   };
 
   state = {
@@ -205,6 +207,46 @@ export default class AdvancedTab extends PureComponent {
     );
   }
 
+  renderToggleDismissSmartAccountSuggestion() {
+    const { t } = this.context;
+    const {
+      dismissSmartAccountSuggestionEnabled,
+      setDismissSmartAccountSuggestionEnabled,
+    } = this.props;
+
+    return (
+      <Box
+        ref={this.settingsRefs[2]}
+        className="settings-page__content-row"
+        data-testid="advanced-setting-dismiss-smart-account-suggestion-enabled"
+        display={Display.Flex}
+        flexDirection={FlexDirection.Row}
+        justifyContent={JustifyContent.spaceBetween}
+        gap={4}
+      >
+        <div className="settings-page__content-item">
+          <span> {t('dismissSmartAccountSuggestionEnabledTitle')}</span>
+          <div className="settings-page__content-description">
+            {t('dismissSmartAccountSuggestionEnabledDescription')}
+          </div>
+        </div>
+
+        <div className="settings-page__content-item-col">
+          <ToggleButton
+            value={dismissSmartAccountSuggestionEnabled}
+            onToggle={(oldValue) => {
+              const newValue = !oldValue;
+              setDismissSmartAccountSuggestionEnabled(newValue);
+            }}
+            offLabel={t('off')}
+            onLabel={t('on')}
+            dataTestId="settings-page-dismiss-smart-account-suggestion-enabled-toggle"
+          />
+        </div>
+      </Box>
+    );
+  }
+
   renderToggleStxOptIn() {
     const { t } = this.context;
     const { smartTransactionsEnabled, setSmartTransactionsEnabled } =
@@ -593,6 +635,7 @@ export default class AdvancedTab extends PureComponent {
         ) : null}
         {this.renderStateLogs()}
         {this.renderResetAccount()}
+        {this.renderToggleDismissSmartAccountSuggestion()}
         {this.renderToggleStxOptIn()}
         {this.renderHexDataOptIn()}
         {this.renderShowConversionInTestnets()}