Merge pull request #12 from CityOfZion/CU-86dta8xm4

CU-86dta8xm4 - NEON3 - Send Screen - General fixes
CityOfZion · Apr 26, 2024 · aa663f6 · aa663f6
2 parents 8a5663c + b22e8f1
commit aa663f6
Show file tree

Hide file tree

Showing 29 changed files with 993 additions and 681 deletions.
diff --git a/src/renderer/src/@types/hooks.ts b/src/renderer/src/@types/hooks.ts
@@ -15,7 +15,6 @@ export type TUseActionsActionState<T> = {
   changed: TUseActionsChanged<T>
   hasActed: boolean
 }
-export type TUseActionsKeysMatching<T, V> = { [K in keyof T]: T[K] extends V ? K : never }[keyof T]
 
 export type TUseImportActionInputType = 'key' | 'mnemonic' | 'encrypted' | 'address'
 

diff --git a/src/renderer/src/@types/i18next-resources.d.ts b/src/renderer/src/@types/i18next-resources.d.ts
@@ -736,7 +736,6 @@ interface Resources {
       addressInputHint: 'Enter recipient address...'
       totalFee: 'Total fee'
       sendNow: 'Send Now'
-      invalidAddress: 'Invalid address'
       selectAccountModal: {
         title: 'Select a source account'
         selectSourceAccount: 'Select source account'
@@ -752,6 +751,8 @@ interface Resources {
       }
       error: {
         decryptKey: 'Error to decrypt key'
+        invalidAddress: 'Invalid address'
+        insufficientFunds: 'Insufficient funds'
       }
       transactionCompleted: 'Transaction completed'
       transactionFailed: 'Transaction failed'

diff --git a/src/renderer/src/components/Table.tsx b/src/renderer/src/components/Table.tsx
@@ -35,15 +35,20 @@ const HeaderRow = forwardRef<HTMLTableRowElement, HTMLAttributes<HTMLTableRowEle
 
 type TBodyRowProps = {
   hoverable?: boolean
+  active?: boolean
 }
 
 const BodyRow = forwardRef<HTMLTableRowElement, HTMLAttributes<HTMLTableRowElement> & TBodyRowProps>(
-  ({ className, hoverable = true, ...props }, ref) => (
+  ({ className, hoverable = true, active = false, ...props }, ref) => (
     <tr
       ref={ref}
       className={StyleHelper.mergeStyles(
-        'transition-colors even:bg-gray-300/15',
-        { 'hover:border-neon hover:bg-gray-900/50 border-l-2 border-transparent': hoverable },
+        'transition-colors',
+        {
+          'even:bg-gray-300/15': !active,
+          'hover:border-neon hover:bg-gray-900/50 border-l-2 border-transparent': hoverable && !active,
+          'border-neon bg-gray-900/50 border-l-2': active,
+        },
         className
       )}
       {...props}

diff --git a/src/renderer/src/components/TokenBalanceList.tsx b/src/renderer/src/components/TokenBalanceList.tsx