improve types for wallet details

Author: vas3a

src/api/wallet/wallet.controller.ts

@@ -10,7 +10,10 @@ import { Role } from 'src/core/auth/auth.constants';
 import { Roles, User } from 'src/core/auth/decorators';
 import { UserInfo } from 'src/dto/user.type';
 import { ResponseDto, ResponseStatusType } from 'src/dto/api-response.dto';
-import { WalletDetailDto, walletDetailResponseExample } from 'src/dto/wallet.dto';
+import {
+  WalletDetailDto,
+  walletDetailResponseExample,
+} from 'src/dto/wallet.dto';
 
 import { WalletService } from './wallet.service';
 

src/api/wallet/wallet.service.ts

@@ -7,10 +7,7 @@ import { ResponseDto } from 'src/dto/api-response.dto';
 import { WinningsType } from 'src/dto/winning.dto';
 import { TaxFormRepository } from '../repository/taxForm.repo';
 import { PaymentMethodRepository } from '../repository/paymentMethod.repo';
-import {
-  RecipientTaxDetails,
-  TrolleyService,
-} from 'src/shared/global/trolley.service';
+import { TrolleyService } from 'src/shared/global/trolley.service';
 
 /**
  * The winning service.
@@ -36,10 +33,12 @@ export class WalletService {
     });
 
     if (!recipient) {
-      return {} as RecipientTaxDetails;
+      return;
     }
 
-    return this.trolleyService.getRecipientTaxDetails(recipient.trolley_id);
+    return await this.trolleyService.getRecipientTaxDetails(
+      recipient.trolley_id,
+    );
   }
 
   /**
@@ -87,7 +86,7 @@ export class WalletService {
         taxForm: {
           isSetupComplete: hasActiveTaxForm,
         },
-        ...taxWithholdingDetails,
+        ...(taxWithholdingDetails ?? {}),
       };
     } catch (error) {
       this.logger.error('Getting winnings audit failed', error);

src/shared/global/trolley.service.ts

@@ -177,7 +177,7 @@ export class TrolleyService {
 
   async getRecipientTaxDetails(
     recipientId: string,
-  ): Promise<RecipientTaxDetails> {
+  ): Promise<RecipientTaxDetails | void> {
     try {
       const recipient = await this.client.recipient.find(recipientId);
       return pick(recipient, [
@@ -190,7 +190,6 @@ export class TrolleyService {
         'Failed to load recipient tax details from trolley!',
         error,
       );
-      return {} as RecipientTaxDetails;
     }
   }
 }