Merge branch 'dev' of https://github.com/efdevcon/monorepo into dev

efdevcon · Oct 30, 2024 · 704f6be · 704f6be
2 parents 51c3d8f + 7ede317
commit 704f6be
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/devcon-api/src/controllers/account.ts b/devcon-api/src/controllers/account.ts
@@ -176,7 +176,7 @@ async function Token(req: any, res: Response) {
     if (isEmail) {
       const cta = update ? 'Confirm email' : 'Login using magic link'
       const magiclink = update
-        ? `${req.headers.origin || API_INFO.website}/settings/email?token=${nonce}`
+        ? `${req.headers.origin || API_INFO.website}/account/email?token=${nonce}`
         : `${req.headers.origin || API_INFO.website}/login?token=${nonce}`
 
       await sendMail(identifier, 'email-cta', `${nonce} is your Devcon verification code`, {

diff --git a/devcon-app/src/components/domain/app/account/Settings.tsx b/devcon-app/src/components/domain/app/account/Settings.tsx
@@ -60,7 +60,7 @@ export default function SettingsPage() {
       <div data-type="settings-layout" className={cn('flex flex-row lg:gap-3 relative')}>
         <div className={cn('basis-[60%] grow')}>
           <div className="flex flex-col lg:border lg:border-solid lg:border-[#E4E6EB] rounded-3xl relative">
-            <div className="flex flex-col gap-3 pb-4 lg:px-4 mt-4">
+            <div className="flex flex-col gap-3 pb-4 px-4 mt-4">
               <div className={css['alert']}>
                 {error && (
                   <Alert title="Error" color="orange">

diff --git a/devcon-app/src/components/domain/app/account/settings/Email.tsx b/devcon-app/src/components/domain/app/account/settings/Email.tsx
@@ -85,7 +85,7 @@ export default function EmailSettings() {
       <div data-type="settings-layout" className={cn('flex flex-row lg:gap-3 relative')}>
         <div className={cn('basis-[60%] grow')}>
           <div className="flex flex-col lg:border lg:border-solid lg:border-[#E4E6EB] rounded-3xl relative">
-            <div className="flex flex-col gap-3 pb-4 lg:px-4">
+            <div className="flex flex-col gap-3 pb-4 px-4">
               <div className={css['alert']}>
                 {error && (
                   <Alert title="Error" color="orange">

diff --git a/devcon-app/src/components/domain/app/account/settings/Profile.tsx b/devcon-app/src/components/domain/app/account/settings/Profile.tsx
@@ -119,7 +119,7 @@ export default function ProfileSettings() {
       <div data-type="settings-layout" className={cn('flex flex-row lg:gap-3 relative')}>
         <div className={cn('basis-[60%] grow')}>
           <div className="flex flex-col lg:border lg:border-solid lg:border-[#E4E6EB] rounded-3xl relative">
-            <div className="flex flex-col gap-3 pb-4 lg:px-4">
+            <div className="flex flex-col gap-3 pb-4 px-4">
               <div className={css['alert']}>
                 {error && (
                   <Alert title="Error" color="orange">

diff --git a/devcon-app/src/components/domain/app/account/settings/Username.tsx b/devcon-app/src/components/domain/app/account/settings/Username.tsx
@@ -38,7 +38,7 @@ export default function UsernameSettings() {
       <div data-type="settings-layout" className={cn('flex flex-row lg:gap-3 relative')}>
         <div className={cn('basis-[60%] grow')}>
           <div className="flex flex-col lg:border lg:border-solid lg:border-[#E4E6EB] rounded-3xl relative">
-            <div className="flex flex-col gap-3 pb-4 lg:px-4">
+            <div className="flex flex-col gap-3 pb-4 px-4">
               <div className={css['alert']}>
                 {error && (
                   <Alert title="Error" color="orange">

diff --git a/devcon-app/src/components/domain/app/account/settings/Wallet.tsx b/devcon-app/src/components/domain/app/account/settings/Wallet.tsx
@@ -93,7 +93,7 @@ export default function WalletSettings() {
       <div data-type="settings-layout" className={cn('flex flex-row lg:gap-3 relative')}>
         <div className={cn('basis-[60%] grow')}>
           <div className="flex flex-col lg:border lg:border-solid lg:border-[#E4E6EB] rounded-3xl relative">
-            <div className="flex flex-col gap-3 pb-4 lg:px-4">
+            <div className="flex flex-col gap-3 pb-4 px-4">
               <div className={css['alert']}>
                 {error && (
                   <Alert title="Error" color="orange">