Create new wallets from templates

Author: ekzyis

wallets/client/components/forms.js

@@ -123,10 +123,12 @@ function WalletProtocolSelector ({ wallet }) {
 function WalletProtocolForm ({ wallet }) {
   const sendRecvParam = useSendRecvParam()
   const protocolParam = useWalletProtocolParam()
+  const router = useRouter()
+  const isUserWallet = wallet.__typename === 'UserWallet'
 
   const send = sendRecvParam === 'send'
   let protocol = wallet.protocols.find(p => p.name === protocolParam && p.send === send)
-  if (!protocol && wallet.__typename === 'UserWallet') {
+  if (!protocol && isUserWallet) {
     protocol = wallet.template.protocols.find(p => p.name === protocolParam && p.send === send)
   }
   if (!protocol) {
@@ -142,9 +144,15 @@ function WalletProtocolForm ({ wallet }) {
   const { fields, initial, schema } = useProtocolForm(protocol)
 
   const onSubmit = useCallback(async values => {
-    await upsertWalletProtocol(values)
-    toaster.success('wallet saved')
-  }, [upsertWalletProtocol, toaster])
+    const wallet = await upsertWalletProtocol(values)
+    if (isUserWallet) {
+      toaster.success('wallet saved')
+      return
+    }
+    // we just created a new user wallet from a template
+    router.replace(`/wallets/${wallet.id}/${sendRecvParam}`, null, { shallow: true })
+    toaster.success('wallet attached', { persistOnNavigate: true })
+  }, [upsertWalletProtocol, toaster, isUserWallet, router])
 
   return (
     <Form
@@ -156,7 +164,7 @@ function WalletProtocolForm ({ wallet }) {
       {fields.map(field => <WalletProtocolFormField key={field.name} {...field} />)}
       <div className='d-flex justify-content-end'>
         <CancelButton>cancel</CancelButton>
-        <SubmitButton variant='primary'>save</SubmitButton>
+        <SubmitButton variant='primary'>{isUserWallet ? 'save' : 'attach'}</SubmitButton>
       </div>
     </Form>
   )

wallets/client/hooks/query.js

@@ -52,15 +52,15 @@ export function useWalletProtocolMutation (wallet, protocol) {
 
     const encrypted = await encryptConfig(values)
 
-    const { data } = await mutate({
-      variables: {
-        // TODO(wallet-v2): use template id if no wallet id is provided
-        walletId: wallet.id,
-        ...encrypted
-      }
-    })
-
-    return data
+    const variables = encrypted
+    if (wallet.__typename === 'WalletTemplate') {
+      variables.templateId = wallet.id
+    } else {
+      variables.walletId = wallet.id
+    }
+
+    const { data } = await mutate({ variables })
+    return Object.values(data)[0]
   }, [mutate, encryptConfig])
 }
 

wallets/server/resolvers/protocol.js

@@ -80,9 +80,19 @@ function upsertWalletProtocol (protocol) {
 
     const dataFragment = toFragment(args)
 
-    if (walletId) {
-      const [userWallet] = await models.$transaction([
-        models.userWallet.update({
+    return await models.$transaction(
+      async tx => {
+        if (templateId) {
+          const { id: newWalletId } = await tx.userWallet.create({
+            data: {
+              templateId: Number(templateId),
+              userId: me.id
+            }
+          })
+          walletId = newWalletId
+        }
+
+        const userWallet = await tx.userWallet.update({
           where: {
             id: Number(walletId),
             // this makes sure that users can only update their own wallets
@@ -91,32 +101,39 @@ function upsertWalletProtocol (protocol) {
           },
           data: {
             protocols: {
-              update: {
+              upsert: {
                 where: {
                   ProtocolWallet_walletId_send_protocol_key: {
                     walletId: Number(walletId),
                     send: protocol.send,
                     protocol: protocol.name
                   }
                 },
-                data: {
+                update: {
                   [relation]: {
                     update: dataFragment
                   }
+                },
+                create: {
+                  send: protocol.send,
+                  protocol: protocol.name,
+                  [relation]: {
+                    create: dataFragment
+                  }
                 }
               }
             }
           },
           include: {
             protocols: true
           }
-        }),
+        })
         // XXX Prisma seems to run the vault update AFTER the update of the table that points to it
         //   which means our trigger to set the jsonb column in the ProtocolWallet table does not see
         //   the updated vault entry.
         //   To fix this, we run a protocol wallet update to force the trigger to run again.
         // TODO(wallet-v2): fix this in a better way?
-        models.protocolWallet.update({
+        tx.protocolWallet.update({
           where: {
             ProtocolWallet_walletId_send_protocol_key: {
               walletId: Number(walletId),
@@ -132,11 +149,8 @@ function upsertWalletProtocol (protocol) {
             }
           }
         })
-      ])
-
-      return mapUserWalletResolveTypes(userWallet)
-    }
 
-    // TODO(wallet-v2): create new wallet from template
+        return mapUserWalletResolveTypes(userWallet)
+      })
   }
 }