Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui-ux): fix selection of whitelisted address that redirects to edit address #4040

Merged

Conversation

lykalabrada
Copy link
Contributor

What this PR does / why we need it:

As titled.

Which issue(s) does this PR fixes?:

Fixes DFC-301

Additional comments?:

Developer Checklist:

  • Read your code changes at least once
  • Tested on iOS/Android device (e.g, No crashes, library supported etc.)
  • No console errors on web
  • Tested on Light mode and Dark mode*
  • Your UI implementation visually matched the rendered design*
  • Unit tests*
  • Added e2e tests*
  • Added translations*

@linear
Copy link

linear bot commented Oct 3, 2023

DFC-301 Bug Report - Send -> select address bug

What happened?

  1. Go to send screen
  2. Select an address (EVM/DVM)
  3. I was redirected to edit the address details

What did you expect to happen?

  1. Go to send screen
  2. Select an address (EVM/DVM)
  3. The address should be selected

How to reproduce it (as minimally and precisely as possible):

Anything else that the team needs to know?

@github-actions
Copy link
Contributor

github-actions bot commented Oct 3, 2023

Missing Translations Report

The following translations are missing for this pull request.

{
    "missingLanguageItems": {
        "zh-Hans": {
            "missingCount": 0,
            "labels": {},
            "totalCount": 2002,
            "allLabels": "{}"
        },
        "zh-Hant": {
            "missingCount": 0,
            "labels": {},
            "totalCount": 2002,
            "allLabels": "{}"
        },
        "fr": {
            "missingCount": 0,
            "labels": {},
            "totalCount": 2002,
            "allLabels": "{}"
        },
        "es": {
            "missingCount": 0,
            "labels": {},
            "totalCount": 2002,
            "allLabels": "{}"
        },
        "it": {
            "missingCount": 0,
            "labels": {},
            "totalCount": 2002,
            "allLabels": "{}"
        }
    },
    "totalMissingCount": 0
}

@github-actions
Copy link
Contributor

github-actions bot commented Oct 3, 2023

Build preview for DeFiChain Wallet is ready!

Built with commit 1f7cb33

https://expo.io/@defichain/wallet?release-channel=pr-preview-4040

@chloezxyy
Copy link
Contributor

image

Bug in address book

@pierregee pierregee merged commit fd79b4d into pierregee/evm-convert-screen Oct 4, 2023
6 checks passed
@pierregee pierregee deleted the lyka/fix-send-address-selection branch October 4, 2023 07:03
Comment on lines +383 to 385
<>
<ThemedTextV2
style={tailwind("font-semibold-v2 text-sm min-w-0")}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<>
<ThemedTextV2
style={tailwind("font-semibold-v2 text-sm min-w-0")}
<View style={tailwind("flex flex-auto mr-1")}>
<ThemedTextV2
style={tailwind("font-semibold-v2 text-sm min-w-0")}

@@ -413,7 +406,7 @@ export function AddressBookScreen({ route, navigation }: Props): JSX.Element {
</Text>
</LinearGradient>
)}
</TouchableOpacity>
</>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
</>
</View>

pierregee pushed a commit that referenced this pull request Oct 9, 2023
* feat(core): allow evm conversion

* update value and text based on domain

* feature(ui-ux): evm support for address book  (#4008)

* initial commit for address book

* added backward compatibility

* create and edit address update

* added style for portfolio bottom sheet

* fix linting

* lint fix

* added address type selector

* making close icon size to 22 px consistant

* added address type selector in AddressRow component

* seperating instance of addressbook and walletaddresses

* test fix

* chore

* backward compatibility for already saved address

* bug fix

* add search support for evm address

* lint issue fix

* added selectAllLabeledWalletAddress selector to show address label for evm address

* removed unused filters and attributes

* chore

* added evm tag

* chore fix

* chore key error fix

* added e2e tests

* added translation

* chore: fixed pr comments

* translation

* fix(ui-ux): fixed domain switch toggle (#4012)

* fix(ui-ux): fixed domain switch toggle

* added testcse

* updated DFI to DVM

* updated DFI to DVM in enum

* updated dfi to dvm in useWalletAddress

* toggle btn style fix

* test case fix

* feat(core): support transfer domain in convert screen (#4014)

* feat(core): support transfer domain in convert screen

* ensure utxo reserved fee when converting from utxo to dfi

* consistent function init

* explicit function return type

* set state by following data change instead of triggering via event

* consistent naming convention across convert screen and hooks

* fix displayed text for token symbol

* declare hooks before any function

* handle disabled toggle button

* fix displayed text on convert screen

* update toast in text

* fix transfer domain signer

* fix lints

* fix token detail screen navigation to convert

* update unit texts

* update drawer and prompts for dfi converter

* Update more explicit token convert symbols

* suffix with -evm for evm tokens

* fix lint

* fix hardcoded domain

* fix(ui-ux): translations for convert screen (#4028)

* fix(ui-ux): update copy text in convert screen

* fix(ui-ux): update translations

* add translations

* translations

* update de translations

* add missing it translation object

* fix conflict

* chore(ops): bump packages to display changi (#4030)

* chore(ops): bump to add changi network

* chore(ops): bump packages to display changi

* feat(ui-ux): add svg icons for sui and xchf tokens (#4031)

* feat(ui-ux): add svg icons for sui and xchf tokens

* fix invlalid svg props

* update sui svg to a flatter one

* fix rect prop

---------

Co-authored-by: JJ Adonis <[email protected]>

* fix(ui-ux): updated walletkit package to filter out burn token pool pair (#4033)

* fix(ui-ux): updated walletkit package to filter out burn token pool pair

* fix(e2e): network details

* chore(ops): bump walletkit (#4036)

* fix(ui-ux): svg border for evm tokens (#4029)

* fix(ui-ux): svg border for evm tokens

* fix(ui-ux): conditional icon sizing with svg border on evm tokens

* feature(ui-ux): enable transfer domain (#4032)

* fix(ui-ux): filter out LP tokens in EVM domain

* fix(ui-ux): UI labels for address types

* fix(ui-ux): sendconfirmationscreen evm bg for addresses

* fix(ui-ux): hide any address labels if there are error messages

* remove unused comment

* fix lint

* fix(ui-ux): to display address label even with err msg

* fix(ui-ux): labelled address

* fix(ui-ux): cater for selected whitelisted evm addr

* feat(e2e): add tests

* fix: lint for AddressRow

* feat: enable transfer domain

* fix(ui-ux): update UI for convert confirmation screen

* fix(e2e): network details

* Revert "fix(e2e): network details"

This reverts commit c29aef8.

* fix(ui-ux): update isEVMDomain flag

* fix(ui-ux): remove LP filter

* fix(lint): add empty data for evmtx

---------

Co-authored-by: Lyka Labrada <[email protected]>

* fix(ui-ux): fix selection of whitelisted address that redirects to edit address (#4040)

* fix(ui-ux): fix selection of whitelisted address that redirects to edit address

* chore(test): update snapshot

* chore(ui-ux): resolved ui bug for address book screen (#4041)

* fix(ui-ux): copy evm address when evm domain is toggled on (#4043)

* feat(core): add evmtx signer on convert (#4038)

* feat(core): add evmtx signer on convert

* feat(core): fix evmxt 'to' address for dvm to evm transferdomain

* feat(core): update transferdomain implementation for dst20 tokens

* feat(core): update handle transferdomain tokenId for EVM tokens

* update docker

* update evmtx signature

* update check for dfi token

* add function to get dst20 token contract address

* revert unnecessary changes on feautureflagcontext

* update blockchain node to beta14

* feat(core): implement transfer domain with signed evmtx on Send

* add README.md for the contractA abi

* extraxt evmtx signer into a separate function

* add todo

* remove commented line

* set nonce to 0

* feature(ui-ux): address book ui for transfer domain (#4042)

* feature(ui-ux): address book UI for transfer domain

* feature(ui-ux): address book bottom sheet in portfolio page

* update comment

* remove eslint-disable-next-line react-hooks/exhaustive-deps

* feat(ui-ux): standardize evm tag UI across screens

* feat(ui-ux): display address label

* fix(ui-ux): remove caret if not from send screen

* chore: update package

* fix: lint for address row

* fix(ui-ux): fix send nonce and vm address (#4045)

---------

Co-authored-by: Harsh R <[email protected]>
Co-authored-by: Chloe <[email protected]>
Co-authored-by: Lyka Labrada <[email protected]>
Co-authored-by: JJ Adonis <[email protected]>
pierregee pushed a commit that referenced this pull request Oct 11, 2023
* feat(core): allow evm conversion

* update value and text based on domain

* feat(ui-ux): fetch evm balance for convert screen

* feat(ui-ux): rename ethTokenBalances to evmTokenBalances

* remove 0x address

* update eth rpc for testnet

* feature(ui-ux): evm support for address book  (#4008)

* initial commit for address book

* added backward compatibility

* create and edit address update

* added style for portfolio bottom sheet

* fix linting

* lint fix

* added address type selector

* making close icon size to 22 px consistant

* added address type selector in AddressRow component

* seperating instance of addressbook and walletaddresses

* test fix

* chore

* backward compatibility for already saved address

* bug fix

* add search support for evm address

* lint issue fix

* added selectAllLabeledWalletAddress selector to show address label for evm address

* removed unused filters and attributes

* chore

* added evm tag

* chore fix

* chore key error fix

* added e2e tests

* added translation

* chore: fixed pr comments

* translation

* fix(ui-ux): fixed domain switch toggle (#4012)

* fix(ui-ux): fixed domain switch toggle

* added testcse

* updated DFI to DVM

* updated DFI to DVM in enum

* updated dfi to dvm in useWalletAddress

* toggle btn style fix

* test case fix

* replace token0 with CAS

* feat(core): fetch eth coin balance

* rename ethRpc to evmApi

* add evm address details type

* feat(core): add evmAddress inside WalletContext

* feat(ui-ux): display evm address on portfolio when EVM domain is toggled

* revert getEvmAddress

* remove promise return type in walletcontext

* feat(core): support transfer domain in convert screen (#4014)

* feat(core): support transfer domain in convert screen

* ensure utxo reserved fee when converting from utxo to dfi

* consistent function init

* explicit function return type

* set state by following data change instead of triggering via event

* consistent naming convention across convert screen and hooks

* fix displayed text for token symbol

* declare hooks before any function

* handle disabled toggle button

* fix displayed text on convert screen

* update toast in text

* fix transfer domain signer

* fix lints

* fix token detail screen navigation to convert

* update unit texts

* update drawer and prompts for dfi converter

* Update more explicit token convert symbols

* suffix with -evm for evm tokens

* fix lint

* fix hardcoded domain

* update evm tokens on convert screen

* fix(ui-ux): translations for convert screen (#4028)

* fix(ui-ux): update copy text in convert screen

* fix(ui-ux): update translations

* add translations

* translations

* update de translations

* add missing it translation object

* fix conflict

* chore(ops): bump packages to display changi (#4030)

* chore(ops): bump to add changi network

* chore(ops): bump packages to display changi

* feat(ui-ux): add svg icons for sui and xchf tokens (#4031)

* feat(ui-ux): add svg icons for sui and xchf tokens

* fix invlalid svg props

* update sui svg to a flatter one

* fix rect prop

---------

Co-authored-by: JJ Adonis <[email protected]>

* fix(ui-ux): updated walletkit package to filter out burn token pool pair (#4033)

* fix(ui-ux): updated walletkit package to filter out burn token pool pair

* fix(e2e): network details

* chore(ops): bump walletkit (#4036)

* fix(ui-ux): svg border for evm tokens (#4029)

* fix(ui-ux): svg border for evm tokens

* fix(ui-ux): conditional icon sizing with svg border on evm tokens

* feature(ui-ux): enable transfer domain (#4032)

* fix(ui-ux): filter out LP tokens in EVM domain

* fix(ui-ux): UI labels for address types

* fix(ui-ux): sendconfirmationscreen evm bg for addresses

* fix(ui-ux): hide any address labels if there are error messages

* remove unused comment

* fix lint

* fix(ui-ux): to display address label even with err msg

* fix(ui-ux): labelled address

* fix(ui-ux): cater for selected whitelisted evm addr

* feat(e2e): add tests

* fix: lint for AddressRow

* feat: enable transfer domain

* fix(ui-ux): update UI for convert confirmation screen

* fix(e2e): network details

* Revert "fix(e2e): network details"

This reverts commit c29aef8.

* fix(ui-ux): update isEVMDomain flag

* fix(ui-ux): remove LP filter

* fix(lint): add empty data for evmtx

---------

Co-authored-by: Lyka Labrada <[email protected]>

* fix(ui-ux): fix selection of whitelisted address that redirects to edit address (#4040)

* fix(ui-ux): fix selection of whitelisted address that redirects to edit address

* chore(test): update snapshot

* chore(ui-ux): resolved ui bug for address book screen (#4041)

* update temporary blockscout api

* feature(ui-ux): updated receive token screen to support evm address (#4025)

Co-authored-by: Lyka Labrada <[email protected]>

* fix(ui-ux): copy evm address when evm domain is toggled on (#4043)

* feat(core): add evmtx signer on convert (#4038)

* feat(core): add evmtx signer on convert

* feat(core): fix evmxt 'to' address for dvm to evm transferdomain

* feat(core): update transferdomain implementation for dst20 tokens

* feat(core): update handle transferdomain tokenId for EVM tokens

* update docker

* update evmtx signature

* update check for dfi token

* add function to get dst20 token contract address

* revert unnecessary changes on feautureflagcontext

* update blockchain node to beta14

* feat(core): implement transfer domain with signed evmtx on Send

* add README.md for the contractA abi

* extraxt evmtx signer into a separate function

* add todo

* remove commented line

* set nonce to 0

* add default target evm token

* feature(ui-ux): address book ui for transfer domain (#4042)

* feature(ui-ux): address book UI for transfer domain

* feature(ui-ux): address book bottom sheet in portfolio page

* update comment

* remove eslint-disable-next-line react-hooks/exhaustive-deps

* feat(ui-ux): standardize evm tag UI across screens

* feat(ui-ux): display address label

* fix(ui-ux): remove caret if not from send screen

* chore: update package

* fix: lint for address row

* feature(ui-ux): updated portfolio screen to support evm address (#4044)

* chore

* added logic for total portfolio value

* updated defichain version

* Update evmApi.ts

* add default target evm token

* chore

---------

Co-authored-by: Lyka Labrada <[email protected]>

* fix missing evm target token for non-dfi tokens

* transferdomain - get dynamic eth rpc url per network

* fix(core): updated token selection screen (#4047)

fix(core): updated tokenselectionscreen

* fix(ui-ux): fix convert selection (#4048)

Co-authored-by: Lyka Labrada <[email protected]>

* feat(ui-ux): move evm data inside redux store (#4049)

* feat(ui-ux): move evm data inside redux store

* perform batch dispatch

* update deps array when fetching evm details

---------

Co-authored-by: pierregee <[email protected]>
Co-authored-by: Harsh R <[email protected]>
Co-authored-by: Chloe <[email protected]>
Co-authored-by: JJ Adonis <[email protected]>
Co-authored-by: Harsh <[email protected]>
thedoublejay added a commit that referenced this pull request Oct 25, 2023
* feature(ui-ux): added dvm evm designs for onboarding (#3983)

* added new image slide on the welcome screen

* added condition to create wallet page

* shortened import

* update snapshot

* added onboarding translations

* added DE and FR translations

* Update mobile-app/app/components/icons/WalletIcon.tsx

Co-authored-by: Lyka Labrada <[email protected]>

* Update mobile-app/app/components/icons/WalletIcon.tsx

Co-authored-by: Lyka Labrada <[email protected]>

* fixed logo cut off

* updated snapshot

* included contentFit contain

* updated for consistency

* Update shared/translations/languages/zh-Hant.json

Co-authored-by: Harsh R <[email protected]>

* Update shared/translations/languages/zh-Hant.json

Co-authored-by: Harsh R <[email protected]>

* Update shared/translations/languages/zh-Hant.json

Co-authored-by: Harsh R <[email protected]>

* Update shared/translations/languages/zh-Hans.json

Co-authored-by: Harsh R <[email protected]>

* Update shared/translations/languages/zh-Hans.json

Co-authored-by: Harsh R <[email protected]>

* Update shared/translations/languages/zh-Hans.json

Co-authored-by: Harsh R <[email protected]>

* Update shared/translations/languages/it.json

Co-authored-by: Harsh R <[email protected]>

* Update shared/translations/languages/fr.json

Co-authored-by: Harsh R <[email protected]>

* Update shared/translations/languages/it.json

Co-authored-by: Harsh R <[email protected]>

* Update shared/translations/languages/fr.json

Co-authored-by: Harsh R <[email protected]>

* Update shared/translations/languages/de.json

Co-authored-by: Harsh R <[email protected]>

* Update shared/translations/languages/es.json

Co-authored-by: Harsh R <[email protected]>

* Update shared/translations/languages/es.json

Co-authored-by: Harsh R <[email protected]>

* Update shared/translations/languages/de.json

Co-authored-by: Harsh R <[email protected]>

* updated ZHS and ZHT translations

* Update mobile-app/app/screens/WalletNavigator/screens/CreateWallet/CreateWalletGuidelines.tsx

Co-authored-by: Harsh R <[email protected]>

* removed unnecessary return

---------

Co-authored-by: Lyka Labrada <[email protected]>
Co-authored-by: Harsh R <[email protected]>

* feature(ui-ux): dvm <> evm portfolio (#3979)

* moved toggle_balance below

* added mb for android

* added DFI and EVM button

* design changed; moved toggle balance back

* added domain toggle skeleton

* added domainProvider

* added domain context to switch

* added switch to portfolio navigator

* added gradient border

* conditionally display elements

* some styling for EVM page

* empty portfolio

* empty evm portfolio

* used common icon

* updated the stylings

* removed get DFI tag for EVM

* changed to enum

* updated to use ENUM instead

* Update mobile-app/app/screens/AppNavigator/screens/Portfolio/PortfolioScreen.tsx

Co-authored-by: Lyka Labrada <[email protected]>

* Update mobile-app/app/screens/AppNavigator/screens/Portfolio/PortfolioScreen.tsx

Co-authored-by: Lyka Labrada <[email protected]>

* Update mobile-app/app/components/DomainSwitch.tsx

Co-authored-by: Lyka Labrada <[email protected]>

* Update mobile-app/app/screens/AppNavigator/screens/Portfolio/components/ActionButtons.tsx

Co-authored-by: Lyka Labrada <[email protected]>

* Update mobile-app/app/screens/AppNavigator/screens/Portfolio/components/DFIBalanceCard.tsx

Co-authored-by: Lyka Labrada <[email protected]>

* reduced isEvmDomain conditions and css show/hide

* moved condition outside of component

* removed isEvmDomain for test.tsx

* removed unnecessary isEvmDomain

* Update mobile-app/app/screens/AppNavigator/screens/Portfolio/components/TotalPortfolio.tsx

Co-authored-by: Lyka Labrada <[email protected]>

* fix(core): portfolio (evm-dvm) tests fix (#4006)

* fix(core): portfolio tests fix

* fix action button tests

* rename to domain context

* rename on mock

* rename mock file

---------

Co-authored-by: Lyka Labrada <[email protected]>
Co-authored-by: Pierre Gee <[email protected]>
Co-authored-by: Pierre Gee <[email protected]>

* feat(ui-ux): hide bottom nagivation when EMV network is selected (#4011)

* feat(ui-ux): hide bottom nagivation when EMV network is selected

* future proof condition

* chore(ops): bump to add changi network

* chore(ops): bump packages to display changi

* feat(ui-ux): add evm faq screen (#4013)

* feat(ui-ux): add evm faq screen

* feat(ui-ux): update test snapshot

* add metachain faq translations

* add evm faq english translation for es and it

---------

Co-authored-by: Pierre Gee <[email protected]>

* feat(core): Transfer Domain feature branch (WIP) (#4007)

* feat(core): allow evm conversion

* update value and text based on domain

* feature(ui-ux): evm support for address book  (#4008)

* initial commit for address book

* added backward compatibility

* create and edit address update

* added style for portfolio bottom sheet

* fix linting

* lint fix

* added address type selector

* making close icon size to 22 px consistant

* added address type selector in AddressRow component

* seperating instance of addressbook and walletaddresses

* test fix

* chore

* backward compatibility for already saved address

* bug fix

* add search support for evm address

* lint issue fix

* added selectAllLabeledWalletAddress selector to show address label for evm address

* removed unused filters and attributes

* chore

* added evm tag

* chore fix

* chore key error fix

* added e2e tests

* added translation

* chore: fixed pr comments

* translation

* fix(ui-ux): fixed domain switch toggle (#4012)

* fix(ui-ux): fixed domain switch toggle

* added testcse

* updated DFI to DVM

* updated DFI to DVM in enum

* updated dfi to dvm in useWalletAddress

* toggle btn style fix

* test case fix

* feat(core): support transfer domain in convert screen (#4014)

* feat(core): support transfer domain in convert screen

* ensure utxo reserved fee when converting from utxo to dfi

* consistent function init

* explicit function return type

* set state by following data change instead of triggering via event

* consistent naming convention across convert screen and hooks

* fix displayed text for token symbol

* declare hooks before any function

* handle disabled toggle button

* fix displayed text on convert screen

* update toast in text

* fix transfer domain signer

* fix lints

* fix token detail screen navigation to convert

* update unit texts

* update drawer and prompts for dfi converter

* Update more explicit token convert symbols

* suffix with -evm for evm tokens

* fix lint

* fix hardcoded domain

* fix(ui-ux): translations for convert screen (#4028)

* fix(ui-ux): update copy text in convert screen

* fix(ui-ux): update translations

* add translations

* translations

* update de translations

* add missing it translation object

* fix conflict

* chore(ops): bump packages to display changi (#4030)

* chore(ops): bump to add changi network

* chore(ops): bump packages to display changi

* feat(ui-ux): add svg icons for sui and xchf tokens (#4031)

* feat(ui-ux): add svg icons for sui and xchf tokens

* fix invlalid svg props

* update sui svg to a flatter one

* fix rect prop

---------

Co-authored-by: JJ Adonis <[email protected]>

* fix(ui-ux): updated walletkit package to filter out burn token pool pair (#4033)

* fix(ui-ux): updated walletkit package to filter out burn token pool pair

* fix(e2e): network details

* chore(ops): bump walletkit (#4036)

* fix(ui-ux): svg border for evm tokens (#4029)

* fix(ui-ux): svg border for evm tokens

* fix(ui-ux): conditional icon sizing with svg border on evm tokens

* feature(ui-ux): enable transfer domain (#4032)

* fix(ui-ux): filter out LP tokens in EVM domain

* fix(ui-ux): UI labels for address types

* fix(ui-ux): sendconfirmationscreen evm bg for addresses

* fix(ui-ux): hide any address labels if there are error messages

* remove unused comment

* fix lint

* fix(ui-ux): to display address label even with err msg

* fix(ui-ux): labelled address

* fix(ui-ux): cater for selected whitelisted evm addr

* feat(e2e): add tests

* fix: lint for AddressRow

* feat: enable transfer domain

* fix(ui-ux): update UI for convert confirmation screen

* fix(e2e): network details

* Revert "fix(e2e): network details"

This reverts commit c29aef8.

* fix(ui-ux): update isEVMDomain flag

* fix(ui-ux): remove LP filter

* fix(lint): add empty data for evmtx

---------

Co-authored-by: Lyka Labrada <[email protected]>

* fix(ui-ux): fix selection of whitelisted address that redirects to edit address (#4040)

* fix(ui-ux): fix selection of whitelisted address that redirects to edit address

* chore(test): update snapshot

* chore(ui-ux): resolved ui bug for address book screen (#4041)

* fix(ui-ux): copy evm address when evm domain is toggled on (#4043)

* feat(core): add evmtx signer on convert (#4038)

* feat(core): add evmtx signer on convert

* feat(core): fix evmxt 'to' address for dvm to evm transferdomain

* feat(core): update transferdomain implementation for dst20 tokens

* feat(core): update handle transferdomain tokenId for EVM tokens

* update docker

* update evmtx signature

* update check for dfi token

* add function to get dst20 token contract address

* revert unnecessary changes on feautureflagcontext

* update blockchain node to beta14

* feat(core): implement transfer domain with signed evmtx on Send

* add README.md for the contractA abi

* extraxt evmtx signer into a separate function

* add todo

* remove commented line

* set nonce to 0

* feature(ui-ux): address book ui for transfer domain (#4042)

* feature(ui-ux): address book UI for transfer domain

* feature(ui-ux): address book bottom sheet in portfolio page

* update comment

* remove eslint-disable-next-line react-hooks/exhaustive-deps

* feat(ui-ux): standardize evm tag UI across screens

* feat(ui-ux): display address label

* fix(ui-ux): remove caret if not from send screen

* chore: update package

* fix: lint for address row

* fix(ui-ux): fix send nonce and vm address (#4045)

---------

Co-authored-by: Harsh R <[email protected]>
Co-authored-by: Chloe <[email protected]>
Co-authored-by: Lyka Labrada <[email protected]>
Co-authored-by: JJ Adonis <[email protected]>

* fix(ui-ux): address book bottom sheet in portfolio page (#4046)

* fix(ui-ux): address book bottom sheet in portfolio page

* add check if editing current address label

* feat(ui-ux): fetch evm balance for convert screen (#4009)

* feat(core): allow evm conversion

* update value and text based on domain

* feat(ui-ux): fetch evm balance for convert screen

* feat(ui-ux): rename ethTokenBalances to evmTokenBalances

* remove 0x address

* update eth rpc for testnet

* feature(ui-ux): evm support for address book  (#4008)

* initial commit for address book

* added backward compatibility

* create and edit address update

* added style for portfolio bottom sheet

* fix linting

* lint fix

* added address type selector

* making close icon size to 22 px consistant

* added address type selector in AddressRow component

* seperating instance of addressbook and walletaddresses

* test fix

* chore

* backward compatibility for already saved address

* bug fix

* add search support for evm address

* lint issue fix

* added selectAllLabeledWalletAddress selector to show address label for evm address

* removed unused filters and attributes

* chore

* added evm tag

* chore fix

* chore key error fix

* added e2e tests

* added translation

* chore: fixed pr comments

* translation

* fix(ui-ux): fixed domain switch toggle (#4012)

* fix(ui-ux): fixed domain switch toggle

* added testcse

* updated DFI to DVM

* updated DFI to DVM in enum

* updated dfi to dvm in useWalletAddress

* toggle btn style fix

* test case fix

* replace token0 with CAS

* feat(core): fetch eth coin balance

* rename ethRpc to evmApi

* add evm address details type

* feat(core): add evmAddress inside WalletContext

* feat(ui-ux): display evm address on portfolio when EVM domain is toggled

* revert getEvmAddress

* remove promise return type in walletcontext

* feat(core): support transfer domain in convert screen (#4014)

* feat(core): support transfer domain in convert screen

* ensure utxo reserved fee when converting from utxo to dfi

* consistent function init

* explicit function return type

* set state by following data change instead of triggering via event

* consistent naming convention across convert screen and hooks

* fix displayed text for token symbol

* declare hooks before any function

* handle disabled toggle button

* fix displayed text on convert screen

* update toast in text

* fix transfer domain signer

* fix lints

* fix token detail screen navigation to convert

* update unit texts

* update drawer and prompts for dfi converter

* Update more explicit token convert symbols

* suffix with -evm for evm tokens

* fix lint

* fix hardcoded domain

* update evm tokens on convert screen

* fix(ui-ux): translations for convert screen (#4028)

* fix(ui-ux): update copy text in convert screen

* fix(ui-ux): update translations

* add translations

* translations

* update de translations

* add missing it translation object

* fix conflict

* chore(ops): bump packages to display changi (#4030)

* chore(ops): bump to add changi network

* chore(ops): bump packages to display changi

* feat(ui-ux): add svg icons for sui and xchf tokens (#4031)

* feat(ui-ux): add svg icons for sui and xchf tokens

* fix invlalid svg props

* update sui svg to a flatter one

* fix rect prop

---------

Co-authored-by: JJ Adonis <[email protected]>

* fix(ui-ux): updated walletkit package to filter out burn token pool pair (#4033)

* fix(ui-ux): updated walletkit package to filter out burn token pool pair

* fix(e2e): network details

* chore(ops): bump walletkit (#4036)

* fix(ui-ux): svg border for evm tokens (#4029)

* fix(ui-ux): svg border for evm tokens

* fix(ui-ux): conditional icon sizing with svg border on evm tokens

* feature(ui-ux): enable transfer domain (#4032)

* fix(ui-ux): filter out LP tokens in EVM domain

* fix(ui-ux): UI labels for address types

* fix(ui-ux): sendconfirmationscreen evm bg for addresses

* fix(ui-ux): hide any address labels if there are error messages

* remove unused comment

* fix lint

* fix(ui-ux): to display address label even with err msg

* fix(ui-ux): labelled address

* fix(ui-ux): cater for selected whitelisted evm addr

* feat(e2e): add tests

* fix: lint for AddressRow

* feat: enable transfer domain

* fix(ui-ux): update UI for convert confirmation screen

* fix(e2e): network details

* Revert "fix(e2e): network details"

This reverts commit c29aef8.

* fix(ui-ux): update isEVMDomain flag

* fix(ui-ux): remove LP filter

* fix(lint): add empty data for evmtx

---------

Co-authored-by: Lyka Labrada <[email protected]>

* fix(ui-ux): fix selection of whitelisted address that redirects to edit address (#4040)

* fix(ui-ux): fix selection of whitelisted address that redirects to edit address

* chore(test): update snapshot

* chore(ui-ux): resolved ui bug for address book screen (#4041)

* update temporary blockscout api

* feature(ui-ux): updated receive token screen to support evm address (#4025)

Co-authored-by: Lyka Labrada <[email protected]>

* fix(ui-ux): copy evm address when evm domain is toggled on (#4043)

* feat(core): add evmtx signer on convert (#4038)

* feat(core): add evmtx signer on convert

* feat(core): fix evmxt 'to' address for dvm to evm transferdomain

* feat(core): update transferdomain implementation for dst20 tokens

* feat(core): update handle transferdomain tokenId for EVM tokens

* update docker

* update evmtx signature

* update check for dfi token

* add function to get dst20 token contract address

* revert unnecessary changes on feautureflagcontext

* update blockchain node to beta14

* feat(core): implement transfer domain with signed evmtx on Send

* add README.md for the contractA abi

* extraxt evmtx signer into a separate function

* add todo

* remove commented line

* set nonce to 0

* add default target evm token

* feature(ui-ux): address book ui for transfer domain (#4042)

* feature(ui-ux): address book UI for transfer domain

* feature(ui-ux): address book bottom sheet in portfolio page

* update comment

* remove eslint-disable-next-line react-hooks/exhaustive-deps

* feat(ui-ux): standardize evm tag UI across screens

* feat(ui-ux): display address label

* fix(ui-ux): remove caret if not from send screen

* chore: update package

* fix: lint for address row

* feature(ui-ux): updated portfolio screen to support evm address (#4044)

* chore

* added logic for total portfolio value

* updated defichain version

* Update evmApi.ts

* add default target evm token

* chore

---------

Co-authored-by: Lyka Labrada <[email protected]>

* fix missing evm target token for non-dfi tokens

* transferdomain - get dynamic eth rpc url per network

* fix(core): updated token selection screen (#4047)

fix(core): updated tokenselectionscreen

* fix(ui-ux): fix convert selection (#4048)

Co-authored-by: Lyka Labrada <[email protected]>

* feat(ui-ux): move evm data inside redux store (#4049)

* feat(ui-ux): move evm data inside redux store

* perform batch dispatch

* update deps array when fetching evm details

---------

Co-authored-by: pierregee <[email protected]>
Co-authored-by: Harsh R <[email protected]>
Co-authored-by: Chloe <[email protected]>
Co-authored-by: JJ Adonis <[email protected]>
Co-authored-by: Harsh <[email protected]>

* feature(core): added rpc calls for playground to calculate evm balance (#4053)

* feature(core): added rpc calls for playground to calculate evm balance

* chore

* fix(ui-ux): utxo-evm bug (#4051)

* fix(ui-ux): utxo-evm bug

* throw error on sending lp to evm address

* feat(ui-ux): add hasFetchedEvmTokens flag in store for loader (#4054)

* feat(ui-ux): add hasFetchedEvmTokens flag in store

* add evm domain condition

---------

Co-authored-by: Pierre Gee <[email protected]>

* fix(core): fix feature branch conflict to 'main' (#4055)

* chore(ops): bump packages to display changi (#4030)

* chore(ops): bump to add changi network

* chore(ops): bump packages to display changi

* feat(ui-ux): add svg icons for sui and xchf tokens (#4031)

* feat(ui-ux): add svg icons for sui and xchf tokens

* fix invlalid svg props

* update sui svg to a flatter one

* fix rect prop

---------

Co-authored-by: JJ Adonis <[email protected]>

* fix(ui-ux): updated walletkit package to filter out burn token pool pair (#4033)

* fix(ui-ux): updated walletkit package to filter out burn token pool pair

* fix(e2e): network details

* chore(ops): bump walletkit (#4036)

---------

Co-authored-by: Pierre Gee <[email protected]>
Co-authored-by: JJ Adonis <[email protected]>
Co-authored-by: Chloe <[email protected]>

* chore(core): refactored transfer domain provider (#4058)

* refactore transferdomain provider

* fix(ui-ux): fixed icon for evm DFI on swap token listing

* fix convert screen provider issue

* added chainId in evm provider

* added nonce in td request

* Update mobile-app/app/screens/AppNavigator/screens/Dex/CompositeSwap/SwapTokenSelectionScreen.tsx

Co-authored-by: Pierre Gee <[email protected]>

---------

Co-authored-by: Pierre Gee <[email protected]>

* fix(chore): updated evm tokenId and fixed DFI evm icon and balance  (#4059)

* refactore transferdomain provider

* fix(ui-ux): fixed icon for evm DFI on swap token listing

* fix convert screen provider issue

* added chainId in evm provider

* added nonce in td request

* fix(chore): updated evm tokenId and fixed DFI evm icon and balance inconsistancy

* updated dfi name

* updated EVM suffix names

* chore

* removed (EVM) for DFI token

* feat(e2e): address book transfer domain (#4057)

* feat(e2e): address book transfer domain

* fix(ui-ux): display updated wallet label on portfolio screen

* feat(e2e): setup to send dfi to evm domain

---------

Co-authored-by: Pierre Gee <[email protected]>

* feat(ui-ux): update transferdomain to pass only one vin (#4060)

* feat(ui-ux): update transferdomain to pass only one vin

* chore(deps): bump walletkit package

* fix(chore): bug fix for transferdomain (#4063)

* refactore transferdomain provider

* fix(ui-ux): fixed icon for evm DFI on swap token listing

* fix convert screen provider issue

* added chainId in evm provider

* added nonce in td request

* fix(chore): updated evm tokenId and fixed DFI evm icon and balance inconsistancy

* updated dfi name

* updated EVM suffix names

* chore

* removed (EVM) for DFI token

* Balance details screen for EVM token

* fixed evm dif related bugs

* feat(core): feature flag evm (#4056)

* chore(ops): bump packages to display changi (#4030)

* chore(ops): bump to add changi network

* chore(ops): bump packages to display changi

* feat(ui-ux): add svg icons for sui and xchf tokens (#4031)

* feat(ui-ux): add svg icons for sui and xchf tokens

* fix invlalid svg props

* update sui svg to a flatter one

* fix rect prop

---------

Co-authored-by: JJ Adonis <[email protected]>

* fix(ui-ux): updated walletkit package to filter out burn token pool pair (#4033)

* fix(ui-ux): updated walletkit package to filter out burn token pool pair

* fix(e2e): network details

* chore(ops): bump walletkit (#4036)

* feat(core): feature flag evm

* add feature flag

* feat(core): hide evm in address book

* fix maximum depth

* disable sending to evm address

* rm comment

---------

Co-authored-by: Lyka Labrada <[email protected]>
Co-authored-by: JJ Adonis <[email protected]>
Co-authored-by: Chloe <[email protected]>

* fix(ui-ux): choose address by domain (#4065)

fix(uiux): choose address by domain

* chore(ui-ux): hide address type selection if evm disabled (#4064)

Co-authored-by: Harsh R <[email protected]>

* chore(deps): bump expo-image (#4039)

* chore(deps): bump expo-image

* chore(deps): bump [email protected] and related packages

* fix conflict

---------

Co-authored-by: pierregee <[email protected]>

* fix(chore): fixed ios/android loading issue (#4066)

* fixed TextEncoder error

* fixed loading issue

* removed text-encoding

* fixed wrong balance issue

* fix 9 decimal points on transfer domain

* fix package and mobile expo

---------

Co-authored-by: pierregee <[email protected]>

* fix(ui-ux): display chevron if entrypoint is settings (#4067)

* fix(ui-ux): fixed address title in address input screen (#4070)

* fix(ui-ux): fixed address title in address input screen

* fixed label issue

* fixed minor issue related to evm icons

* fix issue with evm tx

---------

Co-authored-by: pierregee <[email protected]>

* feat(core): service provider - allow custom evm and eth rpc urls (#4068)

* feat(ui-ux): update service provider description on settings

* feat(core): update service provider storage api and add custom

* feat(uii-ux): add custom url input for multiple providers

* feat(ui-ux): disable evm urls when evmfeature is disabled

* fix(core): fix custom provider context overriding value

* feat(ui-ux): change custom provider type to enum

* feat(core): keep 'SERVICE_PROVIDER_URL' key for dvm for backward compatibility

* feat(core): update dvm key provider for backward compatibility

* add ethRpcUrl to EVMProvider deps

* fix provider storage not setting properly

* update provider button from 'continue' to 'save changes'

* hide evm and eth rpc urls when evmfeature flag is disabled

* address pr comments

---------

Co-authored-by: Pierre Gee <[email protected]>

* feat(ui-ux): update blockscout url (#4071)

* fix(core): fixed hang issue on click of denomination currency (#4072)

* feat(core): update testnet eth rpc url (#4073)

* fix(ui-ux): fixed search unsaved address in addressbook screen (#4078)

* fix(chore):  fixed network icon issue on network change (#4076)

fix(chore): fixed network icon issue on network change

* fix(core): fix send dvm to dvm txn (#4075)

* fix(core): fix send dvm to dvm txn

* fix(core): update evm provider

* fix lint issue

* change lint error fix

* fix(core): fix null data for evm wallet details (#4077)

Co-authored-by: Harsh R <[email protected]>

* feat(core): return default evm providers url when evm flag is disabled (#4074)

* feat(core): reset custom evm and ethrpc urls when evm feature is disabled

* chore(translations): add translations for updated service provider screen

* add missing it and es translations

* return default evm providers url when evm flag is disabled

* remove unnecessary condition

* remove unnecessary deps

---------

Co-authored-by: Harsh R <[email protected]>

* fix(ui-ux): fixed address book label overlap issue for evm address (#4079)

* fix(core): fix unit test case (#4081)

* fix(ui-ux): hide Get DFI btn on empty portfolio screen (#4080)

* fix(core): fixed app crashing issue (#4083)

* fix(core): handle auto-conversion of utxo to dfi token (#4082)

* fix(core): handle auto-conversion of utxo to dfi token

* update getinputtokentype if-condition

* updated getInputTokenType condition for send token

---------

Co-authored-by: Harsh <[email protected]>

* fix(core): fix invalid nonce error (#4087)

* fix(ui-ux): fixed Send screen displays no assets displayed issue (#4088)

* fix(ui-ux): fixed Send screen displays no assets displayed issue

* updated token listing condition

* fix(ui-ux): fixed token detail screen to hide loan data in evm domain (#4089)

* fix(ui-ux): fixed Send screen displays no assets displayed issue

* updated token listing condition

* fixed token detail screen to hide load data in evm domain

---------

Co-authored-by: Lyka Labrada <[email protected]>

* fix(ui-ux): hide swap btn for evm domain on token details screen (#4090)

* chore(core): disallow http from custom service provider url (#4091)

* fix(ui-ux): fix evm faq description (#4092)

* fix(ui-ux): hide loan related data on portfolio card (#4093)

* fix(core): fix decimal value turning into exponential notation string (#4094)

fix(core): fix decimal turning into notation

* fix(core): skip eth provider for transfer domain (#4095)

* fix(core): skip eth provider for transfer domain

* fix lint error

* feat(ui-ux): remove duplicate `for EVM` text on token name (#4096)

* Revert "fix(core): skip eth provider for transfer domain (#4095)"

This reverts commit df92ccc.

* fix(ui-ux): remove duplicate 'for EVM'

* fix(core): set testnet eth rpc as default

* feat(ui-ux): log error in evm provider (#4097)

* feat(ui-ux): redirect token summary link to metascan for evm (#4098)

* fix(ui-ux): display evm address as from on convert (#4099)

* chore(logs): add info logs in evm provider (#4100)

* chore(tests): fix e2e runner (#4069)

* test

* test

* fix sendconfirmation and addresses tests

* fix address e2e for TD

* updated getInputTokenType condition for send token

* fixed service provider e2e

* fix service provider e2e

* change delay back to 3000

* update test invalid url

* chore

* address spec fix

* e2e fix

* fix e2e

* use changi rpc for remote pg

* choer(tests): update snapshot

---------

Co-authored-by: Lyka Labrada <[email protected]>
Co-authored-by: Harsh <[email protected]>
Co-authored-by: Harsh R <[email protected]>

* feat(ui-ux): remove usememo in evm provider (#4101)

* feat(core): update testnet eth rpc url (#4102)

* feat(ui-ux): put back usememo in evm provider

* feat(core): update testnet eth rpc url

* chore(e2e): update td addresses test

* chore(tests): test e2e runner (#4104)

* chore(tests): add delay to service prrovider

* chore(tests): update transferdomain addresses test

* chore(tests): remove delay to service provider

* chore(ops): update packages

* chore(ops): temporarily hide addresss selection

* fix(e2e): fixed address specs e2e (#4106)

* fix(e2e): fixed address specs e2e

* minor fix

* fix(ui-ux): handle empty wallet address (#4107)

Co-authored-by: Harsh R <[email protected]>

* fix(ui-ux): fixed Both error / valid messages are displayed when scan… (#4109)

* fix(ui-ux): fixed Both error / valid messages are displayed when scanning address during send EVM to EVM

* fix verified message for dvm address

* minor fix

---------

Co-authored-by: elocin <[email protected]>
Co-authored-by: Harsh R <[email protected]>
Co-authored-by: Pierre Gee <[email protected]>
Co-authored-by: Pierre Gee <[email protected]>
Co-authored-by: chloe <[email protected]>
Co-authored-by: JJ Adonis <[email protected]>
Co-authored-by: Harsh <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants