Browse Source

Merge pull request #389 from gre/fix-input-address

Fix input address
master
Gaëtan Renaudeau 7 years ago
committed by GitHub
parent
commit
8e731ea6e8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      package.json
  2. 2
      src/components/RecipientAddress/index.js
  3. 6
      src/components/modals/Send/01-step-amount.js

2
package.json

@ -3,7 +3,7 @@
"productName": "Ledger Live", "productName": "Ledger Live",
"description": "Ledger Live - Desktop", "description": "Ledger Live - Desktop",
"repository": "https://github.com/LedgerHQ/ledger-live-desktop", "repository": "https://github.com/LedgerHQ/ledger-live-desktop",
"version": "0.1.0-alpha.3", "version": "0.1.0-alpha.4",
"author": "Ledger", "author": "Ledger",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {

2
src/components/RecipientAddress/index.js

@ -45,7 +45,7 @@ const BackgroundLayer = styled(Box)`
type Props = { type Props = {
value: string, value: string,
// return false if it can't be changed (invalid info) // return false if it can't be changed (invalid info)
onChange: (string, { amount?: number, currency?: CryptoCurrency }) => ?boolean, onChange: (string, ?{ amount?: number, currency?: CryptoCurrency }) => ?boolean,
withQrCode: boolean, withQrCode: boolean,
} }

6
src/components/modals/Send/01-step-amount.js

@ -17,6 +17,7 @@ const AccountField = ({ onChange, value, t }: *) => (
</Box> </Box>
) )
// TODO we should use isRecipientValid & provide a feedback to user
const RecipientField = ({ bridge, account, transaction, onChangeTransaction, t }: *) => ( const RecipientField = ({ bridge, account, transaction, onChangeTransaction, t }: *) => (
<Box flow={1}> <Box flow={1}>
<Label> <Label>
@ -26,9 +27,8 @@ const RecipientField = ({ bridge, account, transaction, onChangeTransaction, t }
<RecipientAddress <RecipientAddress
withQrCode withQrCode
value={bridge.getTransactionRecipient(account, transaction)} value={bridge.getTransactionRecipient(account, transaction)}
onChange={(recipient, { amount, currency }) => { onChange={(recipient, maybeExtra) => {
console.log(recipient, amount, currency, account.currency) const { amount, currency } = maybeExtra || {}
// TODO we should use isRecipientValid & provide a feedback to user
if (currency && currency.scheme !== account.currency.scheme) return false if (currency && currency.scheme !== account.currency.scheme) return false
let t = transaction let t = transaction
if (amount) { if (amount) {

Loading…
Cancel
Save