fix: removed connection removal modal from home page

Author: lwin-kyaw

app/scripts/metamask-controller.actions.test.js

@@ -835,10 +835,7 @@ describe('MetaMaskController', function () {
         // We now need the Snap keyring after unlocking the wallet.
         jest.spyOn(metamaskController, 'getSnapKeyring').mockReturnValue({});
 
-        const syncAndUnlockResult =
-          await metamaskController.syncPasswordAndUnlockWallet(password);
-
-        expect(syncAndUnlockResult).toBe(true);
+        await metamaskController.syncPasswordAndUnlockWallet(password);
         expect(keyringSubmitPwdSpy).toHaveBeenCalled();
         expect(seedlessSubmitPwdSpy).toHaveBeenCalled();
       });

ui/ducks/app/app.ts

@@ -132,7 +132,6 @@ type AppState = {
   errorInSettings: string | null;
   showNewSrpAddedToast: boolean;
   showPasswordChangeToast: PasswordChangeToastType | null;
-  showConnectionsRemovedModal: boolean;
   showCopyAddressToast: boolean;
   showClaimSubmitToast: ClaimSubmitToastType | null;
   shieldEntryModal?: {
@@ -243,7 +242,6 @@ const initialState: AppState = {
   showCopyAddressToast: false,
   showClaimSubmitToast: null,
   showSupportDataConsentModal: false,
-  showConnectionsRemovedModal: false,
 };
 
 export default function reduceApp(
@@ -799,11 +797,6 @@ export default function reduceApp(
         showSupportDataConsentModal: action.payload,
       };
 
-    case actionConstants.SET_SHOW_CONNECTIONS_REMOVED:
-      return {
-        ...appState,
-        showConnectionsRemovedModal: action.value,
-      };
     case actionConstants.SET_SHOW_SHIELD_ENTRY_MODAL_ONCE:
       return {
         ...appState,

ui/pages/home/home.component.js

@@ -68,7 +68,6 @@ import { AccountOverview } from '../../components/multichain/account-overview';
 import { setEditedNetwork } from '../../store/actions';
 import { navigateToConfirmation } from '../confirmations/hooks/useConfirmationNavigation';
 import PasswordOutdatedModal from '../../components/app/password-outdated-modal';
-import ConnectionsRemovedModal from '../../components/app/connections-removed-modal';
 import ShieldEntryModal from '../../components/app/shield-entry-modal';
 ///: BEGIN:ONLY_INCLUDE_IF(build-beta)
 import BetaHomeFooter from './beta/beta-home-footer.component';
@@ -169,7 +168,6 @@ export default class Home extends PureComponent {
     setAccountDetailsAddress: PropTypes.func,
     isSeedlessPasswordOutdated: PropTypes.bool,
     isPrimarySeedPhraseBackedUp: PropTypes.bool,
-    showConnectionsRemovedModal: PropTypes.bool,
     showShieldEntryModal: PropTypes.bool,
     isSocialLoginFlow: PropTypes.bool,
     lookupSelectedNetworks: PropTypes.func.isRequired,
@@ -866,7 +864,6 @@ export default class Home extends PureComponent {
       showUpdateModal,
       isSeedlessPasswordOutdated,
       isPrimarySeedPhraseBackedUp,
-      showConnectionsRemovedModal,
       showShieldEntryModal,
       isSocialLoginFlow,
     } = this.props;
@@ -934,7 +931,6 @@ export default class Home extends PureComponent {
           {showTermsOfUse ? (
             <TermsOfUsePopup onAccept={this.onAcceptTermsOfUse} />
           ) : null}
-          {showConnectionsRemovedModal && <ConnectionsRemovedModal />}
           {showShieldEntryModal && <ShieldEntryModal />}
           {isPopup && !connectedStatusPopoverHasBeenShown
             ? this.renderPopover()

ui/pages/home/home.container.js

@@ -28,7 +28,6 @@ import {
   getEditedNetwork,
   selectPendingApprovalsForNavigation,
   getShowUpdateModal,
-  getShowConnectionsRemovedModal,
   getIsSocialLoginFlow,
   getShowShieldEntryModal,
   getPendingShieldCohort,
@@ -192,7 +191,6 @@ const mapStateToProps = (state) => {
     redirectAfterDefaultPage,
     isSeedlessPasswordOutdated: getIsSeedlessPasswordOutdated(state),
     isPrimarySeedPhraseBackedUp: getIsPrimarySeedPhraseBackedUp(state),
-    showConnectionsRemovedModal: getShowConnectionsRemovedModal(state),
     showShieldEntryModal: getShowShieldEntryModal(state),
     isSocialLoginFlow: getIsSocialLoginFlow(state),
     pendingShieldCohort: getPendingShieldCohort(state),

ui/selectors/selectors.js

@@ -289,10 +289,6 @@ export function getKeyringSnapRemovalResult(state) {
 
 export const getPendingTokens = (state) => state.appState.pendingTokens;
 
-export function getShowConnectionsRemovedModal(state) {
-  return state.appState.showConnectionsRemovedModal;
-}
-
 export function getShowShieldEntryModal(state) {
   return state.appState.shieldEntryModal?.show;
 }

ui/store/actionConstants.ts

@@ -196,7 +196,5 @@ export const SET_SHOW_CLAIM_SUBMIT_TOAST = 'SET_SHOW_CLAIM_SUBMIT_TOAST';
 export const SET_SHOW_SUPPORT_DATA_CONSENT_MODAL =
   'SET_SHOW_SUPPORT_DATA_CONSENT_MODAL';
 
-export const SET_SHOW_CONNECTIONS_REMOVED = 'SET_SHOW_CONNECTIONS_REMOVED';
-
 export const SET_SHOW_SHIELD_ENTRY_MODAL_ONCE =
   'SET_SHOW_SHIELD_ENTRY_MODAL_ONCE';

ui/store/actions.ts

@@ -856,16 +856,11 @@ export function tryUnlockMetamask(
       callBackgroundMethod(
         'syncPasswordAndUnlockWallet',
         [password],
-        (error, isPasswordSynced) => {
+        (error) => {
           if (error) {
             reject(error);
             return;
           }
-          // if password is not synced show connections removal warning to user.
-          if (!isPasswordSynced) {
-            dispatch(setShowConnectionsRemovedModal(true));
-          }
-
           resolve();
         },
       );
@@ -2488,15 +2483,6 @@ export function unlockSucceeded(message?: string) {
   };
 }
 
-export function setShowConnectionsRemovedModal(
-  showConnectionsRemovedModal: boolean,
-) {
-  return {
-    type: actionConstants.SET_SHOW_CONNECTIONS_REMOVED,
-    value: showConnectionsRemovedModal,
-  };
-}
-
 export function updateMetamaskState(
   patches: Patch[],
 ): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {