From af16e48ce3b63af4537b8c6fa5f029fb73a30ed5 Mon Sep 17 00:00:00 2001
From: danidfra <danielfilemondev@gmail.com>
Date: Tue, 25 Feb 2025 20:28:27 -0300
Subject: [PATCH 1/4] Implement login button and friendly greeting

---
 .../ui/components/panels/sign-up-panel.tsx    | 43 +++++++++++++------
 src/locales/en.json                           |  2 +
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/features/ui/components/panels/sign-up-panel.tsx b/src/features/ui/components/panels/sign-up-panel.tsx
index d3dbd1c64..ea646a87a 100644
--- a/src/features/ui/components/panels/sign-up-panel.tsx
+++ b/src/features/ui/components/panels/sign-up-panel.tsx
@@ -2,16 +2,15 @@ import { FormattedMessage } from 'react-intl';
 
 import { openModal } from 'soapbox/actions/modals.ts';
 import Button from 'soapbox/components/ui/button.tsx';
+import HStack from 'soapbox/components/ui/hstack.tsx';
 import Stack from 'soapbox/components/ui/stack.tsx';
 import Text from 'soapbox/components/ui/text.tsx';
 import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts';
 import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts';
 import { useFeatures } from 'soapbox/hooks/useFeatures.ts';
-import { useInstance } from 'soapbox/hooks/useInstance.ts';
 import { useRegistrationStatus } from 'soapbox/hooks/useRegistrationStatus.ts';
 
 const SignUpPanel = () => {
-  const { instance } = useInstance();
   const { nostrSignup } = useFeatures();
   const { isOpen } = useRegistrationStatus();
   const me = useAppSelector((state) => state.me);
@@ -19,26 +18,44 @@ const SignUpPanel = () => {
 
   if (me || !isOpen) return null;
 
+  function getGreeting() {
+    const hours = new Date().getHours();
+    return hours < 12 ? 'GM' : 'Hey There';
+  }
+
   return (
     <Stack space={2} data-testid='sign-up-panel'>
       <Stack>
         <Text size='lg' weight='bold'>
-          <FormattedMessage id='signup_panel.title' defaultMessage='New to {site_title}?' values={{ site_title: instance.title }} />
+          <FormattedMessage id='signup_panel.greeting_title' defaultMessage='{greeting}! Welcome aboard!' values={{ greeting: getGreeting() }} />
         </Text>
 
-        <Text theme='muted' size='sm'>
-          <FormattedMessage id='signup_panel.subtitle' defaultMessage="Sign up now to discuss what's happening." />
+        <Text size='sm' theme='muted'>
+          <FormattedMessage id='login_panel.subtitle' defaultMessage='Dive into the best of social media!' />
         </Text>
       </Stack>
 
-      <Button
-        theme='primary'
-        onClick={nostrSignup ? () => dispatch(openModal('NOSTR_SIGNUP')) : undefined}
-        to={nostrSignup ? undefined : '/signup'}
-        block
-      >
-        <FormattedMessage id='account.register' defaultMessage='Sign up' />
-      </Button>
+      <HStack space={2}>
+        <Button
+          theme='tertiary'
+          onClick={nostrSignup ? () => dispatch(openModal('NOSTR_LOGIN')) : undefined}
+          to={nostrSignup ? undefined : '/login'}
+          block
+        >
+          <FormattedMessage id='account.login' defaultMessage='Log in' />
+        </Button>
+
+        <Button
+          theme='primary'
+          onClick={nostrSignup ? () => dispatch(openModal('NOSTR_SIGNUP')) : undefined}
+          to={nostrSignup ? undefined : '/signup'}
+          block
+        >
+          <FormattedMessage id='account.register' defaultMessage='Sign up' />
+        </Button>
+
+      </HStack>
+
     </Stack>
   );
 };
diff --git a/src/locales/en.json b/src/locales/en.json
index aca5adb3c..d4423aeeb 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1467,6 +1467,8 @@
   "settings.settings": "Settings",
   "shared.tos": "Terms of Service",
   "signup_panel.subtitle": "Sign up now to discuss what's happening.",
+  "login_panel.subtitle": "Dive into the best of social media!",
+  "signup_panel.greeting_title": "{greeting}! Welcome aboard!",
   "signup_panel.title": "New to {site_title}?",
   "site_preview.preview": "Preview",
   "soapbox_config.authenticated_profile_hint": "Users must be logged-in to view replies and media on user profiles.",

From 6a76bca7ff7e17327ea2d7430358893f3bd5c777 Mon Sep 17 00:00:00 2001
From: danidfra <danielfilemondev@gmail.com>
Date: Tue, 25 Feb 2025 20:49:38 -0300
Subject: [PATCH 2/4] Remove unnecessary line

---
 src/features/ui/components/panels/sign-up-panel.tsx | 8 ++------
 src/locales/en.json                                 | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/features/ui/components/panels/sign-up-panel.tsx b/src/features/ui/components/panels/sign-up-panel.tsx
index ea646a87a..5d57ab95c 100644
--- a/src/features/ui/components/panels/sign-up-panel.tsx
+++ b/src/features/ui/components/panels/sign-up-panel.tsx
@@ -7,11 +7,9 @@ import Stack from 'soapbox/components/ui/stack.tsx';
 import Text from 'soapbox/components/ui/text.tsx';
 import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts';
 import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts';
-import { useFeatures } from 'soapbox/hooks/useFeatures.ts';
 import { useRegistrationStatus } from 'soapbox/hooks/useRegistrationStatus.ts';
 
 const SignUpPanel = () => {
-  const { nostrSignup } = useFeatures();
   const { isOpen } = useRegistrationStatus();
   const me = useAppSelector((state) => state.me);
   const dispatch = useAppDispatch();
@@ -38,8 +36,7 @@ const SignUpPanel = () => {
       <HStack space={2}>
         <Button
           theme='tertiary'
-          onClick={nostrSignup ? () => dispatch(openModal('NOSTR_LOGIN')) : undefined}
-          to={nostrSignup ? undefined : '/login'}
+          onClick={() => dispatch(openModal('NOSTR_LOGIN'))}
           block
         >
           <FormattedMessage id='account.login' defaultMessage='Log in' />
@@ -47,8 +44,7 @@ const SignUpPanel = () => {
 
         <Button
           theme='primary'
-          onClick={nostrSignup ? () => dispatch(openModal('NOSTR_SIGNUP')) : undefined}
-          to={nostrSignup ? undefined : '/signup'}
+          onClick={() => dispatch(openModal('NOSTR_SIGNUP'))}
           block
         >
           <FormattedMessage id='account.register' defaultMessage='Sign up' />
diff --git a/src/locales/en.json b/src/locales/en.json
index d4423aeeb..8c936729f 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1028,6 +1028,7 @@
   "login_external.errors.instance_fail": "The instance returned an error.",
   "login_external.errors.network_fail": "Connection failed. Is a browser extension blocking it?",
   "login_form.header": "Sign In",
+  "login_panel.subtitle": "Dive into the best of social media!",
   "manage.zap_split.add": "Add",
   "manage.zap_split.add_new_account": "Add New Account",
   "manage.zap_split.fail_request": "Failed to update fees.",
@@ -1466,9 +1467,8 @@
   "settings.sessions": "Active sessions",
   "settings.settings": "Settings",
   "shared.tos": "Terms of Service",
-  "signup_panel.subtitle": "Sign up now to discuss what's happening.",
-  "login_panel.subtitle": "Dive into the best of social media!",
   "signup_panel.greeting_title": "{greeting}! Welcome aboard!",
+  "signup_panel.subtitle": "Sign up now to discuss what's happening.",
   "signup_panel.title": "New to {site_title}?",
   "site_preview.preview": "Preview",
   "soapbox_config.authenticated_profile_hint": "Users must be logged-in to view replies and media on user profiles.",

From a68df6fd1a364f09234e51b6fbe6c900c9be0ab9 Mon Sep 17 00:00:00 2001
From: danidfra <danielfilemondev@gmail.com>
Date: Fri, 28 Feb 2025 20:23:59 -0300
Subject: [PATCH 3/4] Add formatted message

---
 src/features/ui/components/panels/sign-up-panel.tsx | 2 +-
 src/locales/en.json                                 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/features/ui/components/panels/sign-up-panel.tsx b/src/features/ui/components/panels/sign-up-panel.tsx
index 5d57ab95c..2d73f65b4 100644
--- a/src/features/ui/components/panels/sign-up-panel.tsx
+++ b/src/features/ui/components/panels/sign-up-panel.tsx
@@ -18,7 +18,7 @@ const SignUpPanel = () => {
 
   function getGreeting() {
     const hours = new Date().getHours();
-    return hours < 12 ? 'GM' : 'Hey There';
+    return hours < 12 ? <FormattedMessage id='signup_panel.greeting.gm' defaultMessage='GM' /> : <FormattedMessage id='signup_panel.greeting.hey' defaultMessage='Hey there' />;
   }
 
   return (
diff --git a/src/locales/en.json b/src/locales/en.json
index 8c936729f..1a3c75b26 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1467,6 +1467,8 @@
   "settings.sessions": "Active sessions",
   "settings.settings": "Settings",
   "shared.tos": "Terms of Service",
+  "signup_panel.greeting.gm": "GM",
+  "signup_panel.greeting.hey": "Hey there",
   "signup_panel.greeting_title": "{greeting}! Welcome aboard!",
   "signup_panel.subtitle": "Sign up now to discuss what's happening.",
   "signup_panel.title": "New to {site_title}?",

From a1972c8a76b29937a0f817319c9961c4cb5eb0f1 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 2 Mar 2025 13:28:48 -0600
Subject: [PATCH 4/4] Revert cute greeting

---
 .../ui/components/panels/sign-up-panel.tsx    | 19 ++++++++++---------
 src/locales/en.json                           |  4 ----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/features/ui/components/panels/sign-up-panel.tsx b/src/features/ui/components/panels/sign-up-panel.tsx
index 2d73f65b4..878b3b2bb 100644
--- a/src/features/ui/components/panels/sign-up-panel.tsx
+++ b/src/features/ui/components/panels/sign-up-panel.tsx
@@ -7,36 +7,36 @@ import Stack from 'soapbox/components/ui/stack.tsx';
 import Text from 'soapbox/components/ui/text.tsx';
 import { useAppDispatch } from 'soapbox/hooks/useAppDispatch.ts';
 import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts';
+import { useFeatures } from 'soapbox/hooks/useFeatures.ts';
+import { useInstance } from 'soapbox/hooks/useInstance.ts';
 import { useRegistrationStatus } from 'soapbox/hooks/useRegistrationStatus.ts';
 
 const SignUpPanel = () => {
+  const { instance } = useInstance();
+  const { nostrSignup } = useFeatures();
   const { isOpen } = useRegistrationStatus();
   const me = useAppSelector((state) => state.me);
   const dispatch = useAppDispatch();
 
   if (me || !isOpen) return null;
 
-  function getGreeting() {
-    const hours = new Date().getHours();
-    return hours < 12 ? <FormattedMessage id='signup_panel.greeting.gm' defaultMessage='GM' /> : <FormattedMessage id='signup_panel.greeting.hey' defaultMessage='Hey there' />;
-  }
-
   return (
     <Stack space={2} data-testid='sign-up-panel'>
       <Stack>
         <Text size='lg' weight='bold'>
-          <FormattedMessage id='signup_panel.greeting_title' defaultMessage='{greeting}! Welcome aboard!' values={{ greeting: getGreeting() }} />
+          <FormattedMessage id='signup_panel.title' defaultMessage='New to {site_title}?' values={{ site_title: instance.title }} />
         </Text>
 
         <Text size='sm' theme='muted'>
-          <FormattedMessage id='login_panel.subtitle' defaultMessage='Dive into the best of social media!' />
+          <FormattedMessage id='signup_panel.subtitle' defaultMessage="Sign up now to discuss what's happening." />
         </Text>
       </Stack>
 
       <HStack space={2}>
         <Button
           theme='tertiary'
-          onClick={() => dispatch(openModal('NOSTR_LOGIN'))}
+          onClick={nostrSignup ? () => dispatch(openModal('NOSTR_LOGIN')) : undefined}
+          to={nostrSignup ? undefined : '/login'}
           block
         >
           <FormattedMessage id='account.login' defaultMessage='Log in' />
@@ -44,7 +44,8 @@ const SignUpPanel = () => {
 
         <Button
           theme='primary'
-          onClick={() => dispatch(openModal('NOSTR_SIGNUP'))}
+          onClick={nostrSignup ? () => dispatch(openModal('NOSTR_SIGNUP')) : undefined}
+          to={nostrSignup ? undefined : '/signup'}
           block
         >
           <FormattedMessage id='account.register' defaultMessage='Sign up' />
diff --git a/src/locales/en.json b/src/locales/en.json
index 1a3c75b26..aca5adb3c 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1028,7 +1028,6 @@
   "login_external.errors.instance_fail": "The instance returned an error.",
   "login_external.errors.network_fail": "Connection failed. Is a browser extension blocking it?",
   "login_form.header": "Sign In",
-  "login_panel.subtitle": "Dive into the best of social media!",
   "manage.zap_split.add": "Add",
   "manage.zap_split.add_new_account": "Add New Account",
   "manage.zap_split.fail_request": "Failed to update fees.",
@@ -1467,9 +1466,6 @@
   "settings.sessions": "Active sessions",
   "settings.settings": "Settings",
   "shared.tos": "Terms of Service",
-  "signup_panel.greeting.gm": "GM",
-  "signup_panel.greeting.hey": "Hey there",
-  "signup_panel.greeting_title": "{greeting}! Welcome aboard!",
   "signup_panel.subtitle": "Sign up now to discuss what's happening.",
   "signup_panel.title": "New to {site_title}?",
   "site_preview.preview": "Preview",