@rango-dev/widget-embedded 0.1.10-next.95 → 0.1.10-next.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/widget-embedded",
-  "version": "0.1.10-next.95",
+  "version": "0.1.10-next.98",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/pages/ConfirmSwapPage.tsx

@@ -39,7 +39,11 @@ export function ConfirmSwapPage() {
       onConfirm={() => {
         confirmSwap?.().then((swap) => {
           if (swap) {
-            manager?.create('swap', { swapDetails: swap });
+            manager?.create(
+              'swap',
+              { swapDetails: swap },
+              { id: swap.requestId }
+            );
             setSelectedSwap(swap.requestId);
             navigate(navigationRoutes.swaps + `/${swap.requestId}`, {
               replace: true,

package/src/pages/SwapDetailsPage.tsx

@@ -1,11 +1,12 @@
 import React from 'react';
-import { useManager } from '@rango-dev/queue-manager-react';
-import { SwapHistory } from '@rango-dev/ui';
 import { navigationRoutes } from '../constants/navigationRoutes';
+import useCopyToClipboard from '../hooks/useCopyToClipboard';
+import { useManager } from '@rango-dev/queue-manager-react';
 import { useNavigateBack } from '../hooks/useNavigateBack';
 import { getPendingSwaps } from '../utils/queue';
+import { SwapHistory } from '@rango-dev/ui';
 import { useUiStore } from '../store/ui';
-import useCopyToClipboard from '../hooks/useCopyToClipboard';
+import { cancelSwap } from '@rango-dev/queue-manager-rango-preset';
 
 export function SwapDetailsPage() {
   const selectedSwapRequestId = useUiStore.use.selectedSwapRequestId();
@@ -16,18 +17,22 @@ export function SwapDetailsPage() {
   const pendingSwaps = getPendingSwaps(manager);
   const selectedSwap = pendingSwaps.find(
     ({ swap }) => swap.requestId === selectedSwapRequestId
-  )?.swap;
+  );
 
+  //TODO: implement swap cancellation (move queueManager logic to queueManager/rango-preset)
+  const onCancel = () => {
+    const swap = selectedSwap ? manager?.get(selectedSwap.id) : undefined;
+    if (swap) cancelSwap(swap);
+  };
   return (
     <SwapHistory
       onBack={navigateBackFrom.bind(null, navigationRoutes.swapDetails)}
       //todo: move PendingSwap type to rango-types
       //@ts-ignore
-      pendingSwap={selectedSwap}
+      pendingSwap={selectedSwap?.swap}
       onCopy={handleCopy}
       isCopied={isCopied}
-      //todo: implement swap cancellation (move queueManager logic to queueManager/rango-preset)
-      onCancel={(requestId) => console.log(requestId)}
+      onCancel={onCancel}
     />
   );
 }