feat(suite): show just receiving network in add account #16023
+52
−36
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TomasBoda
commented
Dec 18, 2024
Comment on lines
203
to
210
| <NetworksWrapper> | ||
| <SelectNetwork | ||
| heading={<Translation id="TR_INACTIVE_COINS" />} | ||
| networks={disabledNetworks} | ||
| selectedNetworks={selectedNetworks} | ||
| handleNetworkSelection={selectNetwork} | ||
| /> | ||
| </NetworksWrapper> |
There was a problem hiding this comment.
Showing only relevant networks in the modal
TomasBoda
commented
Dec 18, 2024
| network => !network?.testnet, | ||
| ); | ||
|
|
||
| const disabledNetworks = supportedNetworks.filter(network => network.symbol === symbol); |
There was a problem hiding this comment.
Filtering disabled networks to only the network we want to activate
TomasBoda
commented
Dec 18, 2024
Comment on lines
+43
to
46
| if (device?.connected && isNetworkSupported) { | ||
| selectAccountOptions.push({ type: 'ADD_SUITE' }); | ||
| } |
There was a problem hiding this comment.
Allowing to add a new account for the network only if the network is supported by Suite
TomasBoda
commented
Dec 18, 2024
Comment on lines
131
to
141
| const { supportedMainnets, supportedTestnets } = useNetworkSupport(); | ||
| const findNetworkByType = (network: Network) => network.networkType === currency; | ||
| const isNetworkSupported = | ||
| !!supportedMainnets.find(findNetworkByType) || | ||
| !!supportedTestnets.find(findNetworkByType); | ||
|
|
||
| const selectAccountOptions = useMemo( | ||
| () => getSelectAccountOptions(suiteReceiveAccounts, device), | ||
| [device, suiteReceiveAccounts], | ||
| () => getSelectAccountOptions(suiteReceiveAccounts, device, isNetworkSupported), | ||
| [device, suiteReceiveAccounts, isNetworkSupported], |
There was a problem hiding this comment.
Checking if the network is supported by Suite
TomasBoda
commented
Dec 18, 2024
Comment on lines
217
to
268
| <SelectNetwork | ||
| heading={<Translation id="TR_INACTIVE_COINS" />} | ||
| networks={disabledMainnetNetworks} | ||
| selectedNetworks={selectedNetworks} | ||
| handleNetworkSelection={selectNetwork} | ||
| /> | ||
| </NetworksWrapper> | ||
| {!!disabledTestnetNetworks.length && ( | ||
| <CollapsibleBox | ||
| heading={ | ||
| <Tooltip | ||
| content={ | ||
| <Translation id="TR_TESTNET_COINS_DESCRIPTION" /> | ||
| } | ||
| hasIcon | ||
| > | ||
| <Translation id="TR_TESTNET_COINS" /> | ||
| </Tooltip> | ||
| } | ||
| data-testid="@modal/account/activate_more_coins" | ||
| margin={{ top: spacings.md }} | ||
| > | ||
| <CoinList | ||
| onToggle={selectNetwork} | ||
| networks={disabledTestnetNetworks} | ||
| enabledNetworks={selectedNetworks} | ||
| /> | ||
| </CollapsibleBox> | ||
| )} | ||
| {showUnsupportedCoins && ( | ||
| <CollapsibleBox | ||
| heading={ | ||
| <Tooltip | ||
| hasIcon | ||
| content={ | ||
| <Translation id="TR_UNSUPPORTED_COINS_DESCRIPTION" /> | ||
| } | ||
| > | ||
| <Translation id="TR_UNSUPPORTED_COINS" /> | ||
| </Tooltip> | ||
| } | ||
| data-testid="@modal/account/activate_more_coins" | ||
| margin={{ top: spacings.md }} | ||
| > | ||
| <CoinList | ||
| onToggle={selectNetwork} | ||
| networks={unsupportedMainnets} | ||
| enabledNetworks={selectedNetworks} | ||
| /> | ||
| </CollapsibleBox> | ||
| )} | ||
| </> |
There was a problem hiding this comment.
Removed irrelevant networks from the modal
There was a problem hiding this comment.
This component is also used in the menu, check it.
TomasBoda
changed the title
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
adderpositive
approved these changes
Dec 19, 2024
| @@ -129,7 +130,9 @@ const useCoinmarketVerifyAccount = ({ | |||
| ); | |||
|
|
|||
| const { supportedMainnets, supportedTestnets } = useNetworkSupport(); | |||
| const findNetworkByType = (network: Network) => network.networkType === currency; | |||
| const currencyNetwork = currency === undefined ? undefined : cryptoIdToNetwork(currency); | |||
There was a problem hiding this comment.
Nitpick
Suggested change
| const currencyNetwork = currency === undefined ? undefined : cryptoIdToNetwork(currency); | |
| const currencyNetwork = currency && cryptoIdToNetwork(currency); |
| @@ -129,7 +130,9 @@ const useCoinmarketVerifyAccount = ({ | |||
| ); | |||
|
|
|||
| const { supportedMainnets, supportedTestnets } = useNetworkSupport(); | |||
| const findNetworkByType = (network: Network) => network.networkType === currency; | |||
| const currencyNetwork = currency === undefined ? undefined : cryptoIdToNetwork(currency); | |||
There was a problem hiding this comment.
Nitpick: Could you please change the property name from currency to cryptoId. It would be beneficial next time.
|
Good job @TomasBoda. Looks good. |
TomasBoda
force-pushed
the
add-account-show-just-receiving-network
branch
from
d49bf6d to
b0b8faf
Compare
enjojoy
reviewed
Dec 20, 2024
| @@ -87,6 +87,11 @@ export const AddAccountModal = ({ | |||
| network => !network?.testnet, | |||
| ); | |||
|
|
|||
| const filteredDisabledMainnetNetworks = | |||
| symbol === undefined | |||
There was a problem hiding this comment.
nit 💅
symbol ? disabledMainnetNetworks.filter(network => network.symbol === symbol) : disabledMainnetNetworks
| selectedNetworks={selectedNetworks} | ||
| handleNetworkSelection={selectNetwork} | ||
| /> | ||
| {symbol === undefined && ( |
| selectedNetworks={selectedNetworks} | ||
| handleNetworkSelection={selectNetwork} | ||
| /> | ||
| </NetworksWrapper> | ||
| {!!disabledTestnetNetworks.length && ( | ||
| {symbol === undefined && !!disabledTestnetNetworks.length && ( |
| @@ -243,7 +250,7 @@ export const AddAccountModal = ({ | |||
| /> | |||
| </CollapsibleBox> | |||
| )} | |||
| {showUnsupportedCoins && ( | |||
| {symbol === undefined && showUnsupportedCoins && ( | |||
tomasklim
requested changes
Dec 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
When buying a coin and creating a new account for that coin, the coin select modal should show only the coin we want to buy and hide all other irrelevant coins.
Moreover, when buying a coin that is not supported by Suite, disable creating a new account for that coin.
Related Issue
Resolve #14847
Screenshots:
We are buying Cardano and creating a new account for Cardano, therefore the modal only shows Cardano.
We are buying Arbitrum, which is not supported in Suite, therefore there is only the option to use an account that is not in Suite.