From 6a024cc7a54bab4a54f7314775c8b5313fb1b197 Mon Sep 17 00:00:00 2001 From: Big Boss <bigboss@metalrodeo.xyz> Date: Sun, 30 Jun 2024 20:50:45 -0500 Subject: [PATCH] minor tweaks --- .../app/features/account/settings/SettingsNavLink.tsx | 1 + packages/app/features/account/settings/backup/index.tsx | 9 ++++++--- packages/app/features/account/settings/layout.web.tsx | 3 ++- packages/playwright/tests/deposit.onboarded.spec.ts | 2 +- packages/shovel/bin/shovel.tilt.ts | 4 ++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/app/features/account/settings/SettingsNavLink.tsx b/packages/app/features/account/settings/SettingsNavLink.tsx index c94a06a8b..0433bca8d 100644 --- a/packages/app/features/account/settings/SettingsNavLink.tsx +++ b/packages/app/features/account/settings/SettingsNavLink.tsx @@ -36,6 +36,7 @@ export function SettingsNavLink({ $md={{ fontSize: '$5' }} fontWeight={isActiveRoute ? 'bold' : '300'} color={isActiveRoute ? iconActiveColor : iconInActiveColor} + pl="$4" > {text} </Paragraph> diff --git a/packages/app/features/account/settings/backup/index.tsx b/packages/app/features/account/settings/backup/index.tsx index 613144148..ede7356ac 100644 --- a/packages/app/features/account/settings/backup/index.tsx +++ b/packages/app/features/account/settings/backup/index.tsx @@ -224,7 +224,6 @@ const WebAuthnCred = ({ const link = useLink({ href: `/account/settings/backup/confirm/${cred?.id}`, }) - const isActiveUnsynced = isActive && !onchainSlot // somehow active onchain, but send.app doesn't know about it (strongmind check) return ( <YStack @@ -313,7 +312,7 @@ const WebAuthnCred = ({ }`} </Paragraph> ) - case !isActive || isActiveUnsynced: + case !isActive: return ( <YStack gap={'$size.1.5'} ai="flex-start"> <CardTextBlock @@ -673,7 +672,11 @@ const UpdateKeySlotButton = ({ } if (error) { if (error.code === '23505') { - throw new Error('Key slot already in use, delete the existing key slot and try again.') + throw new Error( + `Key slot ${keySlot + .toString() + .padStart(2, '0')} already in use, delete the existing key slot and try again.` + ) } throw new Error(error.message) } diff --git a/packages/app/features/account/settings/layout.web.tsx b/packages/app/features/account/settings/layout.web.tsx index 610c2616e..4fcbc88dc 100644 --- a/packages/app/features/account/settings/layout.web.tsx +++ b/packages/app/features/account/settings/layout.web.tsx @@ -14,7 +14,7 @@ export type SettingsLayoutProps = { export const SettingsLayout = ({ children }: SettingsLayoutProps) => { return ( - <XStack f={1} pt={'$4'} pb={'$6'}> + <XStack f={1} pt={'$4'}> <YStack backgroundColor="$color1" // this file is web-only so we can safely use CSS @@ -24,6 +24,7 @@ export const SettingsLayout = ({ children }: SettingsLayoutProps) => { width="$14" display="none" $gtLg={{ display: 'flex' }} + py={'$4'} > <YStack width={'100%'} gap={'$4'}> <YStack jc={'space-between'} zIndex={4} flex={1} width={'100%'}> diff --git a/packages/playwright/tests/deposit.onboarded.spec.ts b/packages/playwright/tests/deposit.onboarded.spec.ts index 8f5da7871..0f425936c 100644 --- a/packages/playwright/tests/deposit.onboarded.spec.ts +++ b/packages/playwright/tests/deposit.onboarded.spec.ts @@ -276,6 +276,6 @@ test('can deposit ETH with web3 wallet', async ({ }, }) ).toPass({ - timeout: 5000, + timeout: 10000, }) }) diff --git a/packages/shovel/bin/shovel.tilt.ts b/packages/shovel/bin/shovel.tilt.ts index bf0c06c69..3ac78a596 100644 --- a/packages/shovel/bin/shovel.tilt.ts +++ b/packages/shovel/bin/shovel.tilt.ts @@ -14,7 +14,7 @@ $.verbose = true await $`docker ps -a | grep shovel | awk '{{print $1}}' | xargs -r docker rm -f || true` -await $`docker pull docker.io/indexsupply/shovel:2096 || true` +await $`docker pull docker.io/indexsupply/shovel:1.6 || true` const blockNumber = await $`cast rpc --rpc-url http://127.0.0.1:8546 eth_blockNumber | jq -r . | cast to-dec` @@ -35,7 +35,7 @@ await $`docker run --rm \ -v ${import.meta.dir}/../etc:/etc/shovel \ --entrypoint /usr/local/bin/shovel \ -w /usr/local/bin \ - docker.io/indexsupply/shovel:2096 \ + docker.io/indexsupply/shovel:1.6 \ -l :80 \ ${$.env.SHOVEL_DEBUG === '1' ? '-v' : ''} \ ${$.env.SHOVEL_MIGRATE === '1' ? '' : '-skip-migrate'} \