fix: button text

tonkeeper · Dec 13, 2024 · 66704df · 66704df
1 parent 49173b9
commit 66704df
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 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.4",
+    "version": "3.0.5",
     "author": "Ton APPS UK Limited <support@tonkeeper.com>",
     "description": "Web swap widget for Tonkeeper",
     "dependencies": {

diff --git a/apps/web-swap-widget/src/components/SwapWidgetPage.tsx b/apps/web-swap-widget/src/components/SwapWidgetPage.tsx
@@ -21,6 +21,7 @@ import { SwapWidgetFooter } from './SwapWidgetFooter';
 import { SwapWidgetTxSentNotification } from './SwapWidgetTxSent';
 import { useDisclosure } from '@tonkeeper/uikit/dist/hooks/useDisclosure';
 import { useToast } from '@tonkeeper/uikit/dist/hooks/useNotification';
+import { toErrorMessage } from '@tonkeeper/uikit/dist/libs/common';
 
 const MainFormWrapper = styled.div`
     height: 100%;
@@ -103,11 +104,7 @@ export const SwapWidgetPage = () => {
 
             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);
-            }
+            notifyError(toErrorMessage(e));
         } finally {
             setHasBeenSent(false);
         }

diff --git a/packages/uikit/src/components/swap/SwapButton.tsx b/packages/uikit/src/components/swap/SwapButton.tsx
@@ -82,7 +82,7 @@ export const SwapButton: FC<{ onClick: () => void; isEncodingProcess: boolean }>
 
     return (
         <Button size="medium" primary onClick={onClick} loading={isEncodingProcess}>
-            {t('continue')}
+            isEncodingProcess: {isEncodingProcess}
         </Button>
     );
 };
diff --git a/packages/uikit/src/libs/common.ts b/packages/uikit/src/libs/common.ts
@@ -62,3 +62,14 @@ export const getCountryName = (language: string, country: string) => {
         return country;
     }
 };
+
+export const toErrorMessage = (e: unknown) => {
+    if (e && typeof e === 'object' && 'message' in e && typeof e.message === 'string') {
+        return e.message;
+    } else if (e && typeof e === 'string') {
+        return e;
+    }
+
+    console.error(e);
+    return 'Unknown error';
+};