From 0d9fed0f132ac8aa9354a082f4959aa28afac659 Mon Sep 17 00:00:00 2001
From: Ganesh Suresh Patra <ganesh.patra@consensys.net>
Date: Wed, 19 Nov 2025 12:56:06 +0530
Subject: [PATCH 1/2] fix: added support link to unlock page

---
 .../__snapshots__/unlock-page.test.js.snap    | 23 +++++-
 ui/pages/unlock-page/index.scss               |  6 +-
 ui/pages/unlock-page/unlock-page.component.js | 71 ++++++++++---------
 ui/pages/unlock-page/unlock-page.container.js |  5 +-
 4 files changed, 66 insertions(+), 39 deletions(-)

diff --git a/ui/pages/unlock-page/__snapshots__/unlock-page.test.js.snap b/ui/pages/unlock-page/__snapshots__/unlock-page.test.js.snap
index 5ee430871ab4..ad35fafe3b63 100644
--- a/ui/pages/unlock-page/__snapshots__/unlock-page.test.js.snap
+++ b/ui/pages/unlock-page/__snapshots__/unlock-page.test.js.snap
@@ -16,7 +16,7 @@ exports[`Unlock Page should match snapshot 1`] = `
           class="mm-box unlock-page__mascot-container mm-box--margin-bottom-0"
         >
           <svg
-            class="unlock-page__mascot-container__horizontal-logo"
+            class="unlock-page__mascot-container__horizontal-logo "
             fill="none"
             height="30"
             viewBox="0 0 696 344"
@@ -58,12 +58,31 @@ exports[`Unlock Page should match snapshot 1`] = `
           Unlock
         </button>
         <button
-          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--margin-bottom-6 mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+          class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--margin-bottom-4 mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
           data-testid="unlock-forgot-password-button"
           type="button"
         >
           Forgot password?
         </button>
+        <p
+          class="mm-box mm-text mm-text--body-md mm-box--color-text-default"
+        >
+          <span>
+             
+            Need help? Contact 
+            <a
+              class="mm-box mm-text mm-button-base mm-button-link mm-button-link--size-auto mm-text--body-md-medium mm-box--padding-0 mm-box--padding-right-0 mm-box--padding-left-0 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-default mm-box--background-color-transparent"
+              href="https://support.metamask.io"
+              rel="noopener noreferrer"
+              target="_blank"
+              type="button"
+            >
+              MetaMask support
+            </a>
+            
+             
+          </span>
+        </p>
       </div>
     </form>
   </div>
diff --git a/ui/pages/unlock-page/index.scss b/ui/pages/unlock-page/index.scss
index 16250fb456ff..a29e271b61f3 100644
--- a/ui/pages/unlock-page/index.scss
+++ b/ui/pages/unlock-page/index.scss
@@ -24,12 +24,12 @@
     }
 
     &__horizontal-logo {
-      margin-bottom: 60px;
+      margin-bottom: 24px;
       width: 180px;
       height: 180px;
 
-      @include design-system.screen-md-max {
-        margin-bottom: 48px;
+      &--popup {
+        margin-bottom: 0px;
       }
     }
 
diff --git a/ui/pages/unlock-page/unlock-page.component.js b/ui/pages/unlock-page/unlock-page.component.js
index 981fae1ded09..3ab9a8713c0e 100644
--- a/ui/pages/unlock-page/unlock-page.component.js
+++ b/ui/pages/unlock-page/unlock-page.component.js
@@ -123,6 +123,10 @@ class UnlockPage extends Component {
      * Reset Wallet
      */
     resetWallet: PropTypes.func,
+    /**
+     * Indicates if the environment is a popup
+     */
+    isPopup: PropTypes.bool,
   };
 
   state = {
@@ -553,7 +557,9 @@ class UnlockPage extends Component {
               {isRehydrationFlow ? (
                 this.renderMascot()
               ) : (
-                <MetaFoxHorizontalLogo className="unlock-page__mascot-container__horizontal-logo" />
+                <MetaFoxHorizontalLogo
+                  className={`unlock-page__mascot-container__horizontal-logo ${this.props.isPopup ? 'unlock-page__mascot-container__horizontal-logo--popup' : ''}`}
+                />
               )}
               {isBeta() ? (
                 <Text
@@ -626,7 +632,7 @@ class UnlockPage extends Component {
               key="import-account"
               type="button"
               onClick={this.onForgotPasswordOrLoginWithDiffMethods}
-              marginBottom={6}
+              marginBottom={4}
               color={
                 isRehydrationFlow
                   ? TextColor.textDefault
@@ -638,38 +644,37 @@ class UnlockPage extends Component {
                 : t('forgotPassword')}
             </Button>
 
-            {isRehydrationFlow && (
-              <Text>
-                {t('needHelp', [
-                  <Button
-                    variant={ButtonVariant.Link}
-                    href={SUPPORT_LINK}
-                    type="button"
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    key="need-help-link"
-                    onClick={() => {
-                      this.context.trackEvent(
-                        {
-                          category: MetaMetricsEventCategory.Navigation,
-                          event: MetaMetricsEventName.SupportLinkClicked,
-                          properties: {
-                            url: SUPPORT_LINK,
-                          },
+            <Text variant={TextVariant.bodyMd} color={TextColor.textDefault}>
+              {t('needHelp', [
+                <Button
+                  variant={ButtonVariant.Link}
+                  color={TextColor.primaryDefault}
+                  href={SUPPORT_LINK}
+                  type="button"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  key="need-help-link"
+                  onClick={() => {
+                    this.context.trackEvent(
+                      {
+                        category: MetaMetricsEventCategory.Navigation,
+                        event: MetaMetricsEventName.SupportLinkClicked,
+                        properties: {
+                          url: SUPPORT_LINK,
                         },
-                        {
-                          contextPropsIntoEventProperties: [
-                            MetaMetricsContextProp.PageTitle,
-                          ],
-                        },
-                      );
-                    }}
-                  >
-                    {needHelpText}
-                  </Button>,
-                ])}
-              </Text>
-            )}
+                      },
+                      {
+                        contextPropsIntoEventProperties: [
+                          MetaMetricsContextProp.PageTitle,
+                        ],
+                      },
+                    );
+                  }}
+                >
+                  {needHelpText}
+                </Button>,
+              ])}
+            </Text>
           </Box>
         </Box>
         {!isTestEnvironment && !isRehydrationFlow && (
diff --git a/ui/pages/unlock-page/unlock-page.container.js b/ui/pages/unlock-page/unlock-page.container.js
index f2a9273d76f5..06277fbe28b7 100644
--- a/ui/pages/unlock-page/unlock-page.container.js
+++ b/ui/pages/unlock-page/unlock-page.container.js
@@ -65,11 +65,13 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
     ...restOwnProps
   } = ownProps;
 
+  const isPopup = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP;
+
   const onImport = async () => {
     await propsMarkPasswordForgotten();
     navigate(RESTORE_VAULT_ROUTE);
 
-    if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) {
+    if (isPopup) {
       global.platform.openExtensionInBrowser?.(RESTORE_VAULT_ROUTE);
     }
   };
@@ -96,6 +98,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
     navigate,
     location,
     navState,
+    isPopup,
   };
 };
 

From dbb93e8278861eea28d5c4815ecfc1c1b117efcd Mon Sep 17 00:00:00 2001
From: Ganesh Suresh Patra <ganesh.patra@consensys.net>
Date: Wed, 19 Nov 2025 13:22:56 +0530
Subject: [PATCH 2/2] fix: updated style lint

---
 ui/pages/unlock-page/index.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/pages/unlock-page/index.scss b/ui/pages/unlock-page/index.scss
index a29e271b61f3..20f7db020852 100644
--- a/ui/pages/unlock-page/index.scss
+++ b/ui/pages/unlock-page/index.scss
@@ -29,7 +29,7 @@
       height: 180px;
 
       &--popup {
-        margin-bottom: 0px;
+        margin-bottom: 0;
       }
     }