Update flipping logic in SwapInputsController #5948

jinchung · 2024-07-23T16:04:14Z

Fixes APP-1675
Fixes APP-1699

More comments are inline in the code files changed below.

What changed (plus any additional context for devs)

Moved a couple functions to a separate file to make setting up testing easier later
Moved the animatedReaction for reacting to asset changes / flips to be done before the animatedReaction that changes the maxSwappableAmount value as this was causing the reliance of "did the user intend to use max" check unreliable
Fixes an issue where from wallet list for testmar27.eth: select BOOMER and swap → the output amount is just 0.0 and when you flip, the input amount goes to "7.5e-8" bc of an unnecessary Number conversion

Overall, the flipping logic will try to figure out which values to used in this priority order:

base the updated values on the native input amount (requires that there is a valid price for both input and output assets, and that the balance won't exceed the max balance, and that it isn't the user's intent to select the max balance)
base the updated values on the current slider position: if we can't do the above, or if the calculated amount would result in an automatic "Insufficient Balance" for the input, or if the user intended to select max, then we use the slider (requires the previous output has a balance)
otherwise, we use the previous output amount as the new input amount and vice versa
worst case scenario, we just zero out the values

Screen recordings / screenshots

Max scenario:

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-07-26.at.00.26.03.mp4

Example of when you have enough balance after the flip to keep using the native input or what happens when you don't (and it falls back to using the current slider position):

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-07-26.at.00.29.00.mp4

BEFORE: "7.5e-8" bug
https://github.com/user-attachments/assets/ce2fc0c9-64c0-41f8-8f08-e4ff81689190
AFTER fixing "7.5e-8" bug

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-07-26.at.00.23.37.mp4

What to test

I've added a full breakdown of combinations in the Linear ticket, but generally flipping should "behave as expected" for max as well as non-max
when flipping assets, it should avoid getting into a state of "Insufficient Funds" when possible

linear · 2024-07-23T16:04:38Z

APP-1675 Flipping logic isn't setting max amount correctly

… Swap Controller

… flip

…matter after flip

jinchung · 2024-07-26T04:31:37Z

src/__swaps__/screens/Swap/hooks/useSwapInputsController.ts

@@ -640,6 +611,74 @@ export function useSwapInputsController({
    }
  );

+  /**


NOTE: this is not all brand new logic - this is mostly moving this animatedReaction from line 812 to here so that it's ahead of another animatedReaction that reacts to maxSwappableAmount changes

jinchung · 2024-07-26T04:32:28Z

src/__swaps__/screens/Swap/hooks/useSwapInputsController.ts

+        });
+      } else {
+        // If the assets were flipped
+        updateInputValuesAfterFlip({


this is the "main" change for this function for when the assets are flipped - the logic is in the other file

jinchung · 2024-07-26T04:32:56Z

src/__swaps__/screens/Swap/hooks/useSwapInputsController.ts

@@ -30,36 +30,7 @@ import { analyticsV2 } from '@/analytics';
 import { divWorklet, equalWorklet, greaterThanWorklet, isNumberStringWorklet, mulWorklet } from '@/__swaps__/safe-math/SafeMath';
 import { SPRING_CONFIGS } from '@/components/animations/animationConfigs';
 import { triggerHapticFeedback } from '@/screens/points/constants';
-
-function getInputValuesForSliderPositionWorklet({


I just moved this out to a separate file to make it easier for testing later - no changes

jinchung · 2024-07-26T04:33:15Z

src/__swaps__/utils/flipAssets.ts

+import { ExtendedAnimatedAssetWithColors } from '@/__swaps__/types/assets';
+import { divWorklet, equalWorklet, greaterThanWorklet, mulWorklet } from '@/__swaps__/safe-math/SafeMath';
+
+export function getInputValuesForSliderPositionWorklet({


this is the function that was just directly moved over from the useSwapInputsController - no changes

jinchung · 2024-07-26T04:33:35Z

src/__swaps__/utils/flipAssets.ts

+  };
+}
+
+export const updateInputValuesAfterFlip = ({


this is the main logic that is new / updated for how to handle input values after a flip

…ll actually be used

jinchung · 2024-07-26T04:44:05Z

src/__swaps__/utils/flipAssets.ts

+        inputNativeValue: mulWorklet(newInputAmount, inputNativePrice),
+      };
+    });
+    return;


only for slider do we return early since we do not want to update the outputAmount and outputNativeValue like all the other flows; we just want to modify the inputAmount and inputNativeValue

jinchung · 2024-07-26T04:44:39Z

src/__swaps__/utils/flipAssets.ts

+    });
+    newInputAmount = inputAmountBasedOnSlider;
+    inputMethod.value = 'slider';
+    lastTypedInput.value = 'inputAmount';


only for the slider do we need to update the lastTypedInput and focusedInput back to be input based

walmat

🔥

linear · 2024-07-29T17:06:20Z

APP-1699 After switching tokens the amount should stay at or under 100 percent

…inbow into brody/enable-android-tests * 'brody/enable-android-tests' of github.com:rainbow-me/rainbow: degen mode feature flag (#5969) Fix Android dapp browser gestures (#5964) Add Degen Mode, swap settings panel (#5963) Update flipping logic in SwapInputsController (#5948) Hold to swap button (#5920)

jinchung force-pushed the @jin/flipping-max branch 3 times, most recently from 3d07ca9 to dc8068a Compare July 25, 2024 03:24

jinchung added 7 commits July 25, 2024 23:30

Add a separate updateSlider flag for resetToZeroValues function

db14900

Preliminary setup for assets flip function

aab20b7

Temp: only update input amount values when relying on slider after flip

01df08b

Temp: special check for if max was previously set

f46d54f

Prelim: separate out flipAssets and update input amounts logic out of…

edcda9d

… Swap Controller

Move up animated reaction for asset changes

024a0b4

Update lastTypedInput and focusedInput when updating via slider after…

caef684

… flip

jinchung force-pushed the @jin/flipping-max branch from 417d199 to caef684 Compare July 26, 2024 03:32

Remove unnecessary Number conversion after using valueBasedDecimalFor…

7927eca

…matter after flip

jinchung marked this pull request as ready for review July 26, 2024 04:27

jinchung commented Jul 26, 2024

View reviewed changes

Check exceedsMax after calculating the formatted input amount that wi…

a96f8a6

…ll actually be used

jinchung commented Jul 26, 2024

View reviewed changes

jinchung requested a review from walmat July 26, 2024 04:48

jinchung changed the title ~~Update to flipping logic in SwapInputsController~~ Update flipping logic in SwapInputsController Jul 26, 2024

jinchung requested a review from greg-schrammel July 26, 2024 04:49

walmat approved these changes Jul 26, 2024

View reviewed changes

jinchung merged commit 09bafbc into develop Jul 29, 2024
6 checks passed

jinchung deleted the @jin/flipping-max branch July 29, 2024 17:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update flipping logic in SwapInputsController #5948

Update flipping logic in SwapInputsController #5948

jinchung commented Jul 23, 2024 •

edited by christianbaroni

Loading

linear bot commented Jul 23, 2024

jinchung Jul 26, 2024

jinchung Jul 26, 2024

jinchung Jul 26, 2024

jinchung Jul 26, 2024

jinchung Jul 26, 2024

jinchung Jul 26, 2024

jinchung Jul 26, 2024

walmat left a comment

linear bot commented Jul 29, 2024

@@ @@ -640,6 +611,74 @@ export function useSwapInputsController({ @@
                   }
                 );
+                /**

Update flipping logic in SwapInputsController #5948

Update flipping logic in SwapInputsController #5948

Conversation

jinchung commented Jul 23, 2024 • edited by christianbaroni Loading

What changed (plus any additional context for devs)

Screen recordings / screenshots

What to test

linear bot commented Jul 23, 2024

jinchung Jul 26, 2024

Choose a reason for hiding this comment

jinchung Jul 26, 2024

Choose a reason for hiding this comment

jinchung Jul 26, 2024

Choose a reason for hiding this comment

jinchung Jul 26, 2024

Choose a reason for hiding this comment

jinchung Jul 26, 2024

Choose a reason for hiding this comment

jinchung Jul 26, 2024

Choose a reason for hiding this comment

jinchung Jul 26, 2024

Choose a reason for hiding this comment

walmat left a comment

Choose a reason for hiding this comment

linear bot commented Jul 29, 2024

jinchung commented Jul 23, 2024 •

edited by christianbaroni

Loading