Token input refactoring #21136

vkjr · 2024-08-28T13:04:08Z

fixes #21017

Summary

Token input refactored:

removed unused code for custom selection support
removed unused possibility to control value internally
removed internal conversion logic
no internal state left
component in the bottom left corner made a property because token input will be used with another one in upcoming screens

Controlled input namespace improved:

bignumbers everywhere
conversion functions added

Send screen refactored, bunch of unnecessary properties removed.

Functional

wallet / transactions

Steps to test

Open Status
Open send screen
enter amount to send
swap between amounts
check that there is no visible changes in component behaviour in comparison to previous versions

status: ready

status-im-auto · 2024-08-28T13:07:48Z

Jenkins Builds

Click to see older builds (9)

❔	Commit	#️⃣	Finished (UTC)	Duration	Platform	Result
❌	`d3857dc`	#1	2024-08-28 13:07:48	~3 min	`tests`	📄`log`

✔️	`8fa6a16`	#2	2024-08-28 13:14:49	~5 min	`tests`	📄`log`
✔️	`8fa6a16`	#2	2024-08-28 13:18:44	~9 min	`android-e2e`	🤖`apk` 📲
✔️	`8fa6a16`	#2	2024-08-28 13:19:00	~9 min	`android`	🤖`apk` 📲
✔️	`8fa6a16`	#2	2024-08-28 13:35:01	~25 min	`ios`	📱`ipa` 📲

✔️	`7cd3b4f`	#4	2024-08-30 11:42:57	~4 min	`tests`	📄`log`
✔️	`7cd3b4f`	#4	2024-08-30 11:44:57	~6 min	`android-e2e`	🤖`apk` 📲
✔️	`7cd3b4f`	#4	2024-08-30 11:44:59	~6 min	`android`	🤖`apk` 📲
✔️	`7cd3b4f`	#4	2024-08-30 11:49:45	~11 min	`ios`	📱`ipa` 📲

❔	Commit	#️⃣	Finished (UTC)	Duration	Platform	Result
❌	`9b9b58d`	#5	2024-09-02 09:03:05	~2 min	`tests`	📄`log`
✔️	`9b9b58d`	#5	2024-09-02 09:08:04	~7 min	`android-e2e`	🤖`apk` 📲
✔️	`9b9b58d`	#5	2024-09-02 09:09:27	~9 min	`android`	🤖`apk` 📲
✔️	`9b9b58d`	#5	2024-09-02 09:11:15	~10 min	`ios`	📱`ipa` 📲
❌	`9b9b58d`	#6	2024-09-03 12:15:30	~2 min	`tests`	📄`log`

✔️	`889b048`	#8	2024-09-04 11:59:23	~5 min	`tests`	📄`log`
✔️	`889b048`	#7	2024-09-04 12:02:34	~9 min	`android-e2e`	🤖`apk` 📲
✔️	`889b048`	#7	2024-09-04 12:02:57	~9 min	`android`	🤖`apk` 📲
✔️	`889b048`	#7	2024-09-04 12:04:20	~10 min	`ios`	📱`ipa` 📲

vkjr · 2024-08-28T13:34:18Z

src/quo/components/wallet/token_input/view.cljs

-           :type                :outline
-           :accessibility-label :reorder}
-          :i/reorder]]))))
+  [{:keys [token-symbol on-token-press value error? on-swap currency-symbol]}]


No internal state anymore

vkjr · 2024-08-28T13:35:24Z

src/quo/components/wallet/token_input/view.cljs

     [divider-line/view {:container-style (style/divider theme)}]
-     [data-info (assoc props :theme theme)]]))
+     [rn/view {:style style/data-container}
+      hint-component


Component in the left bottom corner moved out because new screens will use another one in similar token input

vkjr · 2024-08-28T13:37:55Z

src/status_im/common/controlled_input/utils.cljs

+      (money/crypto->fiat conversion-rate)
+      (wallet-utils/cut-fiat-balance-to-two-decimals)))
+
+(defn ->crypto


In components that use controlled input (like send screen) we don't need to maintain a separate value for limit, we can rely on :upper-limit of controlled input, because it is converted along with value.

vkjr · 2024-08-28T13:42:48Z

src/status_im/contexts/wallet/send/routes/view.cljs

-                                                          (set-crypto-currency swap-to-crypto-currency?)
-                                                          (set-input-state
-                                                           (fn [input-state]
+#_(defn- edit-amount


This code is not used in production anyway because we decided to get rid of editing network values before release. Also since we are going to simplify send flow, most probably it wont't be used. It reuses token-input but I decided to not bother fixing it. I believe we can fully remove it but better to do it after final decision of send simplification.

vkjr · 2024-08-28T13:43:19Z

src/utils/money.cljs

@@ -55,8 +55,9 @@
  (.lessThan ^js bn1 bn2))

 (defn equal-to
-  [bn1 bn2]
-  (.eq ^js bn1 bn2))
+  [n1 n2]


App crash on incorrect usage of this function is too much I think.

ulisesmac

Nice contribution @vkjr ! 💯

Please make sure to test everything is still working

ulisesmac · 2024-08-29T22:11:15Z

src/status_im/common/controlled_input/utils.cljs

+     (if (money/bignumber? num-value)
+       (money/greater-than (numeric-value state) (upper-limit state))
+       false))))


(if 'a 'b false) -> (when 'a 'b)

src/status_im/contexts/preview/quo/wallet/token_input.cljs

mariia-skrypnyk · 2024-09-03T09:47:10Z

Hi @vkjr !

Thanks for your PR!
Is it a part of your conversion refactoring when I see some amount difference between PR and Dev builds?

Dev max: $ 0.22
PR max: $ 0.23

status-im-auto · 2024-09-03T09:59:00Z

86% of end-end tests have passed

Total executed tests: 7
Failed tests: 1
Expected to fail tests: 0
Passed tests: 6

IDs of failed tests: 727230

Failed tests (1)

Click to expand

Rerun failed tests

Class TestWalletMultipleDevice:

1. test_wallet_send_asset_from_drawer, id: 727230

Device 2: Find `Text` by `xpath`: `//android.view.ViewGroup[@content-desc='container']/android.widget.TextView[@text='Ether']/../android.widget.TextView[3]`
Device 2: `Text` is `0.04499 ETH`

critical/test_wallet.py:190: in test_wallet_send_asset_from_drawer
    self.errors.verify_no_errors()
base_test_case.py:191: in verify_no_errors
    pytest.fail('\n '.join([self.errors.pop(0) for _ in range(len(self.errors))]))
 Sender balance is not updated on Etherscan, it is 0.444 but expected to be 0.4441

Passed tests (6)

Click to expand

Class TestCommunityMultipleDeviceMerged:

1. test_community_message_edit, id: 702843
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs

Class TestWalletOneDevice:

1. test_wallet_add_remove_regular_account, id: 727231
Device sessions Device 1: Steps, video, logs

Class TestOneToOneChatMultipleSharedDevicesNewUi:

1. test_1_1_chat_non_latin_messages_stack_update_profile_photo, id: 702745
Device sessions Device 1: Steps, video, logs Device 2: Steps, video, logs

Class TestCommunityOneDeviceMerged:

1. test_restore_multiaccount_with_waku_backup_remove_switch, id: 703133
Device sessions Device 1: Steps, video, logs
2. test_community_copy_and_paste_message_in_chat_input, id: 702742
Device sessions Device 1: Steps, video, logs

Class TestWalletMultipleDevice:

1. test_wallet_send_eth, id: 727229

vkjr · 2024-09-03T12:11:27Z

@mariia-skrypnyk, not sure about the reason of this difference. Could be due to refactorings. And could be related to conversion rate at that moment. How much STT you had at that moment?

mariia-skrypnyk · 2024-09-03T12:24:41Z

@mariia-skrypnyk, not sure about the reason of this difference. Could be due to refactorings. And could be related to conversion rate at that moment. How much STT you had at that moment?

Thanks @vkjr I have 11 STT.

vkjr · 2024-09-03T13:40:06Z

@mariia-skrypnyk, I rechecked and yes, it is probably due to refactoring and I trust the new result more. But if you feel that max value calculated incorrectly for current price - tell me.

mariia-skrypnyk · 2024-09-03T14:40:56Z

Thanks @vkjr !

All good as we checked this calculation in a real mode!
PR can be merged.

vkjr · 2024-09-04T12:05:31Z

@mariia-skrypnyk, thanks!

vkjr self-assigned this Aug 28, 2024

vkjr marked this pull request as ready for review August 28, 2024 13:28

vkjr requested review from briansztamfater, smohamedjavid, mohsen-ghafouri, ulisesmac and shivekkhurana August 28, 2024 13:29

vkjr commented Aug 28, 2024

View reviewed changes

ulisesmac approved these changes Aug 29, 2024

View reviewed changes

vkjr force-pushed the token-input-refactoring2 branch from 32e192b to 7cd3b4f Compare August 30, 2024 11:38

vkjr added the request-manual-qa label Aug 30, 2024

pavloburykh force-pushed the token-input-refactoring2 branch from 7cd3b4f to 9b9b58d Compare September 2, 2024 09:00

mariia-skrypnyk self-assigned this Sep 3, 2024

mariia-skrypnyk added the Tested - OK label Sep 3, 2024

vkjr force-pushed the token-input-refactoring2 branch from 9b9b58d to c07ea6a Compare September 4, 2024 11:51

token input refactoring

889b048

vkjr force-pushed the token-input-refactoring2 branch from c07ea6a to 889b048 Compare September 4, 2024 11:53

vkjr merged commit 40f98f8 into develop Sep 4, 2024
6 checks passed

vkjr deleted the token-input-refactoring2 branch September 4, 2024 12:05

This was referenced Sep 7, 2024

"Objects are not valid as a React child" Error Displayed When Attempting to Send Multi-Collectible #21183

Closed

Router clean up #21235

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Token input refactoring #21136

Token input refactoring #21136

vkjr commented Aug 28, 2024 •

edited

Loading

status-im-auto commented Aug 28, 2024 •

edited

Loading

vkjr Aug 28, 2024

vkjr Aug 28, 2024

vkjr Aug 28, 2024

vkjr Aug 28, 2024

vkjr Aug 28, 2024 •

edited

Loading

ulisesmac left a comment

ulisesmac Aug 29, 2024

mariia-skrypnyk commented Sep 3, 2024

status-im-auto commented Sep 3, 2024

Class TestWalletMultipleDevice:

Class TestCommunityMultipleDeviceMerged:

Class TestWalletOneDevice:

Class TestOneToOneChatMultipleSharedDevicesNewUi:

Class TestCommunityOneDeviceMerged:

Class TestWalletMultipleDevice:

vkjr commented Sep 3, 2024

mariia-skrypnyk commented Sep 3, 2024

vkjr commented Sep 3, 2024

mariia-skrypnyk commented Sep 3, 2024

vkjr commented Sep 4, 2024

Token input refactoring #21136

Token input refactoring #21136

Conversation

vkjr commented Aug 28, 2024 • edited Loading

Summary

Functional

Steps to test

status-im-auto commented Aug 28, 2024 • edited Loading

Jenkins Builds

vkjr Aug 28, 2024

Choose a reason for hiding this comment

vkjr Aug 28, 2024

Choose a reason for hiding this comment

vkjr Aug 28, 2024

Choose a reason for hiding this comment

vkjr Aug 28, 2024

Choose a reason for hiding this comment

vkjr Aug 28, 2024 • edited Loading

Choose a reason for hiding this comment

ulisesmac left a comment

Choose a reason for hiding this comment

ulisesmac Aug 29, 2024

Choose a reason for hiding this comment

mariia-skrypnyk commented Sep 3, 2024

status-im-auto commented Sep 3, 2024

86% of end-end tests have passed

Failed tests (1)

Class TestWalletMultipleDevice:

Passed tests (6)

Class TestCommunityMultipleDeviceMerged:

Class TestWalletOneDevice:

Class TestOneToOneChatMultipleSharedDevicesNewUi:

Class TestCommunityOneDeviceMerged:

Class TestWalletMultipleDevice:

vkjr commented Sep 3, 2024

mariia-skrypnyk commented Sep 3, 2024

vkjr commented Sep 3, 2024

mariia-skrypnyk commented Sep 3, 2024

vkjr commented Sep 4, 2024

vkjr commented Aug 28, 2024 •

edited

Loading

status-im-auto commented Aug 28, 2024 •

edited

Loading

vkjr Aug 28, 2024 •

edited

Loading