@rango-dev/widget-embedded 0.17.1-next.24 → 0.17.1-next.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/widget-embedded",
-  "version": "0.17.1-next.24",
+  "version": "0.17.1-next.25",
   "license": "MIT",
   "type": "module",
   "source": "./src/index.ts",
@@ -21,13 +21,13 @@
   "dependencies": {
     "@lingui/core": "4.2.1",
     "@lingui/react": "4.2.1",
-    "@rango-dev/provider-all": "^0.22.1-next.6",
-    "@rango-dev/queue-manager-core": "^0.22.1-next.2",
-    "@rango-dev/queue-manager-rango-preset": "^0.22.1-next.8",
-    "@rango-dev/queue-manager-react": "^0.22.1-next.2",
-    "@rango-dev/ui": "^0.22.1-next.13",
-    "@rango-dev/wallets-react": "^0.8.1-next.4",
-    "@rango-dev/wallets-shared": "^0.21.1-next.4",
+    "@rango-dev/provider-all": "^0.22.1-next.7",
+    "@rango-dev/queue-manager-core": "^0.22.1-next.3",
+    "@rango-dev/queue-manager-rango-preset": "^0.22.1-next.9",
+    "@rango-dev/queue-manager-react": "^0.22.1-next.3",
+    "@rango-dev/ui": "^0.22.1-next.14",
+    "@rango-dev/wallets-react": "^0.8.1-next.5",
+    "@rango-dev/wallets-shared": "^0.21.1-next.5",
     "bignumber.js": "^9.1.1",
     "copy-to-clipboard": "^3.3.3",
     "dayjs": "^1.11.7",

package/src/containers/WidgetInfo/WidgetInfo.helpers.ts

@@ -0,0 +1,45 @@
+import type { Manager } from '@rango-dev/queue-manager-core';
+import type { PendingSwap } from '@rango-dev/queue-manager-rango-preset';
+
+import {
+  getCurrentBlockchainOfOrNull,
+  getCurrentStep,
+  getRelatedWalletOrNull,
+} from '@rango-dev/queue-manager-rango-preset';
+
+import { getPendingSwaps } from '../../utils/queue';
+
+export class WidgetHistory {
+  private manager: Manager | undefined;
+
+  constructor(manager: Manager | undefined) {
+    this.manager = manager;
+  }
+
+  public getAllSwaps() {
+    return getPendingSwaps(this.manager);
+  }
+
+  public getCurrentStep(swap: PendingSwap) {
+    return this.getCurrentStepInfo(swap).step;
+  }
+
+  public getCurrentStepWallet(swap: PendingSwap) {
+    return this.getCurrentStepInfo(swap).wallet;
+  }
+
+  public getCurrentStepNetwork(swap: PendingSwap) {
+    return this.getCurrentStepInfo(swap).network;
+  }
+
+  private getCurrentStepInfo(swap: PendingSwap) {
+    const currentStep = getCurrentStep(swap);
+    return {
+      step: currentStep,
+      wallet: currentStep ? getRelatedWalletOrNull(swap, currentStep) : null,
+      network: currentStep
+        ? getCurrentBlockchainOfOrNull(swap, currentStep)
+        : null,
+    };
+  }
+}

package/src/containers/WidgetInfo/WidgetInfo.tsx

@@ -4,23 +4,24 @@ import { useManager } from '@rango-dev/queue-manager-react';
 import React, { createContext, useContext } from 'react';
 
 import { useWalletsStore } from '../../store/wallets';
-import { getPendingSwaps } from '../../utils/queue';
 import { calculateWalletUsdValue } from '../../utils/wallets';
 
+import { WidgetHistory } from './WidgetInfo.helpers';
+
 export const WidgetInfoContext = createContext<
   WidgetInfoContextInterface | undefined
 >(undefined);
 
 export function WidgetInfo(props: React.PropsWithChildren) {
   const { manager } = useManager();
-  const swaps = getPendingSwaps(manager);
+  const history = new WidgetHistory(manager);
   const details = useWalletsStore.use.connectedWallets();
   const isLoading = useWalletsStore.use.loading();
   const totalBalance = calculateWalletUsdValue(details);
   const refetch = useWalletsStore.use.getWalletsDetails();
   // eslint-disable-next-line react/jsx-no-constructed-context-values
   const value = {
-    swaps,
+    history,
     wallets: {
       isLoading,
       details,

package/src/containers/WidgetInfo/WidgetInfo.types.ts

@@ -1,10 +1,10 @@
+import type { WidgetHistory } from './WidgetInfo.helpers';
 import type { ConnectedWallet } from '../../store/wallets';
 import type { Wallet } from '../../types';
-import type { PendingSwapWithQueueID } from '@rango-dev/queue-manager-rango-preset';
 import type { Token } from 'rango-sdk';
 
 export interface WidgetInfoContextInterface {
-  swaps: PendingSwapWithQueueID[];
+  history: WidgetHistory;
   wallets: {
     details: ConnectedWallet[];
     totalBalance: string;

package/src/index.ts

@@ -8,8 +8,13 @@ import type {
   WidgetTheme,
 } from './types';
 import type {
+  EventSeverity,
+  PendingSwap,
+  PendingSwapStep,
+  PendingSwapWithQueueID,
   Route,
   RouteEvent,
+  RouteExecutionEvents,
   RouteFailedEvent,
   RouteStartedEvent,
   RouteSucceededEvent,
@@ -28,17 +33,27 @@ import type {
   EventHandler as HandleWalletsUpdate,
   ProviderInterface,
 } from '@rango-dev/wallets-react';
-import type { WalletType } from '@rango-dev/wallets-shared';
+import type {
+  WalletInfo,
+  WalletState,
+  WalletType,
+} from '@rango-dev/wallets-shared';
 
 import {
   MainEvents,
+  PendingSwapNetworkStatus,
   RouteEventType,
   StepEventType,
   StepExecutionBlockedEventStatus,
   StepExecutionEventStatus,
   useEvents as useWidgetEvents,
 } from '@rango-dev/queue-manager-rango-preset';
-import { useWallets } from '@rango-dev/wallets-react';
+import {
+  readAccountAddress,
+  useWallets,
+  Events as WalletEvents,
+} from '@rango-dev/wallets-react';
+import { Networks, WalletTypes } from '@rango-dev/wallets-shared';
 
 import { WidgetWallets } from './containers/Wallets';
 import { Widget } from './containers/Widget';
@@ -90,3 +105,23 @@ export {
   StepExecutionEventStatus,
   StepExecutionBlockedEventStatus,
 };
+
+// Internal type exports for Rango
+export type {
+  WalletState,
+  WalletInfo,
+  PendingSwap,
+  PendingSwapWithQueueID,
+  PendingSwapStep,
+  RouteExecutionEvents,
+  EventSeverity,
+};
+
+// Internal function and enum exports for Rango
+export {
+  readAccountAddress,
+  Networks,
+  WalletEvents,
+  WalletTypes,
+  PendingSwapNetworkStatus,
+};