fix: add app version; refactor tx send flow

tonkeeper · Dec 13, 2024 · d475fec · d475fec
1 parent e0c59c2
commit d475fec
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 31 deletions.
diff --git a/apps/web-swap-widget/package.json b/apps/web-swap-widget/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@tonkeeper/web-swap-widget",
-    "version": "3.0.0",
+    "version": "3.0.1",
     "author": "Ton APPS UK Limited <[email protected]>",
     "description": "Web swap widget for Tonkeeper",
     "dependencies": {

diff --git a/apps/web-swap-widget/src/App.tsx b/apps/web-swap-widget/src/App.tsx
@@ -23,7 +23,7 @@ import { useAccountsStateQuery, useActiveAccountQuery } from '@tonkeeper/uikit/d
 import { GlobalStyle } from '@tonkeeper/uikit/dist/styles/globalStyle';
 import { FC, PropsWithChildren, Suspense, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { BrowserAppSdk } from './libs/appSdk';
+import { WidgetAppSdk } from './libs/appSdk';
 import { useAnalytics, useAppHeight, useApplyQueryParams, useAppWidth } from './libs/hooks';
 import { useGlobalPreferencesQuery } from '@tonkeeper/uikit/dist/state/global-preferences';
 import { useGlobalSetup } from '@tonkeeper/uikit/dist/state/globalSetup';
@@ -47,7 +47,7 @@ const queryClient = new QueryClient({
     }
 });
 
-const sdk = new BrowserAppSdk();
+const sdk = new WidgetAppSdk();
 const TARGET_ENV = 'swap-widget-web';
 
 const queryParams = new URLSearchParams(new URL(window.location.href).search);

diff --git a/apps/web-swap-widget/src/components/SwapWidgetPage.tsx b/apps/web-swap-widget/src/components/SwapWidgetPage.tsx
@@ -72,32 +72,44 @@ export const SwapWidgetPage = () => {
 
         const ctx = getTonkeeperInjectionContext()!;
 
-        ctx.sendTransaction({
-            source: ctx.address,
-            // legacy tonkeeper api, timestamp in ms
-            valid_until: params.valid_until * 1000,
-            messages: params.messages.map(m => ({
-                address: m.address,
-                amount: m.amount.toString(),
-                payload: m.payload
-            })),
-            messagesVariants: params.messagesVariants
-                ? Object.fromEntries(
-                      Object.entries(params.messagesVariants).map(([k, v]) => [
-                          k,
-                          v.map(m => ({
-                              address: m.address,
-                              amount: m.amount.toString(),
-                              payload: m.payload
-                          }))
-                      ])
-                  )
-                : undefined
-        })
-            .then(onOpen)
-            .catch(notifyError)
-            .finally(() => setHasBeenSent(false));
         setHasBeenSent(true);
+        try {
+            const result = await ctx.sendTransaction({
+                source: ctx.address,
+                // legacy tonkeeper api, timestamp in ms
+                valid_until: params.valid_until * 1000,
+                messages: params.messages.map(m => ({
+                    address: m.address,
+                    amount: m.amount.toString(),
+                    payload: m.payload
+                })),
+                messagesVariants: params.messagesVariants
+                    ? Object.fromEntries(
+                          Object.entries(params.messagesVariants).map(([k, v]) => [
+                              k,
+                              v.map(m => ({
+                                  address: m.address,
+                                  amount: m.amount.toString(),
+                                  payload: m.payload
+                              }))
+                          ])
+                      )
+                    : undefined
+            });
+
+            if (!result) {
+                throw new Error('Transaction was not confirmed');
+            }
+
+            onOpen();
+        } catch (e) {
+            if (e && typeof e === 'object' && 'message' in e && typeof e.message === 'string') {
+                notifyError(e.message);
+            } else if (e && typeof e === 'string') {
+                notifyError(e);
+            }
+        }
+        setHasBeenSent(false);
     };
 
     const onChangeFields = () => {

diff --git a/apps/web-swap-widget/src/index.tsx b/apps/web-swap-widget/src/index.tsx
@@ -1,7 +1,11 @@
 import ReactDOM from 'react-dom/client';
 import { App } from './App';
 import './i18n';
+import { WidgetAppSdk } from './libs/appSdk';
 
-const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
+const rootElement = document.getElementById('root') as HTMLElement;
+rootElement.setAttribute('data-app-version', WidgetAppSdk.version);
+
+const root = ReactDOM.createRoot(rootElement);
 
 root.render(<App />);
diff --git a/apps/web-swap-widget/src/libs/appSdk.ts b/apps/web-swap-widget/src/libs/appSdk.ts
@@ -14,7 +14,9 @@ function iOS() {
     );
 }
 
-export class BrowserAppSdk extends BaseApp {
+export class WidgetAppSdk extends BaseApp {
+    static version = packageJson.version ?? 'Unknown';
+
     constructor() {
         super(new SwapWidgetStorage());
     }
@@ -42,7 +44,7 @@ export class BrowserAppSdk extends BaseApp {
     isStandalone = () =>
         iOS() && ((window.navigator as unknown as { standalone: boolean }).standalone as boolean);
 
-    version = packageJson.version ?? 'Unknown';
+    version = WidgetAppSdk.version;
 
     targetEnv = 'web' as const;
 }