chore(bg/utils)!: remove params from PostConnect screen URL (#1331)

Author: sidvishnoi

src/background/services/wallet.ts

@@ -19,10 +19,7 @@ import type {
 } from '@/shared/messages';
 import { OPEN_PAYMENTS_REDIRECT_URL } from '@/shared/defines';
 import {
-  InteractionIntent,
-  ErrorCode,
-  GrantResult,
-  redirectToWelcomeScreen,
+  redirectToPostConnect,
   toAmount,
   onPopupOpen,
   closeTabsByFilter,
@@ -113,7 +110,6 @@ export class WalletService {
     await this.openPaymentsService.initClient(walletAddress.id);
 
     const browser = this.browser;
-    const intent = InteractionIntent.CONNECT;
 
     const isKeyAdded = await isKeyAddedToWallet(walletAddress.id, keyId);
     if (!isKeyAdded) {
@@ -142,7 +138,7 @@ export class WalletService {
       } catch (error) {
         cleanupListeners();
         const err = this.setConnectStateError(error, 'connect');
-        await this.redirectOnGrantError(err || error, intent, tabId!);
+        await this.redirectOnGrantError(err || error, tabId);
         throw err || error;
       }
     }
@@ -185,15 +181,15 @@ export class WalletService {
     } catch (error) {
       cleanupListeners();
       const err = this.setConnectStateError(error, 'connect');
-      await this.redirectOnGrantError(err || error, intent, tabId!);
+      await this.redirectOnGrantError(err || error, tabId);
       throw err || error;
     }
 
     this.storage.setTransientState('connect', () => ({
       intent: 'connect',
       type: 'success',
     }));
-    await this.redirectOnSuccess(intent, tabId);
+    await this.redirectOnSuccess(tabId);
     await this.storage.set({
       walletAddress,
       rateOfPay,
@@ -250,11 +246,7 @@ export class WalletService {
         error instanceof WalletStatusCancelError && error.code === 'tab_closed';
 
       if (tabId && !isTabClosed) {
-        await this.redirectOnGrantError(
-          error,
-          InteractionIntent.RECONNECT,
-          tabId,
-        );
+        await this.redirectOnGrantError(error, tabId);
       }
 
       if (isInvalidClientError(error)) {
@@ -267,12 +259,7 @@ export class WalletService {
       type: 'success',
       intent: 'reconnect',
     }));
-    await redirectToWelcomeScreen(
-      this.browser,
-      tabId!,
-      GrantResult.KEY_ADD_SUCCESS,
-      InteractionIntent.RECONNECT,
-    );
+    await this.redirectOnSuccess(tabId);
   }
 
   async disconnectWallet(force = false) {
@@ -330,7 +317,7 @@ export class WalletService {
       recurring,
       assetScale: walletAddress.assetScale,
     });
-    const intent = InteractionIntent.FUNDS;
+
     const grant =
       await this.outgoingPaymentGrantService.createOutgoingPaymentGrant(
         walletAddress,
@@ -349,7 +336,7 @@ export class WalletService {
       );
     } catch (error) {
       const err = this.setConnectStateError(error, 'add_funds');
-      await this.redirectOnGrantError(err || error, intent, tabId!);
+      await this.redirectOnGrantError(err || error, tabId);
       throw err || error;
     }
 
@@ -359,7 +346,7 @@ export class WalletService {
       intent: 'add_funds',
       type: 'success',
     }));
-    await this.redirectOnSuccess(intent, tabId);
+    await this.redirectOnSuccess(tabId);
 
     // cancel existing grants of same type, if any
     if (grants.oneTimeGrant && !recurring) {
@@ -388,7 +375,7 @@ export class WalletService {
       recurring,
       assetScale: walletAddress.assetScale,
     });
-    const intent = InteractionIntent.UPDATE_BUDGET;
+
     const grant =
       await this.outgoingPaymentGrantService.createOutgoingPaymentGrant(
         walletAddress,
@@ -407,15 +394,15 @@ export class WalletService {
       );
     } catch (error) {
       const err = this.setConnectStateError(error, 'update_budget');
-      await this.redirectOnGrantError(err || error, intent, tabId!);
+      await this.redirectOnGrantError(err || error, tabId);
       throw err || error;
     }
 
     this.storage.setTransientState('connect', () => ({
-      intent,
+      intent: 'update_budget',
       type: 'success',
     }));
-    await this.redirectOnSuccess(intent, tabId);
+    await this.redirectOnSuccess(tabId);
 
     // Revoke all existing grants.
     // Note: Clear storage only if new grant type is not same as previous grant
@@ -494,63 +481,17 @@ export class WalletService {
     await this.storage.setState({ key_revoked: false });
   }
 
-  private async redirectOnSuccess(intent: InteractionIntent, tabId?: TabId) {
-    await redirectToWelcomeScreen(
-      this.browser,
-      tabId,
-      GrantResult.GRANT_SUCCESS,
-      intent,
-    );
+  private async redirectOnSuccess(tabId?: TabId) {
+    await redirectToPostConnect(this.browser, tabId);
   }
 
-  private async redirectOnGrantError(
-    error: WalletStatusFailureError | WalletStatusCancelError | Error,
-    intent: InteractionIntent,
-    tabId: TabId,
-  ) {
-    if (error instanceof WalletStatusFailureError) {
-      const ERROR_CODE_MAP: Record<
-        WalletStatusFailureError['code'],
-        ErrorCode
-      > = {
-        grant_hash_failed: ErrorCode.HASH_FAILED,
-        grant_continuation_failed: ErrorCode.CONTINUATION_FAILED,
-        timeout: ErrorCode.TIMEOUT,
-        key_add_failed: ErrorCode.KEY_ADD_FAILED,
-        grant_invalid: ErrorCode.GRANT_INVALID,
-        unknown: ErrorCode.UNKNOWN,
-      };
-      await redirectToWelcomeScreen(
-        this.browser,
-        tabId,
-        GrantResult.GRANT_ERROR,
-        intent,
-        ERROR_CODE_MAP[error.code],
-      );
-      return;
-    }
-
+  private async redirectOnGrantError(error: Error, tabId?: TabId) {
     if (error instanceof WalletStatusCancelError) {
       if (error.code === 'tab_closed') {
         return;
       }
-
-      await redirectToWelcomeScreen(
-        this.browser,
-        tabId,
-        GrantResult.GRANT_REJECTED,
-        intent,
-      );
-      return;
     }
-
-    await redirectToWelcomeScreen(
-      this.browser,
-      tabId,
-      GrantResult.GRANT_ERROR,
-      intent,
-      ErrorCode.UNKNOWN,
-    );
+    await redirectToPostConnect(this.browser, tabId);
   }
 
   public resetConnectState() {

src/background/utils.ts

@@ -22,31 +22,6 @@ type OnConnectCallback = Parameters<
   Browser['runtime']['onConnect']['addListener']
 >[0];
 
-export enum GrantResult {
-  GRANT_SUCCESS = 'grant_success',
-  GRANT_ERROR = 'grant_error',
-  GRANT_REJECTED = 'grant_rejected',
-  KEY_ADD_SUCCESS = 'key_add_success',
-  KEY_ADD_ERROR = 'key_add_error',
-}
-
-export enum InteractionIntent {
-  CONNECT = 'connect',
-  RECONNECT = 'reconnect',
-  FUNDS = 'funds',
-  UPDATE_BUDGET = 'update_budget',
-}
-
-/** @deprecated Used only for URL params on post-connect screen */
-export enum ErrorCode {
-  CONTINUATION_FAILED = 'continuation_failed',
-  HASH_FAILED = 'hash_failed',
-  KEY_ADD_FAILED = 'key_add_failed',
-  TIMEOUT = 'timeout',
-  GRANT_INVALID = 'grant_invalid',
-  UNKNOWN = 'unknown',
-}
-
 export class WalletStatusFailureError extends Error {
   public readonly details: WalletStatusFailure['details'];
   constructor(
@@ -260,19 +235,12 @@ export async function openAppPage(
   }
 }
 
-export const redirectToWelcomeScreen = async (
+export async function redirectToPostConnect(
   browser: Browser,
-  tabId: number | undefined,
-  result: GrantResult,
-  intent: InteractionIntent,
-  errorCode?: ErrorCode,
-): Promise<void> => {
-  const params = new URLSearchParams();
-  params.set('result', result);
-  params.set('intent', intent);
-  if (errorCode) params.set('errorCode', errorCode);
-  await openAppPage(browser, '/post-connect', { params, tabId });
-};
+  tabId?: TabId,
+): Promise<void> {
+  await openAppPage(browser, '/post-connect', { tabId });
+}
 
 export const closeTabsByFilter = async (
   browser: Browser,

tests/e2e/walletBudget.spec.ts

@@ -190,9 +190,7 @@ for (const testCase of TEST_CASES) {
         );
         const continueWaitMs = await continueWaitMsPromise;
         await completeGrant(newPage, continueWaitMs);
-        await expect(newPage).toHaveURL(
-          (url) => url.searchParams.get('intent') === 'update_budget',
-        );
+        await expect(newPage).toHaveURL((url) => url.hash === '#/post-connect');
         await newPage.close();
 
         const newGrants = await getStorage(background, [