Merge pull request #182 from CityOfZion/CU-86duf5a56-1

CU-86duf5a56 - NEON3 - Onboarding - UX Improvements
CityOfZion · Sep 18, 2024 · ec90593 · ec90593
2 parents 8054267 + e9bf331
commit ec90593
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/renderer/src/routes/pages/NeonAccountPage/CardLink.tsx b/src/renderer/src/routes/pages/NeonAccountPage/CardLink.tsx
@@ -1,19 +1,18 @@
 import { ReactNode } from 'react'
-import { Link } from 'react-router-dom'
+import { Link, LinkProps } from 'react-router-dom'
 
 type TProps = {
   title: string
   text: ReactNode
-  to: string
   icon: ReactNode
-}
+} & LinkProps
 
-export const CardLink = ({ title, text, icon, to }: TProps) => (
+export const CardLink = ({ title, text, icon, ...props }: TProps) => (
   <Link
     className={
       'flex gap-x-4 items-center border border-gray-300/15 focus:border-gray-300 hover:border-gray-300 rounded text-xs text-white focus:bg-gray-700/60 hover:bg-gray-700/60 p-4 transition-colors'
     }
-    to={to}
+    {...props}
   >
     <div className={'text-neon text-2xl'}>{icon}</div>
     <div className={'flex flex-col gap-y-1'}>

diff --git a/src/renderer/src/routes/pages/NeonAccountPage/index.tsx b/src/renderer/src/routes/pages/NeonAccountPage/index.tsx
@@ -46,6 +46,7 @@ export const NeonAccountPage = () => {
           <li>
             <CardLink
               to={'/welcome-import-wallet/1'}
+              state={{ isMigration: true }}
               title={t('cardLinks.migrateFromNeon2.title')}
               icon={<TbPackageExport aria-hidden={true} />}
               text={

diff --git a/src/renderer/src/routes/pages/Welcome/ImportWallet/Step3.tsx b/src/renderer/src/routes/pages/Welcome/ImportWallet/Step3.tsx
@@ -207,14 +207,16 @@ export const WelcomeImportWalletStep3Page = () => {
           onClick={fileActions.handleBrowse}
         />
 
-        {!fileActions.actionData.path && !fileActions.actionState.errors.path && (
-          <Banner type="warning" message={t('neon2Warning')} className="my-3" />
+        {state.isMigration && !fileActions.actionData.path && !fileActions.actionState.errors.path && (
+          <Banner type="warning" message={t('neon2Warning')} className="mt-9" />
         )}
 
-        {fileActions.actionState.errors.path && <Banner type="warning" message={t('importError')} className="my-3" />}
+        {state.isMigration && fileActions.actionState.errors.path && (
+          <Banner type="warning" message={t('importError')} className="mt-10" />
+        )}
 
-        {fileActions.actionData.path && !fileActions.actionState.errors.path && (
-          <Banner type="success" message={t('importSuccess')} className="my-3" />
+        {state.isMigration && fileActions.actionData.path && !fileActions.actionState.errors.path && (
+          <Banner type="success" message={t('importSuccess')} className="mt-10" />
         )}
 
         <Button