Merge pull request #512 from 0xsend/bb/handle-unsynced-key-slots

Handle unsynced key slots
0xsend · Jul 1, 2024 · 09f8251 · 09f8251
2 parents bf68cca + 6a024cc
commit 09f8251
Show file tree

Hide file tree

Showing 16 changed files with 330 additions and 101 deletions.
diff --git 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/confirm.tsx b/packages/app/features/account/settings/backup/confirm.tsx
@@ -12,8 +12,8 @@ import { baseMainnetClient, sendAccountAbi, tokenPaymasterAddress } from '@my/wa
 import { useQuery } from '@tanstack/react-query'
 import { SchemaForm } from 'app/utils/SchemaForm'
 import { assert } from 'app/utils/assert'
-import { COSEECDHAtoXY } from 'app/utils/passkeys'
 import { byteaToBytes } from 'app/utils/byteaToBytes'
+import { COSEECDHAtoXY } from 'app/utils/passkeys'
 import { useSendAccount } from 'app/utils/send-accounts/useSendAccounts'
 import { useSupabase } from 'app/utils/supabase/useSupabase'
 import { throwIf } from 'app/utils/throwIf'

diff --git a/packages/app/features/account/settings/backup/create.tsx b/packages/app/features/account/settings/backup/create.tsx
@@ -1,6 +1,6 @@
 import { createPasskey } from '@daimo/expo-passkeys'
 import type { Tables } from '@my/supabase/database-generated.types'
-import { H1, Paragraph, Spinner, SubmitButton, YStack } from '@my/ui'
+import { H1, Paragraph, Shake, Spinner, SubmitButton, YStack } from '@my/ui'
 import {
   baseMainnetClient,
   useReadSendAccountGetActiveSigningKeys,
@@ -104,7 +104,12 @@ const CreatePasskeyForm = ({
           key_slot: keySlot,
         }
       )
-      throwIf(error)
+      if (error) {
+        if (error.code === '23505') {
+          throw new Error('Key slot already in use, delete the existing key slot and try again.')
+        }
+        throw error.message
+      }
       assert(!!webauthnCred, 'Failed to save passkey')
       onPasskeySaved(webauthnCred)
     } catch (e) {
@@ -113,7 +118,7 @@ const CreatePasskeyForm = ({
         e.details?.toString().split('.').at(0) ??
         e.mesage?.split('.').at(0) ??
         e.toString().split('.').at(0)
-      form.setError('accountName', {
+      form.setError('root', {
         type: 'custom',
         message,
       })
@@ -150,15 +155,24 @@ const CreatePasskeyForm = ({
             </Paragraph>
           </YStack>
         )}
-        renderAfter={({ submit }) =>
-          isLoading ? (
-            <Spinner size="small" color={'$color'} />
-          ) : (
-            <SubmitButton mx="auto" px="$6" onPress={submit}>
-              Create Passkey
-            </SubmitButton>
-          )
-        }
+        renderAfter={({ submit }) => (
+          <>
+            {form.formState.errors?.root?.message ? (
+              <Shake>
+                <Paragraph color="red" testID="AccountSendTagScreen">
+                  {form.formState.errors?.root?.message}
+                </Paragraph>
+              </Shake>
+            ) : null}
+            {isLoading ? (
+              <Spinner size="small" color={'$color'} />
+            ) : (
+              <SubmitButton mx="auto" px="$6" onPress={submit}>
+                Create Passkey
+              </SubmitButton>
+            )}
+          </>
+        )}
       >
         {(fields) => <>{Object.values(fields)}</>}
       </SchemaForm>