convert - tokens vs UTXO screen
#365
Merged
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
Add navigation from convert screen Add screen into balance tab Ref: Issue #272
Missing Translations ReportThe following translations are missing for this pull request. View Full Report{
"zh-Hans": {
"missingCount": 135,
"labels": {
"screens/OceanInterface": [
"Transaction Sent",
"title",
"An error has occurred",
"OK"
],
"components/BarCodeScanner": [
"Requesting for camera permission",
"You have denied the permission request to use your camera"
],
"screens/OnboardingCarousel": [
"DeFiChain",
"Wallet",
"A wallet dedicated to the native decentralized finance for bitcoin.",
"title",
"subtitle"
],
"screens/RestoreWallet": [
"Error",
"The recovery words you have entered are invalid. Please double check and try again.",
"Please provide your 24 recovery words to regain access to your wallet.",
"ENTER THE CORRECT WORD",
"RECOVER WALLET"
],
"screens/SendScreen": [
"`Enter word #${order}`",
"CONTINUE",
"Sending",
"Transaction fee",
"SEND",
"TO ADDRESS",
"Enter an address",
"Enter an amount",
"Balance: ",
"MAX",
"Wallet Send"
],
"screens/Onboarding": [
"CREATE A WALLET",
"RESTORE WALLET"
],
"screens/GuidelinesRecoveryWords": [
"What are recovery words?",
"'Your unique 24 recovery words is a human-readable representation of your wallet private key",
"'You will need your recovery words to restore your wallet on",
"'If you lose your recovery words",
"'It is important that you write down your recovery words legibly and in the correct order. Store your recovery words safely and securely"
],
"screens/Guidelines": [
"Creating a wallet",
"'Before you create a wallet",
"Learn more about recovery words",
"g.title",
"g.subtitle",
"'I understand it is my responsibility to keep my recovery words secure",
"SHOW MY 24 RECOVERY WORDS"
],
"screens/WalletNavigator": [
"Guidelines",
"Learn More",
"Display recovery words",
"Verify words",
"Recover Wallet"
],
"screens/LoadingScreen": [
"Loading"
],
"screens/ErrorBoundary": [
"Something went wrong",
"The app ran into a problem and could not recover. Please restart your application."
],
"screens/TransactionDetailScreen": [
"tx.desc)",
"tx.amount)",
"`${tx.block}`)",
"tx.txid"
],
"screens/TransactionsScreen": [
"desc",
"block",
"LOAD MORE",
"Transactions",
"No transactions yet",
"Start transacting with your wallet. All transactions made will be displayed here.",
"RECEIVE COINS"
],
"screens/TransactionsDetailScreen": [
"Transaction"
],
"screens/CommunityScreen": [
"Connect with the community:",
"DeFiChain is a community-driven and open project.",
"The DeFiChain Foundation does not provide direct support.",
"title",
"Community"
],
"screens/Settings": [
"NETWORK",
"Are you sure you want to unlink your wallet?",
"You will need to use your recovery words the next time you want to get back to your wallet.",
"Cancel",
"Unlink Wallet",
"UNLINK WALLET"
],
"screens/SettingsNavigator": [
"Settings"
],
"screens/PoolSwapScreen": [
"From",
"To",
"SWAP",
"Enter an amount",
"Balance: ",
"MAX",
"Price",
"Estimated to receive",
"Minimum to receive",
"Liquidity provider fee",
"Swapping Token"
],
"screens/DexScreen": [
"YOUR LIQUIDITY",
"'Pick a pool pair below",
"section.key",
"Decentralized Exchange",
"Add Liquidity",
"Remove Liquidity"
],
"screens/RemoveLiquidity": [
"Amount of liquidity to remove",
"Removing Liquidity"
],
"screens/AddLiquidity": [
"Price",
"`Token ${props.type === 'primary' ? 'A' : 'B'}`",
"Balance",
"MAX",
"per",
"Share of pool",
"Pooled "
],
"components/slider": [
"None"
],
"components": [
"All"
],
"components/Button": [
"CONTINUE"
],
"screens/ConfirmAddLiq": [
"Adding",
"Fee",
"Price",
"Liquidity tokens received",
"Share of pool",
"Pooled"
],
"screens/ConfirmLiquidity": [
"CONFIRM",
"Adding Liquidity"
],
"screens/TokensVsUtxoScreen": [
"'DFI exists in two forms – UTXO and token",
"'UTXO DFI is the main form DFI and is used for core cryptocurrency purposes like send",
"Your DFI balance includes both UTXO and tokens.",
"label",
"props.label"
],
"screens/TokenDetailScreen": [
"AMOUNT BALANCE",
"AVAILABLE OPTIONS",
"Send to other wallet",
"Receive",
"Convert"
],
"screens/ReceiveScreen": [
"Use this address to receive DFI or any DST",
"Copy",
"Wallet Receive"
],
"screens/ConvertScreen": [
"PREVIEW CONVERSION",
"\"Tokens vs UTXO",
"Converting DFI",
"Convert DFIs",
"Scan recipient QR",
"Tokens vs UTXO"
],
"screens/Convert": [
"titlePrefix",
"Balance"
],
"components/max": [
"MAX"
],
"screens/BalancesScreen": [
"BALANCE DETAILS",
"props.title",
"Wallet Balances"
]
},
"totalCount": 135
},
"zh-Hant": {
"missingCount": 134,
"labels": {
"screens/OceanInterface": [
"Transaction Sent",
"title",
"An error has occurred",
"OK"
],
"components/BarCodeScanner": [
"Requesting for camera permission",
"You have denied the permission request to use your camera"
],
"screens/OnboardingCarousel": [
"DeFiChain",
"Wallet",
"A wallet dedicated to the native decentralized finance for bitcoin.",
"title",
"subtitle"
],
"screens/RestoreWallet": [
"Error",
"The recovery words you have entered are invalid. Please double check and try again.",
"Please provide your 24 recovery words to regain access to your wallet.",
"ENTER THE CORRECT WORD",
"RECOVER WALLET"
],
"screens/SendScreen": [
"`Enter word #${order}`",
"CONTINUE",
"Sending",
"Transaction fee",
"SEND",
"TO ADDRESS",
"Enter an address",
"Enter an amount",
"Balance: ",
"MAX",
"Wallet Send"
],
"screens/Onboarding": [
"CREATE A WALLET",
"RESTORE WALLET"
],
"screens/GuidelinesRecoveryWords": [
"What are recovery words?",
"'Your unique 24 recovery words is a human-readable representation of your wallet private key",
"'You will need your recovery words to restore your wallet on",
"'If you lose your recovery words",
"'It is important that you write down your recovery words legibly and in the correct order. Store your recovery words safely and securely"
],
"screens/Guidelines": [
"Creating a wallet",
"'Before you create a wallet",
"Learn more about recovery words",
"g.title",
"g.subtitle",
"'I understand it is my responsibility to keep my recovery words secure",
"SHOW MY 24 RECOVERY WORDS"
],
"screens/WalletNavigator": [
"Guidelines",
"Learn More",
"Display recovery words",
"Verify words",
"Recover Wallet"
],
"screens/LoadingScreen": [
"Loading"
],
"screens/ErrorBoundary": [
"Something went wrong",
"The app ran into a problem and could not recover. Please restart your application."
],
"screens/TransactionDetailScreen": [
"tx.desc)",
"tx.amount)",
"`${tx.block}`)",
"tx.txid"
],
"screens/TransactionsScreen": [
"desc",
"block",
"LOAD MORE",
"No transactions yet",
"Start transacting with your wallet. All transactions made will be displayed here.",
"RECEIVE COINS"
],
"screens/TransactionsDetailScreen": [
"Transaction"
],
"screens/CommunityScreen": [
"Connect with the community:",
"DeFiChain is a community-driven and open project.",
"The DeFiChain Foundation does not provide direct support.",
"title",
"Community"
],
"screens/Settings": [
"NETWORK",
"Are you sure you want to unlink your wallet?",
"You will need to use your recovery words the next time you want to get back to your wallet.",
"Cancel",
"Unlink Wallet",
"UNLINK WALLET"
],
"screens/SettingsNavigator": [
"Settings"
],
"screens/PoolSwapScreen": [
"From",
"To",
"SWAP",
"Enter an amount",
"Balance: ",
"MAX",
"Price",
"Estimated to receive",
"Minimum to receive",
"Liquidity provider fee",
"Swapping Token"
],
"screens/DexScreen": [
"YOUR LIQUIDITY",
"'Pick a pool pair below",
"section.key",
"Decentralized Exchange",
"Add Liquidity",
"Remove Liquidity"
],
"screens/RemoveLiquidity": [
"Amount of liquidity to remove",
"Removing Liquidity"
],
"screens/AddLiquidity": [
"Price",
"`Token ${props.type === 'primary' ? 'A' : 'B'}`",
"Balance",
"MAX",
"per",
"Share of pool",
"Pooled "
],
"components/slider": [
"None"
],
"components": [
"All"
],
"components/Button": [
"CONTINUE"
],
"screens/ConfirmAddLiq": [
"Adding",
"Fee",
"Price",
"Liquidity tokens received",
"Share of pool",
"Pooled"
],
"screens/ConfirmLiquidity": [
"CONFIRM",
"Adding Liquidity"
],
"screens/TokensVsUtxoScreen": [
"'DFI exists in two forms – UTXO and token",
"'UTXO DFI is the main form DFI and is used for core cryptocurrency purposes like send",
"Your DFI balance includes both UTXO and tokens.",
"label",
"props.label"
],
"screens/TokenDetailScreen": [
"AMOUNT BALANCE",
"AVAILABLE OPTIONS",
"Send to other wallet",
"Receive",
"Convert"
],
"screens/ReceiveScreen": [
"Use this address to receive DFI or any DST",
"Copy",
"Wallet Receive"
],
"screens/ConvertScreen": [
"PREVIEW CONVERSION",
"\"Tokens vs UTXO",
"Converting DFI",
"Convert DFIs",
"Scan recipient QR",
"Tokens vs UTXO"
],
"screens/Convert": [
"titlePrefix",
"Balance"
],
"components/max": [
"MAX"
],
"screens/BalancesScreen": [
"BALANCE DETAILS",
"props.title",
"Wallet Balances"
]
},
"totalCount": 135
},
"de": {
"missingCount": 134,
"labels": {
"screens/OceanInterface": [
"Transaction Sent",
"title",
"An error has occurred",
"OK"
],
"components/BarCodeScanner": [
"Requesting for camera permission",
"You have denied the permission request to use your camera"
],
"screens/OnboardingCarousel": [
"DeFiChain",
"Wallet",
"A wallet dedicated to the native decentralized finance for bitcoin.",
"title",
"subtitle"
],
"screens/RestoreWallet": [
"Error",
"The recovery words you have entered are invalid. Please double check and try again.",
"Please provide your 24 recovery words to regain access to your wallet.",
"ENTER THE CORRECT WORD",
"RECOVER WALLET"
],
"screens/SendScreen": [
"`Enter word #${order}`",
"CONTINUE",
"Sending",
"Transaction fee",
"SEND",
"TO ADDRESS",
"Enter an address",
"Enter an amount",
"Balance: ",
"MAX",
"Wallet Send"
],
"screens/Onboarding": [
"CREATE A WALLET",
"RESTORE WALLET"
],
"screens/GuidelinesRecoveryWords": [
"What are recovery words?",
"'Your unique 24 recovery words is a human-readable representation of your wallet private key",
"'You will need your recovery words to restore your wallet on",
"'If you lose your recovery words",
"'It is important that you write down your recovery words legibly and in the correct order. Store your recovery words safely and securely"
],
"screens/Guidelines": [
"Creating a wallet",
"'Before you create a wallet",
"Learn more about recovery words",
"g.title",
"g.subtitle",
"'I understand it is my responsibility to keep my recovery words secure",
"SHOW MY 24 RECOVERY WORDS"
],
"screens/WalletNavigator": [
"Guidelines",
"Learn More",
"Display recovery words",
"Verify words",
"Recover Wallet"
],
"screens/LoadingScreen": [
"Loading"
],
"screens/ErrorBoundary": [
"Something went wrong",
"The app ran into a problem and could not recover. Please restart your application."
],
"screens/TransactionDetailScreen": [
"tx.desc)",
"tx.amount)",
"`${tx.block}`)",
"tx.txid"
],
"screens/TransactionsScreen": [
"desc",
"block",
"LOAD MORE",
"No transactions yet",
"Start transacting with your wallet. All transactions made will be displayed here.",
"RECEIVE COINS"
],
"screens/TransactionsDetailScreen": [
"Transaction"
],
"screens/CommunityScreen": [
"Connect with the community:",
"DeFiChain is a community-driven and open project.",
"The DeFiChain Foundation does not provide direct support.",
"title",
"Community"
],
"screens/Settings": [
"NETWORK",
"Are you sure you want to unlink your wallet?",
"You will need to use your recovery words the next time you want to get back to your wallet.",
"Cancel",
"Unlink Wallet",
"UNLINK WALLET"
],
"screens/SettingsNavigator": [
"Settings"
],
"screens/PoolSwapScreen": [
"From",
"To",
"SWAP",
"Enter an amount",
"Balance: ",
"MAX",
"Price",
"Estimated to receive",
"Minimum to receive",
"Liquidity provider fee",
"Swapping Token"
],
"screens/DexScreen": [
"YOUR LIQUIDITY",
"'Pick a pool pair below",
"section.key",
"Decentralized Exchange",
"Add Liquidity",
"Remove Liquidity"
],
"screens/RemoveLiquidity": [
"Amount of liquidity to remove",
"Removing Liquidity"
],
"screens/AddLiquidity": [
"Price",
"`Token ${props.type === 'primary' ? 'A' : 'B'}`",
"Balance",
"MAX",
"per",
"Share of pool",
"Pooled "
],
"components/slider": [
"None"
],
"components": [
"All"
],
"components/Button": [
"CONTINUE"
],
"screens/ConfirmAddLiq": [
"Adding",
"Fee",
"Price",
"Liquidity tokens received",
"Share of pool",
"Pooled"
],
"screens/ConfirmLiquidity": [
"CONFIRM",
"Adding Liquidity"
],
"screens/TokensVsUtxoScreen": [
"'DFI exists in two forms – UTXO and token",
"'UTXO DFI is the main form DFI and is used for core cryptocurrency purposes like send",
"Your DFI balance includes both UTXO and tokens.",
"label",
"props.label"
],
"screens/TokenDetailScreen": [
"AMOUNT BALANCE",
"AVAILABLE OPTIONS",
"Send to other wallet",
"Receive",
"Convert"
],
"screens/ReceiveScreen": [
"Use this address to receive DFI or any DST",
"Copy",
"Wallet Receive"
],
"screens/ConvertScreen": [
"PREVIEW CONVERSION",
"\"Tokens vs UTXO",
"Converting DFI",
"Convert DFIs",
"Scan recipient QR",
"Tokens vs UTXO"
],
"screens/Convert": [
"titlePrefix",
"Balance"
],
"components/max": [
"MAX"
],
"screens/BalancesScreen": [
"BALANCE DETAILS",
"props.title",
"Wallet Balances"
]
},
"totalCount": 135
}
} |
|
Code Climate has analyzed commit 89d1946 and detected 0 issues on this pull request. View more on Code Climate. |
Codecov Report
@@ Coverage Diff @@
## main #365 +/- ##
==========================================
+ Coverage 88.36% 88.51% +0.15%
==========================================
Files 94 95 +1
Lines 1366 1376 +10
Branches 209 210 +1
==========================================
+ Hits 1207 1218 +11
+ Misses 158 157 -1
Partials 1 1
Continue to review full report at Codecov.
|
|
✔️ Deploy Preview for defi-wallet ready! 🔨 Explore the source changes: 89d1946 🔍 Inspect the deploy log: https://app.netlify.com/sites/defi-wallet/deploys/6102214349d98c0008c80cec 😎 Browse the preview: https://deploy-preview-365--defi-wallet.netlify.app/ |
|
Build preview for DeFi Wallet is ready! Built with commit b816eae https://expo.io/@defichain/wallet?release-channel=pr-preview-365 |
Move testID to jsx.element
|
Test summary
Run details
View run in Cypress Dashboard ➡️ This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard |
kyleleow
requested review from
fuxingloh,
ivan-zynesis and
izzycsy
as code owners
thedoublejay
requested changes
Jul 28, 2021
app/screens/AppNavigator/screens/Balances/screens/TokensVsUtxoScreen.tsx
Outdated
Show resolved
Hide resolved
|
Some comments:
|
Change background to white Add contentContainerStyle to fill empty spaces if any, and able to scroll when container height < content's height
Fix typo of DFI unit string used in checking
|
ivan-zynesis
suggested changes
Jul 29, 2021
app/screens/AppNavigator/screens/Balances/screens/TokensVsUtxoScreen.tsx
Outdated
Show resolved
Hide resolved
thedoublejay
approved these changes
Jul 29, 2021
ivan-zynesis
approved these changes
Jul 29, 2021
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.
What kind of PR is this?:
/kind feature
What this PR does / why we need it:
Which issue(s) does this PR fixes?:
Fixes #272