@rango-dev/widget-embedded 0.64.4-next.0 → 0.64.4-next.10

package/src/types/event.ts

@@ -1,12 +1,15 @@
 import type { SelectedQuote } from './quote';
-import type { Wallet } from './wallets';
 import type {
   RouteEventData,
   StepEventData,
 } from '@rango-dev/queue-manager-rango-preset';
+import type { WalletEventData } from '@rango-dev/wallets-react';
+
+import { WidgetEvents as QueueManagerEvents } from '@rango-dev/queue-manager-rango-preset';
+import { WalletEventChannel } from '@rango-dev/wallets-react';
 
 type EventData<
-  T extends QuoteEventTypes | WalletEventTypes | UiEventTypes,
+  T extends QuoteEventTypes | UiEventTypes,
   U extends Record<string, unknown> | null
 > = { type: T; payload: U };
 
@@ -16,8 +19,6 @@ export type PreventableEventPayload<
   preventDefault: () => void;
 } & T;
 
-type Account = Wallet;
-
 export enum QuoteEventTypes {
   QUOTE_INPUT_UPDATE = 'quoteInputUpdate',
   QUOTE_OUTPUT_UPDATE = 'quoteOutputUpdate',
@@ -31,12 +32,6 @@ export enum QuoteEventTypes {
   ROUTE_CHANGED = 'routeChanged',
 }
 
-export enum WalletEventTypes {
-  CONNECT = 'connect',
-  DISCONNECT = 'disconnect',
-  DETECTED = 'detected',
-}
-
 /**
  * We use a prefix for interaction type and a name for defining the event name: INTERACTION_EVENT_NAME
  * e.g. CLICK_X_BUTTON or NAVIGATE_WALLET_PAGE
@@ -72,24 +67,6 @@ export type QuoteUpdateEventPayload = Pick<
   'requestAmount' | 'swaps' | 'outputAmount' | 'resultType' | 'tags'
 > | null;
 
-export type ConnectWalletEventPayload = {
-  walletType: string;
-  accounts: Account[];
-  /** Blockchain of the first connected account. */
-  chain: string | null;
-  /** wallet type (e.g. "metamask"). */
-  walletName: string;
-};
-
-export type DisconnectWalletEventPayload = {
-  walletType: string;
-  walletName: string;
-};
-
-export type WalletDetectedEventPayload = {
-  walletName: string;
-};
-
 export type ClickConnectWalletPayload = PreventableEventPayload;
 
 /** Shared shape describing a route/quote, used by several swap events. */
@@ -217,11 +194,6 @@ export type QuoteEventData =
   | EventData<QuoteEventTypes.ROUTE_FETCH_FAILED, RouteFetchFailedEventPayload>
   | EventData<QuoteEventTypes.ROUTE_CHANGED, RouteChangedEventPayload>;
 
-export type WalletEventData =
-  | EventData<WalletEventTypes.CONNECT, ConnectWalletEventPayload>
-  | EventData<WalletEventTypes.DISCONNECT, DisconnectWalletEventPayload>
-  | EventData<WalletEventTypes.DETECTED, WalletDetectedEventPayload>;
-
 export type UiEventData =
   | EventData<UiEventTypes.CLICK_CONNECT_WALLET, ClickConnectWalletPayload>
   | EventData<UiEventTypes.TOKEN_SELECTED, TokenSelectedEventPayload>
@@ -248,17 +220,12 @@ export type UiEventData =
   | EventData<UiEventTypes.SWAP_RETRIED, SwapRetriedEventPayload>
   | EventData<UiEventTypes.SWAP_CANCELLED, SwapCancelledEventPayload>;
 
-/**
- * RouteEvent/StepEvent must match the queue-manager's `WidgetEvents` string
- * values (`QueueManagerEvents`) so events route correctly. They're inlined as
- * literals rather than referencing the other enum to keep this a pure string
- * enum (a cross-enum reference makes `no-mixed-enums` read them as numeric).
- */
 export enum WidgetEvents {
-  RouteEvent = 'routeEvent',
-  StepEvent = 'stepEvent',
+  RouteEvent = QueueManagerEvents.RouteEvent,
+  StepEvent = QueueManagerEvents.StepEvent,
   QuoteEvent = 'quoteEvent',
-  WalletEvent = 'walletEvent',
+  // `isolatedModules` rejects a bare const reference in an enum initializer (TS18055).
+  WalletEvent = `${WalletEventChannel}`,
   UiEvent = 'uiEvent',
 }
 

package/src/utils/events.ts

@@ -4,8 +4,6 @@ import {
   type QuoteEventData,
   type UiEventData,
   type UiEventTypes,
-  type WalletDetectedEventPayload,
-  WalletEventTypes,
   WidgetEvents,
 } from '../types';
 
@@ -41,10 +39,3 @@ export function emitPreventableEvent(
 export function emitQuoteEvent(event: QuoteEventData): void {
   eventEmitter.emit(WidgetEvents.QuoteEvent, event);
 }
-
-export function emitWalletDetected(payload: WalletDetectedEventPayload): void {
-  eventEmitter.emit(WidgetEvents.WalletEvent, {
-    type: WalletEventTypes.DETECTED,
-    payload,
-  });
-}

package/src/utils/providers.ts

@@ -1,11 +1,6 @@
 import type { WidgetConfig } from '../types';
 
 import { Provider } from '@hub3js/core';
-import {
-  defineVersions,
-  pickVersion,
-  type VersionedProviders,
-} from '@hub3js/core/utils';
 
 export interface ProvidersOptions {
   walletConnectProjectId?: WidgetConfig['walletConnectProjectId'];
@@ -19,23 +14,23 @@ export interface ProvidersOptions {
 /**
  *
  * Generate a list of providers by passing a provider name (e.g. metamask) or a custom hub `Provider`.
- * @returns VersionedProviders[] a list of VersionedProviders
+ * @returns Provider[] a list of hub Providers
  *
  */
 export function matchAndGenerateProviders({
   allProviders,
   configWallets,
 }: {
-  allProviders: VersionedProviders[];
+  allProviders: Provider[];
   configWallets: WidgetConfig['wallets'];
   options?: ProvidersOptions;
-}): VersionedProviders[] {
+}): Provider[] {
   if (configWallets) {
     /*
      * If `wallets`  is included in widget config,
      * allProviders should be filtered based on wallets list
      */
-    const selectedProviders: VersionedProviders[] = [];
+    const selectedProviders: Provider[] = [];
 
     configWallets.forEach((requestedWallet) => {
       /*
@@ -45,7 +40,7 @@ export function matchAndGenerateProviders({
        */
       if (typeof requestedWallet === 'string') {
         const result = allProviders.find(
-          (provider) => pickProviderVersion(provider).id === requestedWallet
+          (provider) => provider.id === requestedWallet
         );
 
         if (result) {
@@ -56,16 +51,11 @@ export function matchAndGenerateProviders({
             `Couldn't find ${requestedWallet} provider. Please make sure you are passing the correct name.`
           );
         }
+      } else if (requestedWallet instanceof Provider) {
+        selectedProviders.push(requestedWallet);
       } else {
-        // It's a custom provider so we directly push it to the list.
-        if (!(requestedWallet instanceof Provider)) {
-          throw new Error(
-            `Legacy providers aren't supported anymore. Pass a hub 'Provider' instance in 'wallets' instead.`
-          );
-        }
-
-        selectedProviders.push(
-          defineVersions().version('1.0.0', requestedWallet).build()
+        throw new Error(
+          `Invalid item in widget config 'wallets': expected a wallet type string (e.g. 'metamask') or a hub 'Provider' instance, but received ${typeof requestedWallet}.`
         );
       }
     });
@@ -76,12 +66,6 @@ export function matchAndGenerateProviders({
   return allProviders;
 }
 
-export function pickProviderVersion(provider: VersionedProviders): Provider {
-  return pickVersion(provider, '1.0.0')[1];
-}
-
-export function configWalletsToWalletName(
-  providers: VersionedProviders[]
-): string[] {
-  return providers.map((provider) => pickProviderVersion(provider).id);
+export function configWalletsToWalletName(providers: Provider[]): string[] {
+  return providers.map((provider) => provider.id);
 }