api/resolvers/user.js

@@ -628,17 +628,10 @@ export default {
       }
 
       // disable freebies if it hasn't been set yet
-      try {
+      await models.user.update({
-        await models.user.update({
+        where: { id: me.id, disableFreebies: null },
-          where: { id: me.id, disableFreebies: null },
+        data: { disableFreebies: true }
-          data: { disableFreebies: true }
+      })
-        })
-      } catch (err) {
-        // ignore 'record not found' errors
-        if (err.code !== 'P2025') {
-          throw err
-        }
-      }
 
       return true
     },

api/resolvers/wallet.js

@@ -22,20 +22,18 @@ function injectResolvers (resolvers) {
     const resolverName = generateResolverName(w.walletField)
     console.log(resolverName)
 
-    resolvers.Mutation[resolverName] = async (parent, { settings, priorityOnly, ...data }, { me, models }) => {
+    resolvers.Mutation[resolverName] = async (parent, { settings, ...data }, { me, models }) => {
       // allow transformation of the data on validation (this is optional ... won't do anything if not implemented)
-      if (!priorityOnly) {
+      const validData = await walletValidate(w, { ...data, ...settings })
-        const validData = await walletValidate(w, { ...data, ...settings })
+      if (validData) {
-        if (validData) {
+        Object.keys(validData).filter(key => key in data).forEach(key => { data[key] = validData[key] })
-          Object.keys(validData).filter(key => key in data).forEach(key => { data[key] = validData[key] })
+        Object.keys(validData).filter(key => key in settings).forEach(key => { settings[key] = validData[key] })
-          Object.keys(validData).filter(key => key in settings).forEach(key => { settings[key] = validData[key] })
-        }
       }
 
       return await upsertWallet({
         wallet: { field: w.walletField, type: w.walletType },
         testCreateInvoice: (data) => w.testCreateInvoice(data, { me, models })
-      }, { settings, data, priorityOnly }, { me, models })
+      }, { settings, data }, { me, models })
     }
   }
   console.groupEnd()
@@ -573,13 +571,13 @@ export const addWalletLog = async ({ wallet, level, message }, { models }) => {
 }
 
 async function upsertWallet (
-  { wallet, testCreateInvoice }, { settings, data, priorityOnly }, { me, models }) {
+  { wallet, testCreateInvoice }, { settings, data }, { me, models }) {
   if (!me) {
     throw new GraphQLError('you must be logged in', { extensions: { code: 'UNAUTHENTICATED' } })
   }
   assertApiKeyNotPermitted({ me })
 
-  if (testCreateInvoice && !priorityOnly) {
+  if (testCreateInvoice) {
     try {
       await testCreateInvoice(data)
     } catch (err) {

api/typeDefs/wallet.js

@@ -17,7 +17,7 @@ function mutationTypeDefs () {
     args += w.fields
       .filter(isServerField)
       .map(fieldToGqlArg).join(', ')
-    args += ', settings: AutowithdrawSettings!, priorityOnly: Boolean'
+    args += ', settings: AutowithdrawSettings!'
     const resolverName = generateResolverName(w.walletField)
     const typeDef = `${resolverName}(${args}): Boolean`
     console.log(typeDef)

wallets/index.js

@@ -71,7 +71,7 @@ export function useWallet (name) {
   const setPriority = useCallback(async (priority) => {
     if (_isConfigured && priority !== config.priority) {
       try {
-        await saveConfig({ ...config, priority }, { logger, priorityOnly: true })
+        await saveConfig({ ...config, priority }, { logger })
       } catch (err) {
         toaster.danger(`failed to change priority of ${wallet.name} wallet: ${err.message}`)
       }
@@ -161,19 +161,16 @@ function useConfig (wallet) {
   let config = {}
   if (hasClientConfig) config = clientConfig
   if (hasServerConfig) {
-    const { enabled, priority } = config || {}
+    const { enabled } = config || {}
     config = {
       ...config,
       ...serverConfig
     }
     // wallet is enabled if enabled is set in client or server config
     config.enabled ||= enabled
-    // priority might only be set on client or server
-    // ie. if send+recv is available but only one is configured
-    config.priority ||= priority
   }
 
-  const saveConfig = useCallback(async (newConfig, { logger, priorityOnly }) => {
+  const saveConfig = useCallback(async (newConfig, { logger }) => {
     // NOTE:
     //   verifying the client/server configuration before saving it
     //   prevents unsetting just one configuration if both are set.
@@ -192,28 +189,23 @@ function useConfig (wallet) {
       }
 
       if (valid) {
-        if (priorityOnly) {
+        try {
-          setClientConfig(newConfig)
-        } else {
-          try {
           // XXX: testSendPayment can return a new config (e.g. lnc)
-            const newerConfig = await wallet.testSendPayment?.(newConfig, { me, logger })
+          const newerConfig = await wallet.testSendPayment?.(newConfig, { me, logger })
-            if (newerConfig) {
+          if (newerConfig) {
-              newClientConfig = newerConfig
+            newClientConfig = newerConfig
-            }
-          } catch (err) {
-            logger.error(err.message)
-            throw err
           }
-
+        } catch (err) {
-          setClientConfig(newClientConfig)
+          logger.error(err.message)
-          logger.ok(wallet.isConfigured ? 'payment details updated' : 'wallet attached for payments')
+          throw err
-          if (newConfig.enabled) wallet.enablePayments()
-          else wallet.disablePayments()
         }
+
+        setClientConfig(newClientConfig)
+        logger.ok(wallet.isConfigured ? 'payment details updated' : 'wallet attached for payments')
+        if (newConfig.enabled) wallet.enablePayments()
+        else wallet.disablePayments()
       }
     }
-
     if (hasServerConfig) {
       let newServerConfig = extractServerConfig(wallet.fields, newConfig)
 
@@ -224,7 +216,7 @@ function useConfig (wallet) {
         valid = false
       }
 
-      if (valid) await setServerConfig(newServerConfig, { priorityOnly })
+      if (valid) await setServerConfig(newServerConfig)
     }
   }, [hasClientConfig, hasServerConfig, setClientConfig, setServerConfig, wallet])
 
@@ -281,7 +273,7 @@ function useServerConfig (wallet) {
     priority,
     enabled,
     ...config
-  }, { priorityOnly }) => {
+  }) => {
     try {
       const mutation = generateMutation(wallet)
       return await client.mutate({
@@ -294,8 +286,7 @@ function useServerConfig (wallet) {
             autoWithdrawMaxFeePercent: Number(autoWithdrawMaxFeePercent),
             priority,
             enabled
-          },
+          }
-          priorityOnly
         }
       })
     } finally {
@@ -335,13 +326,13 @@ function generateMutation (wallet) {
       }
       return arg
     }).join(', ')
-  headerArgs += ', $settings: AutowithdrawSettings!, $priorityOnly: Boolean'
+  headerArgs += ', $settings: AutowithdrawSettings!'
 
   let inputArgs = 'id: $id, '
   inputArgs += wallet.fields
     .filter(isServerField)
     .map(f => `${f.name}: $${f.name}`).join(', ')
-  inputArgs += ', settings: $settings, priorityOnly: $priorityOnly'
+  inputArgs += ', settings: $settings'
 
   return gql`mutation ${resolverName}(${headerArgs}) {
     ${resolverName}(${inputArgs})