ekzyis
/
stacker.news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add image fees in calling context

This commit is contained in:
ekzyis 2023-11-02 01:37:18 +01:00
parent 11fa9e4d10
commit 17b39d9982
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/form.js
View File

@ -751,7 +751,14 @@ export function Form ({
const onSubmitInner = useCallback(async (values, ...args) => { const onSubmitInner = useCallback(async (values, ...args) => {
try { try {
if (onSubmit) { if (onSubmit) {
const options = await onSubmit(values, ...args) // extract cost from formik fields
// (cost may also be set in a formik field named 'amount')
let cost = values?.cost || values?.amount
// add potential image fees which are set in a different field
// to differentiate between fees (in receipts for example)
cost += (values?.imageFeesInfo?.totalFees || 0)
const options = await onSubmit(cost, values, ...args)
if (!storageKeyPrefix || options?.keepLocalStorage) return if (!storageKeyPrefix || options?.keepLocalStorage) return
clearLocalStorage(values) clearLocalStorage(values)
} }

6
components/invoice.js
View File

@ -231,11 +231,7 @@ export const useInvoiceable = (onSubmit, options = defaultOptions) => {
// this function will be called before the Form's onSubmit handler is called // this function will be called before the Form's onSubmit handler is called
// and the form must include `cost` or `amount` as a value // and the form must include `cost` or `amount` as a value
const onSubmitWrapper = useCallback(async (formValues, ...submitArgs) => { const onSubmitWrapper = useCallback(async (cost, formValues, ...submitArgs) => {
let { cost, imageFeesInfo, amount } = formValues
cost ??= amount
if (imageFeesInfo?.totalFees) cost += imageFeesInfo.totalFees
// action only allowed if logged in // action only allowed if logged in
if (!me && options.requireSession) { if (!me && options.requireSession) {
throw new Error('you must be logged in') throw new Error('you must be logged in')