diff --git a/apps/web-swap-widget/src/components/SwapWidgetPage.tsx b/apps/web-swap-widget/src/components/SwapWidgetPage.tsx
index 9c8dfaed..036930aa 100644
--- a/apps/web-swap-widget/src/components/SwapWidgetPage.tsx
+++ b/apps/web-swap-widget/src/components/SwapWidgetPage.tsx
@@ -1,6 +1,5 @@
 import { styled } from 'styled-components';
 import { useEncodeSwapToTonConnectParams } from '@tonkeeper/uikit/dist/state/swap/useEncodeSwap';
-import { useState } from 'react';
 import {
     useSelectedSwap,
     useSwapFromAmount,
@@ -60,7 +59,6 @@ export const SwapWidgetPage = () => {
     const { isLoading, mutateAsync: encode } = useEncodeSwapToTonConnectParams({
         forceCalculateBattery: true
     });
-    const [hasBeenSent, setHasBeenSent] = useState<boolean>(false);
     const [selectedSwap] = useSelectedSwap();
     const [fromAsset, setFromAsset] = useSwapFromAsset();
     const [toAsset, setToAsset] = useSwapToAsset();
@@ -73,7 +71,6 @@ export const SwapWidgetPage = () => {
 
         const ctx = getTonkeeperInjectionContext()!;
 
-        setHasBeenSent(true);
         try {
             const result = await ctx.sendTransaction({
                 source: ctx.address,
@@ -105,8 +102,6 @@ export const SwapWidgetPage = () => {
             onOpen();
         } catch (e) {
             notifyError(toErrorMessage(e));
-        } finally {
-            setHasBeenSent(false);
         }
     };
 
@@ -127,7 +122,7 @@ export const SwapWidgetPage = () => {
                 </ChangeIconStyled>
             </SwapFromField>
             <SwapToField separateInfo />
-            <SwapButton onClick={onConfirm} isEncodingProcess={isLoading || hasBeenSent} />
+            <SwapButton onClick={onConfirm} isEncodingProcess={isLoading} />
             <Spacer />
             <SwapWidgetFooter />
             <SwapTokensListNotification />
diff --git a/packages/uikit/src/components/swap/SwapButton.tsx b/packages/uikit/src/components/swap/SwapButton.tsx
index 5952e2c7..6cd51edd 100644
--- a/packages/uikit/src/components/swap/SwapButton.tsx
+++ b/packages/uikit/src/components/swap/SwapButton.tsx
@@ -81,8 +81,8 @@ export const SwapButton: FC<{ onClick: () => void; isEncodingProcess: boolean }>
     }
 
     return (
-        <Button size="medium" primary onClick={onClick}>
-            isEncodingProcess: {isEncodingProcess}
+        <Button size="medium" primary onClick={onClick} loading={isEncodingProcess}>
+            {t('continue')}
         </Button>
     );
 };
diff --git a/packages/uikit/src/components/swap/SwapToField.tsx b/packages/uikit/src/components/swap/SwapToField.tsx
index 45be007c..8e26b159 100644
--- a/packages/uikit/src/components/swap/SwapToField.tsx
+++ b/packages/uikit/src/components/swap/SwapToField.tsx
@@ -16,6 +16,10 @@ const FiledContainerStyled = styled.div`
     border-radius: ${p =>
         p.theme.displayType === 'full-width' ? p.theme.corner2xSmall : p.theme.cornerSmall};
     padding: 6px 12px;
+
+    &:empty {
+        display: none;
+    }
 `;
 
 const FiledHeader = styled.div`