Merge branch 'master' into bean-ui-convert-gas

BeanstalkFarms · Sep 25, 2023 · 4b1c5a6 · 4b1c5a6
2 parents 89796a4 + cda0508
commit 4b1c5a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/.github/workflows/ci.ui.yaml b/.github/workflows/ci.ui.yaml
@@ -30,8 +30,3 @@ jobs:
         run: yarn ui:generate
       - name: Unit Tests
         run: yarn ui:test
-      - name: Browser Tests
-        uses: cypress-io/github-action@v4
-        with:
-          start: yarn ui:start
-          command: yarn test:browser
diff --git a/projects/ui/src/components/Swap/Actions/Swap.tsx b/projects/ui/src/components/Swap/Actions/Swap.tsx
@@ -273,7 +273,7 @@ const SwapForm: FC<
   const handleChangeAmountIn = useCallback(
     (_amountInClamped: BigNumber | undefined) => {
       console.debug('[TokenInput] handleChangeAmountIn', _amountInClamped);
-      if (_amountInClamped) {
+      if (_amountInClamped && !_amountInClamped?.isNaN()) {
         getAmountOut(tokenIn, _amountInClamped);
       } else {
         setFieldValue('tokenOut.amount', undefined);
@@ -284,7 +284,7 @@ const SwapForm: FC<
   const handleChangeAmountOut = useCallback(
     (_amountOutClamped: BigNumber | undefined) => {
       console.debug('[TokenInput] handleChangeAmountOut', _amountOutClamped);
-      if (_amountOutClamped) {
+      if (_amountOutClamped && !_amountOutClamped?.isNaN()) {
         console.debug('[TokenInput] getMinAmountIn', [
           tokenOut,
           _amountOutClamped,
@@ -533,7 +533,7 @@ const SwapForm: FC<
          * an `amountIn` that is too high by typing in the second input,
          * show a message and prompt them to use `max`.
          */}
-        {!noBalance && !enoughBalanceCheck ? (
+        {!noBalance && !enoughBalanceCheck && amountsCheck ? (
           <Alert variant="standard" color="warning" icon={<WarningIcon />}>
             Not enough {tokenIn.symbol}
             {tokensMatch ? ` in your ${copy.MODES[modeIn]}` : ''} to execute