fix(one-time-payment): start polling timeout after making payment (#1161)

Author: sidvishnoi

src/background/services/monetization.ts

@@ -7,7 +7,6 @@ import type {
   StopMonetizationPayload,
 } from '@/shared/messages';
 import { getSender, getTabId } from '@/background/utils';
-import { OUTGOING_PAYMENT_POLLING_MAX_DURATION } from '@/background/config';
 import {
   ErrorWithKey,
   isOkState,
@@ -313,11 +312,10 @@ export class MonetizationService {
       throw new ErrorWithKey('pay_error_notMonetized');
     }
 
-    const signal = AbortSignal.timeout(OUTGOING_PAYMENT_POLLING_MAX_DURATION); // can use other signals as well, such as popup closed etc.
     const amountToSend = BigInt(
       (Number(amount) * 10 ** walletAddress.assetScale).toFixed(0),
     );
-    const result = await paymentManager.pay(amountToSend, signal);
+    const result = await paymentManager.pay(amountToSend);
 
     const { sentAmount, debitAmount } = result.amounts;
     return {

src/background/services/paymentManager.ts

@@ -8,7 +8,8 @@ import type { PaymentSession } from './paymentSession';
 import {
   MIN_PAYMENT_WAIT,
   OUTGOING_PAYMENT_POLLING_MAX_ATTEMPTS,
-} from '../config';
+  OUTGOING_PAYMENT_POLLING_MAX_DURATION,
+} from '@/background/config';
 import { bigIntMax } from '../utils';
 import {
   ErrorWithKey,
@@ -183,7 +184,7 @@ export class PaymentManager {
   // #endregion
 
   // #region One time payment
-  async pay(amount: bigint, signal?: AbortSignal) {
+  async pay(amount: bigint) {
     const payableSessions = this.payableSessions;
     if (!payableSessions.length) {
       throw new Error('No sessions to pay');
@@ -219,6 +220,7 @@ export class PaymentManager {
     );
 
     this.logger.debug('polling outgoing payments for completion');
+    const signal = AbortSignal.timeout(OUTGOING_PAYMENT_POLLING_MAX_DURATION); // can combined with other signals as well, such as popup closed etc.
     const result = await this.getPayStatus(
       outgoingPaymentResults,
       Array.from(distribution.keys()),