diff --git a/src/components/General/CreateAvatar/CreateAvatar.tsx b/src/components/General/CreateAvatar/CreateAvatar.tsx index 7ae6c0f1..794c56b7 100644 --- a/src/components/General/CreateAvatar/CreateAvatar.tsx +++ b/src/components/General/CreateAvatar/CreateAvatar.tsx @@ -44,7 +44,7 @@ const CreateAvatar = () => { Device Avatar - +
{selectedEmoji ? ( { return ( {arrowLeft && } { return ( - + {VALIDATOR_TABS_RIGHT_SIDEBAR.map(tab => ( {tab} diff --git a/src/components/General/ValidatorNameAddress.tsx b/src/components/General/ValidatorNameAddress.tsx index 28030f8d..7f894d06 100644 --- a/src/components/General/ValidatorNameAddress.tsx +++ b/src/components/General/ValidatorNameAddress.tsx @@ -38,7 +38,7 @@ const ValidatorNameAddress = ({ } return ( - + Validator {name} diff --git a/src/pages/Dashboard/BalanceChartCard/BalanceChartCard.tsx b/src/pages/Dashboard/BalanceChartCard/BalanceChartCard.tsx index ac715ccc..439486c4 100644 --- a/src/pages/Dashboard/BalanceChartCard/BalanceChartCard.tsx +++ b/src/pages/Dashboard/BalanceChartCard/BalanceChartCard.tsx @@ -48,11 +48,7 @@ const BalanceChartCard = () => { Balance - setIsCalendarVisible(true)} - > + 24,273 @@ -76,7 +72,6 @@ const BalanceChartCard = () => { /> )} setIsCalendarVisible(prev => !prev)} style={{ border: '2px solid #09101C14', height: 'fit-content', @@ -85,6 +80,7 @@ const BalanceChartCard = () => { cursor: 'pointer', }} space={'$2'} + onPress={() => setIsCalendarVisible(prev => !prev)} > {dateRange?.from @@ -100,7 +96,6 @@ const BalanceChartCard = () => { - diff --git a/src/pages/Dashboard/DashboardContent.tsx b/src/pages/Dashboard/DashboardContent.tsx index 1b3091fb..94b78a6d 100644 --- a/src/pages/Dashboard/DashboardContent.tsx +++ b/src/pages/Dashboard/DashboardContent.tsx @@ -21,7 +21,7 @@ const DashboardContent = ({ windowWidth }: DashboardContentProps) => { return ( { Device Uptime - setIsCalendarVisible(true)} - > + 24,273 @@ -52,7 +48,6 @@ const DeviceUptime = () => { setIsCalendarVisible(prev => !prev)} style={{ border: '2px solid #09101C14', height: 'fit-content', @@ -60,6 +55,7 @@ const DeviceUptime = () => { borderRadius: '10px', cursor: 'pointer', }} + onPress={() => setIsCalendarVisible(prev => !prev)} > {dateRange?.from diff --git a/src/pages/DeviceHealthCheck/DeviceHealthCheck.tsx b/src/pages/DeviceHealthCheck/DeviceHealthCheck.tsx index 3a33362d..c8eef68c 100644 --- a/src/pages/DeviceHealthCheck/DeviceHealthCheck.tsx +++ b/src/pages/DeviceHealthCheck/DeviceHealthCheck.tsx @@ -2,6 +2,7 @@ import { useSelector } from 'react-redux' import { Stack, XStack, YStack } from 'tamagui' import { CloseCircleIcon } from '@status-im/icons' import { Button, InformationBox } from '@status-im/components' +import type { Property } from 'csstype' import PageWrapperShadow from '../../components/PageWrappers/PageWrapperShadow' import NimbusLogo from '../../components/Logos/NimbusLogo' @@ -22,8 +23,12 @@ const DeviceHealthCheck = () => { const breakpoint = 768 const responsiveStyle = { - flexWrap: windowSize.width <= breakpoint ? 'wrap' : 'nowrap', - flexDirection: windowSize.width <= breakpoint ? 'column' : 'row', + flexWrap: (windowSize.width <= breakpoint + ? 'wrap' + : 'nowrap') as Property.FlexWrap, + flexDirection: (windowSize.width <= breakpoint + ? 'column' + : 'row') as Property.FlexDirection, alignItems: 'flex-start', width: windowSize.width <= breakpoint ? '200%' : '100%', } @@ -47,13 +52,13 @@ const DeviceHealthCheck = () => { subtitle="Configure your device to start Staking on Nimbus" isAdvancedSettings={true} /> - + - + { { }} className={'transparent-scrollbar'} > - + {timer} diff --git a/src/pages/ValidatorManagement/ManageValidator/DepositStatus.tsx b/src/pages/ValidatorManagement/ManageValidator/DepositStatus.tsx index e099db4e..ad09cb75 100644 --- a/src/pages/ValidatorManagement/ManageValidator/DepositStatus.tsx +++ b/src/pages/ValidatorManagement/ManageValidator/DepositStatus.tsx @@ -22,10 +22,12 @@ const depositStatusData = [ const DepositStatus = () => { return ( { return ( - + diff --git a/src/pages/ValidatorManagement/ManageValidator/ManageValidator.tsx b/src/pages/ValidatorManagement/ManageValidator/ManageValidator.tsx index 35ab4a07..a51a5946 100644 --- a/src/pages/ValidatorManagement/ManageValidator/ManageValidator.tsx +++ b/src/pages/ValidatorManagement/ManageValidator/ManageValidator.tsx @@ -15,7 +15,7 @@ import Footer from './Footer' const ManageValidator = () => { return ( - +
diff --git a/src/pages/ValidatorManagement/ManageValidator/ManageValidatorTable/ValidatorDataTabs.tsx b/src/pages/ValidatorManagement/ManageValidator/ManageValidatorTable/ValidatorDataTabs.tsx index cd8df930..494d518c 100644 --- a/src/pages/ValidatorManagement/ManageValidator/ManageValidatorTable/ValidatorDataTabs.tsx +++ b/src/pages/ValidatorManagement/ManageValidator/ManageValidatorTable/ValidatorDataTabs.tsx @@ -25,7 +25,7 @@ const ValidatorDataTabs = () => { maxWidth={'120px'} style={{ cursor: 'pointer', margin: '8px 0' }} > - + {MANAGE_VALIDATOR_TABS.map((tab, index) => ( {tab} diff --git a/src/pages/ValidatorManagement/ManageValidator/ValidatorBalance.tsx b/src/pages/ValidatorManagement/ManageValidator/ValidatorBalance.tsx index a897ff9a..b1490e5a 100644 --- a/src/pages/ValidatorManagement/ManageValidator/ValidatorBalance.tsx +++ b/src/pages/ValidatorManagement/ManageValidator/ValidatorBalance.tsx @@ -5,10 +5,12 @@ import Icon from '../../../components/General/Icon' const ValidatorBalance = () => { return ( { minWidth: '100px', }} space={'$4'} - onClick={() => {}} + onPress={() => {}} > diff --git a/src/pages/ValidatorManagement/ManagementTabs.tsx b/src/pages/ValidatorManagement/ManagementTabs.tsx index 6eb6d7a7..17dcc018 100644 --- a/src/pages/ValidatorManagement/ManagementTabs.tsx +++ b/src/pages/ValidatorManagement/ManagementTabs.tsx @@ -20,7 +20,7 @@ const ManagementTabs = () => { maxWidth={'120px'} style={{ cursor: 'pointer', margin: '8px 0' }} > - + {VALIDATOR_TABS_MANAGEMENT.map(tab => ( {tab} diff --git a/src/pages/ValidatorManagement/ValidatorManagementContent.tsx b/src/pages/ValidatorManagement/ValidatorManagementContent.tsx index f37ade5b..01936074 100644 --- a/src/pages/ValidatorManagement/ValidatorManagementContent.tsx +++ b/src/pages/ValidatorManagement/ValidatorManagementContent.tsx @@ -10,7 +10,7 @@ const ValidatorManagementContent = () => { return ( { { { return ( - + {title} diff --git a/src/pages/ValidatorOnboarding/ClientSetup/WithdrawalAddress.tsx b/src/pages/ValidatorOnboarding/ClientSetup/WithdrawalAddress.tsx index fbd62f4b..45adfc52 100644 --- a/src/pages/ValidatorOnboarding/ClientSetup/WithdrawalAddress.tsx +++ b/src/pages/ValidatorOnboarding/ClientSetup/WithdrawalAddress.tsx @@ -6,6 +6,7 @@ import { } from '@status-im/components' import { ClearIcon, CloseCircleIcon } from '@status-im/icons' import { useState } from 'react' +import { NativeSyntheticEvent, TextInputFocusEventData } from 'react-native' import { isAddress } from 'web3-validator' type WithdrawalAddressProps = { @@ -22,11 +23,12 @@ const WithdrawalAddress = ({ title }: WithdrawalAddressProps) => { const removeWithdrawalAddressHandler = () => { setWithdrawalAddress('') } - const checkAddress = (e: any) => { + const checkAddress = (e: NativeSyntheticEvent) => { if (e.nativeEvent.text.length !== 0) { setIsValidAddress(isAddress(e.nativeEvent.text)) } } + return ( @@ -55,13 +57,13 @@ const WithdrawalAddress = ({ title }: WithdrawalAddressProps) => { } + icon={} /> {!isValidAddress && ( } + icon={} /> )} diff --git a/src/pages/ValidatorOnboarding/Deposit/ConnectedWallet.tsx b/src/pages/ValidatorOnboarding/Deposit/ConnectedWallet.tsx index faf26e08..1a6febd8 100644 --- a/src/pages/ValidatorOnboarding/Deposit/ConnectedWallet.tsx +++ b/src/pages/ValidatorOnboarding/Deposit/ConnectedWallet.tsx @@ -52,7 +52,7 @@ const ConnectedWallet = () => { {getFormattedWalletAddress(address)} - + Connected diff --git a/src/pages/ValidatorOnboarding/KeyGeneration/KeystoreFiles/KeystoreBackupsCard.tsx b/src/pages/ValidatorOnboarding/KeyGeneration/KeystoreFiles/KeystoreBackupsCard.tsx index 7c036e9f..04e3aea6 100644 --- a/src/pages/ValidatorOnboarding/KeyGeneration/KeystoreFiles/KeystoreBackupsCard.tsx +++ b/src/pages/ValidatorOnboarding/KeyGeneration/KeystoreFiles/KeystoreBackupsCard.tsx @@ -19,7 +19,7 @@ const KeystoreBackupsCard = () => { padding: '9px 16px', cursor: 'pointer', }} - onClick={downloadKeyFilesHandler} + onPress={downloadKeyFilesHandler} > Download Keystore Backups diff --git a/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryPhrase.tsx b/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryPhrase.tsx index 8cc4f723..ca9985b4 100644 --- a/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryPhrase.tsx +++ b/src/pages/ValidatorOnboarding/KeyGeneration/RecoveryPhrase.tsx @@ -71,7 +71,7 @@ const RecoveryPhrase = ({ isKeystoreFiles }: RecoveryPhraseProps) => { paddingRight: '18px', paddingLeft: '18px', }} - onClick={copyRecoveryPhraseHandler} + onPress={copyRecoveryPhraseHandler} >
{ alignItems="center" space="$3" cursor={buttonState !== 'disabled' ? 'pointer' : 'default'} - onClick={() => buttonState !== 'disabled' && handleNavigateBack()} + onPress={() => buttonState !== 'disabled' && handleNavigateBack()} onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave} > diff --git a/src/pages/ValidatorOnboarding/ValidatorSetup/ValidatorSetup/ExecClientCard.tsx b/src/pages/ValidatorOnboarding/ValidatorSetup/ValidatorSetup/ExecClientCard.tsx index c03bcfcb..66d2bdc6 100644 --- a/src/pages/ValidatorOnboarding/ValidatorSetup/ValidatorSetup/ExecClientCard.tsx +++ b/src/pages/ValidatorOnboarding/ValidatorSetup/ValidatorSetup/ExecClientCard.tsx @@ -35,7 +35,7 @@ const ExecClientCard = ({ name, icon, isComingSoon }: ExecClientCardProps) => { minWidth: '150px', }} space={'$8'} - onClick={() => { + onPress={() => { dispatch(selectClient(name)) }} > diff --git a/tokens.ts b/tokens.ts index d3cea639..e04c1600 100644 --- a/tokens.ts +++ b/tokens.ts @@ -1,10 +1,10 @@ import { customisation } from '@status-im/colors' import { createTokens } from '@tamagui/core' import { size, space, zIndex } from '@tamagui/themes' -import { ColorTokens } from 'tamagui'; +import { ColorTokens } from 'tamagui' type ColorObject = { - [key: string]: ColorTokens; + [key: string]: ColorTokens } export const tokens = createTokens({ @@ -206,7 +206,7 @@ export const tokens = createTokens({ }) // eslint-disable-next-line @typescript-eslint/no-explicit-any -export const colorsTyped: ColorObject = tokens.color as { [key: string]: any }; +export const colorsTyped: ColorObject = tokens.color as { [key: string]: any } type GetTokenString = A extends string | number ? `$${A}` : `$${string}` type RadiusTokens = GetTokenString | number