Merge branch 'PM-959_tc-finance-integration' of github.com:topcoder-platform/platform-ui into PM-959_tc-finance-integration

Author: vas3a

src/apps/wallet-admin/src/home/tabs/WalletAdminTabs.tsx

@@ -7,8 +7,6 @@ import { PageTitle, TabsNavbar, TabsNavItem } from '~/libs/ui'
 import { getHashFromTabId, getTabIdFromHash, WalletAdminTabsConfig, WalletAdminTabViews } from './config'
 import { PaymentsTab } from './payments'
 import { HomeTab } from './home'
-import { TaxFormsTab } from './tax-forms'
-import { PaymentMethodsTab } from './payment-methods'
 import styles from './WalletAdminTabs.module.scss'
 
 interface WalletHomeProps {
@@ -46,10 +44,6 @@ const WalletAdminTabs: FC<WalletHomeProps> = (props: WalletHomeProps) => {
             {activeTab === WalletAdminTabViews.home && <HomeTab profile={props.profile} />}
 
             {activeTab === WalletAdminTabViews.payments && <PaymentsTab profile={props.profile} />}
-
-            {activeTab === WalletAdminTabViews.taxforms && <TaxFormsTab profile={props.profile} />}
-
-            {activeTab === WalletAdminTabViews.withdrawalmethods && <PaymentMethodsTab profile={props.profile} />}
         </div>
     )
 }

src/apps/wallet-admin/src/home/tabs/payment-methods/PaymentMethodsTab.module.scss

@@ -8,13 +8,11 @@ import { Collapsible, ConfirmModal, LoadingCircles } from '~/libs/ui'
 import { UserProfile } from '~/libs/core'
 import { downloadBlob } from '~/libs/shared'
 
-import { editPayment, exportSearchResults, getMemberHandle, getPaymentMethods, getPayments, getTaxForms } from '../../../lib/services/wallet'
+import { editPayment, exportSearchResults, getMemberHandle, getPayments } from '../../../lib/services/wallet'
 import { Winning, WinningDetail } from '../../../lib/models/WinningDetail'
 import { FilterBar, formatIOSDateString, PaymentView } from '../../../lib'
 import { ConfirmFlowData } from '../../../lib/models/ConfirmFlowData'
 import { PaginationInfo } from '../../../lib/models/PaginationInfo'
-import { TaxForm } from '../../../lib/models/TaxForm'
-import { PaymentProvider } from '../../../lib/models/PaymentProvider'
 import PaymentEditForm from '../../../lib/components/payment-edit/PaymentEdit'
 import PaymentsTable from '../../../lib/components/payments-table/PaymentTable'
 
@@ -76,7 +74,7 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
         totalPages: 0,
     })
     const [editState, setEditState] = React.useState<{
-        netAmount?: number;
+        grossAmount?: number;
         releaseDate?: Date;
         paymentStatus?: string;
         auditNote?: string;
@@ -91,7 +89,7 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
 
     const handleValueUpdated = useCallback((updates: {
         auditNote?: string,
-        netAmount?: number,
+        grossAmount?: number,
         paymentStatus?: string,
         releaseDate?: Date,
     }) => {
@@ -102,7 +100,7 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
     }, [])
 
     const convertToWinnings = useCallback(
-        (payments: WinningDetail[], handleMap: Map<number, string>, userHasTaxFormSetup: Map<string, boolean>, userHasPaymentProvider: Map<string, boolean>): ReadonlyArray<Winning> => payments.map(payment => {
+        (payments: WinningDetail[], handleMap: Map<number, string>): ReadonlyArray<Winning> => payments.map(payment => {
             const now = new Date()
             const releaseDate = new Date(payment.releaseDate)
             const diffMs = releaseDate.getTime() - now.getTime()
@@ -129,9 +127,9 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
             }
 
             if (status === 'ON_HOLD') {
-                if (!userHasTaxFormSetup.get(payment.winnerId)) {
+                if (!payment.paymentStatus?.taxFormSetupComplete) {
                     status = 'On Hold (Tax Form)'
-                } else if (!userHasPaymentProvider.get(payment.winnerId)) {
+                } else if (!payment.paymentStatus?.payoutSetupComplete) {
                     status = 'On Hold (Payment Provider)'
                 } else {
                     status = 'On Hold (Member)'
@@ -145,10 +143,10 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
                 description: payment.description,
                 details: payment.details,
                 externalId: payment.externalId,
+                grossAmount: formatCurrency(payment.details[0].grossAmount, payment.details[0].currency),
+                grossAmountNumber: parseFloat(payment.details[0].grossAmount),
                 handle: handleMap.get(parseInt(payment.winnerId, 10)) ?? payment.winnerId,
                 id: payment.id,
-                netPayment: formatCurrency(payment.details[0].totalAmount, payment.details[0].currency),
-                netPaymentNumber: parseFloat(payment.details[0].totalAmount),
                 releaseDate: formattedReleaseDate,
                 releaseDateObj: releaseDate,
                 status,
@@ -169,30 +167,8 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
             const payments = await getPayments(pagination.pageSize, (pagination.currentPage - 1) * pagination.pageSize, filters)
             const winnerIds = payments.winnings.map(winning => winning.winnerId)
 
-            const onHoldUserIds = payments.winnings
-                .filter(winning => winning.details[0].status === 'ON_HOLD')
-                .map(winning => winning.winnerId)
-
-            const userHasTaxFormSetup: Map<string, boolean> = new Map()
-            const userHasPaymentProvider: Map<string, boolean> = new Map()
-
-            try {
-                const missingTaxForms = await getTaxForms(100, 0, onHoldUserIds)
-                const missingPaymentProviders = await getPaymentMethods(100, 0, onHoldUserIds)
-
-                missingTaxForms.forms.forEach((form: TaxForm) => {
-                    userHasTaxFormSetup.set(form.userId, form.status === 'ACTIVE')
-                })
-
-                missingPaymentProviders.paymentMethods.forEach((method: PaymentProvider) => {
-                    userHasPaymentProvider.set(method.userId, method.status === 'CONNECTED')
-                })
-            } catch (err) {
-                // Ignore errors
-            }
-
             const handleMap = await getMemberHandle(winnerIds)
-            const winningsData = convertToWinnings(payments.winnings, handleMap, userHasTaxFormSetup, userHasPaymentProvider)
+            const winningsData = convertToWinnings(payments.winnings, handleMap)
             setWinnings(winningsData)
             setPagination(payments.pagination)
         } catch (apiError) {
@@ -225,7 +201,7 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
         // Send to server only the fields that have changed
         const updateObj = {
             auditNote: currentEditState.auditNote !== undefined ? currentEditState.auditNote : undefined,
-            netAmount: currentEditState.netAmount !== undefined ? currentEditState.netAmount : undefined,
+            grossAmount: currentEditState.grossAmount !== undefined ? currentEditState.grossAmount : undefined,
             paymentStatus: currentEditState.paymentStatus !== undefined ? currentEditState.paymentStatus : undefined,
             releaseDate: currentEditState.releaseDate !== undefined ? currentEditState.releaseDate : undefined,
         }
@@ -255,7 +231,7 @@ const ListView: FC<ListViewProps> = (props: ListViewProps) => {
         if (paymentStatus) updates.paymentStatus = paymentStatus
         if (paymentStatus !== 'CANCELLED') {
             if (updateObj.releaseDate !== undefined) updates.releaseDate = updateObj.releaseDate.toISOString()
-            if (updateObj.netAmount !== undefined) updates.paymentAmount = updateObj.netAmount
+            if (updateObj.grossAmount !== undefined) updates.paymentAmount = updateObj.grossAmount
         }
 
         toast.success('Updating payment', { position: toast.POSITION.BOTTOM_RIGHT })