Skip to content

Commit 7990eb2

Browse files
vas3avas3a
authored
Merge pull request #1054 from topcoder-platform/PM-1142_reset-tax-forms
PM-1142 reset tax forms
2 parents 5e41ca0 + aae02ec commit 7990eb2

File tree

9 files changed

+49
-52
lines changed

9 files changed

+49
-52
lines changed

‎src/apps/wallet-admin/src/home/tabs/payments/PaymentsTab.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
7676
totalPages: 0,
7777
})
7878
const [editState, setEditState] = React.useState<{
79-
netAmount?: number;
79+
grossAmount?: number;
8080
releaseDate?: Date;
8181
paymentStatus?: string;
8282
auditNote?: string;
@@ -91,7 +91,7 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
9191

9292
const handleValueUpdated = useCallback((updates: {
9393
auditNote?: string,
94-
netAmount?: number,
94+
grossAmount?: number,
9595
paymentStatus?: string,
9696
releaseDate?: Date,
9797
}) => {
@@ -145,10 +145,10 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
145145
description: payment.description,
146146
details: payment.details,
147147
externalId: payment.externalId,
148+
grossAmount: formatCurrency(payment.details[0].grossAmount, payment.details[0].currency),
149+
grossAmountNumber: parseFloat(payment.details[0].grossAmount),
148150
handle: handleMap.get(parseInt(payment.winnerId, 10)) ?? payment.winnerId,
149151
id: payment.id,
150-
netPayment: formatCurrency(payment.details[0].totalAmount, payment.details[0].currency),
151-
netPaymentNumber: parseFloat(payment.details[0].totalAmount),
152152
releaseDate: formattedReleaseDate,
153153
releaseDateObj: releaseDate,
154154
status,
@@ -225,7 +225,7 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
225225
// Send to server only the fields that have changed
226226
const updateObj = {
227227
auditNote: currentEditState.auditNote !== undefined ? currentEditState.auditNote : undefined,
228-
netAmount: currentEditState.netAmount !== undefined ? currentEditState.netAmount : undefined,
228+
grossAmount: currentEditState.grossAmount !== undefined ? currentEditState.grossAmount : undefined,
229229
paymentStatus: currentEditState.paymentStatus !== undefined ? currentEditState.paymentStatus : undefined,
230230
releaseDate: currentEditState.releaseDate !== undefined ? currentEditState.releaseDate : undefined,
231231
}
@@ -255,7 +255,7 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
255255
if (paymentStatus) updates.paymentStatus = paymentStatus
256256
if (paymentStatus !== 'CANCELLED') {
257257
if (updateObj.releaseDate !== undefined) updates.releaseDate = updateObj.releaseDate.toISOString()
258-
if (updateObj.netAmount !== undefined) updates.paymentAmount = updateObj.netAmount
258+
if (updateObj.grossAmount !== undefined) updates.paymentAmount = updateObj.grossAmount
259259
}
260260

261261
toast.success('Updating payment', { position: toast.POSITION.BOTTOM_RIGHT })

‎src/apps/wallet-admin/src/lib/components/payment-edit/PaymentEdit.tsx‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ interface PaymentEditFormProps {
1515
payment: Winning
1616
canSave?: (canSave: boolean) => void
1717
onValueUpdated?: ({
18-
releaseDate, netAmount, paymentStatus, auditNote,
18+
releaseDate, grossAmount, paymentStatus, auditNote,
1919
}: {
2020
releaseDate?: Date
21-
netAmount?: number
21+
grossAmount?: number
2222
paymentStatus?: string
2323
auditNote?: string
2424
}) => void
@@ -27,32 +27,32 @@ interface PaymentEditFormProps {
2727
const PaymentEdit: React.FC<PaymentEditFormProps> = (props: PaymentEditFormProps) => {
2828
const [paymentStatus, setPaymentStatus] = useState('')
2929
const [releaseDate, setReleaseDate] = useState(new Date())
30-
const [netAmount, setNetAmount] = useState(0)
31-
const [netAmountErrorString, setNetAmountErrorString] = useState('')
30+
const [grossAmount, setGrossAmount] = useState(0)
31+
const [grossAmountErrorString, setGrossAmountErrorString] = useState('')
3232
const [auditNote, setAuditNote] = useState('')
3333
const [dirty, setDirty] = useState(false)
3434
const [disableEdits, setDisableEdits] = useState(false)
3535

3636
const initialValues = useMemo(() => ({
3737
auditNote: '',
38-
netPayment: props.payment.netPaymentNumber,
38+
grossAmount: props.payment.grossAmountNumber,
3939
paymentStatus: props.payment.status,
4040
releaseDate: props.payment.releaseDateObj,
4141
}), [props.payment])
4242

43-
const validateNetAmount = (value: number): boolean => {
43+
const validateGrossAmount = (value: number): boolean => {
4444
if (Number.isNaN(value)) {
45-
setNetAmountErrorString('A valid number is required')
45+
setGrossAmountErrorString('A valid number is required')
4646
return false
4747
}
4848

4949
if (value < 0) {
50-
setNetAmountErrorString('Net Payment must be greater than 0')
50+
setGrossAmountErrorString('Payment must be greater than 0')
5151
return false
5252
}
5353

5454
if (!/^\d+(\.\d{0,2})?$/.test(value.toString())) {
55-
setNetAmountErrorString('Amount can only have 2 decimal places at most')
55+
setGrossAmountErrorString('Amount can only have 2 decimal places at most')
5656
return false
5757
}
5858

@@ -63,17 +63,17 @@ const PaymentEdit: React.FC<PaymentEditFormProps> = (props: PaymentEditFormProps
6363
let isValid = true
6464

6565
switch (name) {
66-
case 'netPayment':
67-
isValid = validateNetAmount(value as number)
66+
case 'grossPayment':
67+
isValid = validateGrossAmount(value as number)
6868
if (isValid) {
69-
setNetAmount(value as number)
69+
setGrossAmount(value as number)
7070
if (props.onValueUpdated) {
7171
props.onValueUpdated({
72-
netAmount: value as number,
72+
grossAmount: value as number,
7373
})
7474
}
7575

76-
setNetAmountErrorString('')
76+
setGrossAmountErrorString('')
7777
}
7878

7979
break
@@ -112,13 +112,13 @@ const PaymentEdit: React.FC<PaymentEditFormProps> = (props: PaymentEditFormProps
112112
useEffect(() => {
113113
setPaymentStatus(props.payment.status)
114114
setReleaseDate(props.payment.releaseDateObj)
115-
setNetAmount(props.payment.netPaymentNumber)
115+
setGrossAmount(props.payment.grossAmountNumber)
116116
}, [props.payment])
117117

118118
useEffect(() => {
119119
const valuesToCheck = [{
120-
key: 'netPayment',
121-
value: netAmount,
120+
key: 'grossPayment',
121+
value: grossAmount,
122122
}, {
123123
key: 'paymentStatus',
124124
value: paymentStatus,
@@ -132,16 +132,16 @@ const PaymentEdit: React.FC<PaymentEditFormProps> = (props: PaymentEditFormProps
132132

133133
const isDirty = valuesToCheck.some(x => x.value !== initialValues[x.key as keyof typeof initialValues])
134134
setDirty(isDirty)
135-
}, [netAmount, paymentStatus, releaseDate, auditNote, initialValues])
135+
}, [grossAmount, paymentStatus, releaseDate, auditNote, initialValues])
136136

137137
useEffect(() => {
138138
if (props.canSave) {
139139
if (!dirty) {
140140
props.canSave(false)
141141
} else {
142142
const valuesToCheck = [{
143-
key: 'netPayment',
144-
value: netAmount,
143+
key: 'grossPayment',
144+
value: grossAmount,
145145
}, {
146146
key: 'paymentStatus',
147147
value: paymentStatus,
@@ -151,10 +151,10 @@ const PaymentEdit: React.FC<PaymentEditFormProps> = (props: PaymentEditFormProps
151151
}]
152152

153153
const haveChange = valuesToCheck.some(x => x.value !== initialValues[x.key as keyof typeof initialValues]) // check if any value has changed that's not the audit note
154-
props.canSave(haveChange && netAmountErrorString.length === 0 && auditNote.length > 0)
154+
props.canSave(haveChange && grossAmountErrorString.length === 0 && auditNote.length > 0)
155155
}
156156
}
157-
}, [dirty, auditNote, props, netAmountErrorString.length, netAmount, paymentStatus, releaseDate, initialValues])
157+
}, [dirty, auditNote, props, grossAmountErrorString.length, grossAmount, paymentStatus, releaseDate, initialValues])
158158

159159
const getLink = (externalId: string): string => `${TOPCODER_URL}/challenges/${externalId}`
160160

@@ -198,16 +198,16 @@ const PaymentEdit: React.FC<PaymentEditFormProps> = (props: PaymentEditFormProps
198198
</div>
199199

200200
<InputText
201-
name='netPayment'
202-
label='Net Payment'
201+
name='grossPayment'
202+
label='Gross Payment'
203203
type='number'
204204
disabled={disableEdits}
205-
placeholder='Modify Net Payment'
205+
placeholder='Modify Gross Payment Amount'
206206
dirty
207207
tabIndex={0}
208-
error={netAmountErrorString}
209-
value={props.payment.netPaymentNumber.toString()}
210-
onChange={e => handleInputChange('netPayment', parseFloat(e.target.value))}
208+
error={grossAmountErrorString}
209+
value={props.payment.grossAmountNumber.toString()}
210+
onChange={e => handleInputChange('grossPayment', parseFloat(e.target.value))}
211211

212212
/>
213213
<InputSelect

‎src/apps/wallet-admin/src/lib/components/payment-view/PaymentView.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ const PaymentView: React.FC<PaymentViewProps> = (props: PaymentViewProps) => {
109109
</div>
110110

111111
<div className={styles.infoItem}>
112-
<span className={styles.label}>Net Payment</span>
112+
<span className={styles.label}>Payment</span>
113113
<p className={styles.value}>
114-
{props.payment.netPaymentNumber.toLocaleString(undefined, {
114+
{props.payment.grossAmountNumber.toLocaleString(undefined, {
115115
currency: 'USD',
116116
style: 'currency',
117117
})}

‎src/apps/wallet-admin/src/lib/components/payments-table/PaymentTable.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const PaymentsTable: React.FC<PaymentTableProps> = (props: PaymentTableProps) =>
4040
<th className='body-ultra-small-bold'>HANDLE</th>
4141
<th className='body-ultra-small-bold'>DESCRIPTION</th>
4242
<th className='body-ultra-small-bold'>CREATE DATE</th>
43-
<th className='body-ultra-small-bold'>NET PAYMENT</th>
43+
<th className='body-ultra-small-bold'>PAYMENT</th>
4444
<th className='body-ultra-small-bold'>STATUS</th>
4545
<th className='body-ultra-small-bold'>RELEASE DATE</th>
4646
<th className='body-ultra-small-bold'>DATE PAID</th>
@@ -55,7 +55,7 @@ const PaymentsTable: React.FC<PaymentTableProps> = (props: PaymentTableProps) =>
5555
<td className='body-small-bold'>{payment.handle}</td>
5656
<td className='body-small'>{payment.description}</td>
5757
<td className='body-small-bold'>{payment.createDate}</td>
58-
<td className='body-small-bold'>{payment.netPayment}</td>
58+
<td className='body-small-bold'>{payment.grossAmount}</td>
5959
<td className={`body-small-bold ${styles.capitalize}`}>{payment.status}</td>
6060
<td>{payment.releaseDate}</td>
6161
<td>{payment.datePaid}</td>

‎src/apps/wallet-admin/src/lib/models/WinningDetail.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
export interface PaymentDetail {
22
id: string
3-
netAmount: string
43
grossAmount: string
54
totalAmount: string
65
installmentNumber: number
@@ -16,8 +15,8 @@ export interface Winning {
1615
type: string
1716
handle: string;
1817
createDate: string
19-
netPayment: string
20-
netPaymentNumber: number
18+
grossAmount: string
19+
grossAmountNumber: number
2120
status: string
2221
releaseDate: string
2322
releaseDateObj: Date

‎src/apps/wallet/src/home/tabs/home/HomeTab.tsx‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ const HomeTab: FC<HomeTabProps> = () => {
7575
}
7676
/>
7777

78-
{/* TODO: check trolley integration? */}
7978
{!walletDetails?.withdrawalMethod.isSetupComplete && (
8079
<InfoRow
8180
title='Withdrawal Method'
@@ -93,13 +92,13 @@ const HomeTab: FC<HomeTabProps> = () => {
9392
icon={IconOutline.ArrowRightIcon}
9493
size='md'
9594
link
96-
to='#withdrawal-methods'
95+
to='#payout'
9796
/>
9897
}
9998
/>
10099
)}
101100

102-
{/* {!walletDetails?.taxForm.isSetupComplete && (
101+
{!walletDetails?.taxForm.isSetupComplete && (
103102
<InfoRow
104103
title='Tax Form'
105104
value={walletDetails?.taxForm.isSetupComplete ? 'All set' : <Chip text='Setup Required' />}
@@ -110,11 +109,11 @@ const HomeTab: FC<HomeTabProps> = () => {
110109
icon={IconOutline.ArrowRightIcon}
111110
size='md'
112111
link
113-
to='#tax-forms'
112+
to='#payout'
114113
/>
115114
}
116115
/>
117-
)} */}
116+
)}
118117
</div>
119118
)}
120119
</div>

‎src/apps/wallet/src/home/tabs/winnings/WinningsTab.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
110110
datePaid: payment.details[0].datePaid ? formatIOSDateString(payment.details[0].datePaid) : '-',
111111
description: payment.description,
112112
details: payment.details,
113+
grossPayment: formatCurrency(payment.details[0].totalAmount, payment.details[0].currency),
113114
id: payment.id,
114-
netPayment: formatCurrency(payment.details[0].totalAmount, payment.details[0].currency),
115115
releaseDate: formattedReleaseDate,
116116
status: formatStatus(payment.details[0].status),
117117
type: payment.category.replaceAll('_', ' ')

‎src/apps/wallet/src/lib/components/payments-table/PaymentTable.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const PaymentsTable: React.FC<PaymentTableProps> = (props: PaymentTableProps) =>
8181
}
8282

8383
const calculateTotal = () => Object.values(selectedPayments)
84-
.reduce((acc, payment) => acc + parseFloat(payment.netPayment.replace(/[^0-9.-]+/g, '')), 0)
84+
.reduce((acc, payment) => acc + parseFloat(payment.grossPayment.replace(/[^0-9.-]+/g, '')), 0)
8585

8686
const total = calculateTotal()
8787

@@ -94,7 +94,7 @@ const PaymentsTable: React.FC<PaymentTableProps> = (props: PaymentTableProps) =>
9494
<th className='body-ultra-small-bold'>DESCRIPTION</th>
9595
<th className='body-ultra-small-bold'>TYPE</th>
9696
<th className='body-ultra-small-bold'>CREATE DATE</th>
97-
<th className='body-ultra-small-bold'>NET PAYMENT</th>
97+
<th className='body-ultra-small-bold'>PAYMENT</th>
9898
<th className='body-ultra-small-bold'>STATUS</th>
9999
<th className='body-ultra-small-bold'>RELEASE DATE</th>
100100
<th className='body-ultra-small-bold'>DATE PAID</th>
@@ -118,7 +118,7 @@ const PaymentsTable: React.FC<PaymentTableProps> = (props: PaymentTableProps) =>
118118
<td className='body-small'>{payment.description}</td>
119119
<td className={`body-small-bold ${styles.capitalize}`}>{payment.type}</td>
120120
<td className='body-small-bold'>{payment.createDate}</td>
121-
<td className='body-small-bold'>{payment.netPayment}</td>
121+
<td className='body-small-bold'>{payment.grossPayment}</td>
122122
<td className={`body-small-bold ${styles.capitalize}`}>{payment.status}</td>
123123
<td>{payment.releaseDate}</td>
124124
<td>{payment.datePaid}</td>

‎src/apps/wallet/src/lib/models/WinningDetail.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
export interface PaymentDetail {
22
id: string
3-
netAmount: string
43
grossAmount: string
54
totalAmount: string
65
installmentNumber: number
@@ -14,7 +13,7 @@ export interface Winning {
1413
description: string
1514
type: string
1615
createDate: string
17-
netPayment: string
16+
grossPayment: string
1817
status: string
1918
releaseDate: string
2019
datePaid: string

0 commit comments

Comments
 (0)