Skip to content

Commit

Permalink
Merge pull request #1566 from input-output-hk/v2-integration-with-lat…
Browse files Browse the repository at this point in the history 
…est-develop

V2 integration with latest develop
  • Loading branch information
@nikolaglumac
nikolaglumac committed Sep 11, 2019
2 parents cef0ee7 + a23337a commit 139f97f
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 45 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Expand Up @@ -32,6 +32,7 @@ Changelog

### Chores

- Use improved `NumericInput` component of `React-Polymorph` v0.9.0 ([1511](https://github.com/input-output-hk/daedalus/pull/1511))
- Added minimum heights of main app window for different environments (Windows, Linux, MacOS) ([1485](https://github.com/input-output-hk/daedalus/pull/1485))
- Removed "Ada Redemption" feature ([PR 1510](https://github.com/input-output-hk/daedalus/pull/1510))
- Changed `themes:check` to `themes:check:createTheme` and added a 4 part "Theme Management in Daedalus" tutorial series to a README document in the themes directory ([PR 1525](https://github.com/input-output-hk/daedalus/pull/1525))
Expand Down
10 changes: 5 additions & 5 deletions features/send-money-to-receiver.feature
View file
Expand Up @@ -61,10 +61,10 @@ Feature: Send Money to Receiver
| title | amount |
| my transaction | <WRONG_AMOUNT> |
Then I should see the following error messages on the wallet send form:
| message |
| wallet.send.form.errors.invalidAmount |
| message |
| <ERROR> |

Examples:
| WRONG_AMOUNT |
| 45000000001 |
| 0 |
| WRONG_AMOUNT | ERROR |
| 99999999 | api.errors.NotEnoughFundsForTransactionError |
| 0 | wallet.send.form.errors.invalidAmount |
2 changes: 1 addition & 1 deletion features/tests/e2e/steps/select-language-steps.js
View file
Expand Up @@ -28,7 +28,7 @@ When(/^I open language selection dropdown$/, function() {

When(/^I select Japanese language$/, function() {
return this.waitAndClick(
'//*[@class="SimpleOptions_label"][contains(text(), "Japanese")]'
'//*[@class="SimpleOptions_option"]//*[contains(text(), "Japanese")]'
);
});

Expand Down
2 changes: 1 addition & 1 deletion features/tests/e2e/steps/settings-steps.js
View file
Expand Up @@ -103,7 +103,7 @@ When(

When(/^I select "Strict" assurance level$/, function() {
return this.waitAndClick(
'//*[@class="SimpleOptions_label"][contains(text(), "Strict")]'
'//*[@class="SimpleOptions_option"]//*[contains(text(), "Strict")]'
);
});

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Expand Up @@ -178,7 +178,7 @@
"react-lottie": "1.2.3",
"react-markdown": "3.1.0",
"react-number-format": "3.0.3",
"react-polymorph": "0.8.7",
"react-polymorph": "0.9.0-rc.15",
"react-router": "3.2.1",
"react-svg-inline": "2.1.0",
"react-virtualized": "9.21.0",
Expand Down
21 changes: 11 additions & 10 deletions source/renderer/app/components/wallet/WalletSendForm.js
View file
Expand Up @@ -20,7 +20,6 @@ import globalMessages from '../../i18n/global-messages';
import WalletSendConfirmationDialog from './WalletSendConfirmationDialog';
import WalletSendConfirmationDialogContainer from '../../containers/wallet/dialogs/WalletSendConfirmationDialogContainer';
import {
formattedAmountToBigNumber,
formattedAmountToNaturalUnits,
formattedAmountToLovelace,
} from '../../utils/formatters';
Expand Down Expand Up @@ -207,17 +206,17 @@ export default class WalletSendForm extends Component<Props, State> {
placeholder: `0.${'0'.repeat(
this.props.currencyMaxFractionalDigits
)}`,
value: '',
value: null,
validators: [
async ({ field, form }) => {
const amountValue = field.value;
if (amountValue === '') {
if (field.value === null) {
this._resetTransactionFee();
return [
false,
this.context.intl.formatMessage(messages.fieldIsRequired),
];
}
const amountValue = field.value.toString();
const isValid = await this.props.validateAmount(
formattedAmountToNaturalUnits(amountValue)
);
Expand Down Expand Up @@ -252,7 +251,6 @@ export default class WalletSendForm extends Component<Props, State> {
const { intl } = this.context;
const {
currencyUnit,
currencyMaxIntegerDigits,
currencyMaxFractionalDigits,
isDialogOpen,
isRestoreActive,
Expand All @@ -267,7 +265,8 @@ export default class WalletSendForm extends Component<Props, State> {
const receiverField = form.$('receiver');
const receiverFieldProps = receiverField.bind();
const amountFieldProps = amountField.bind();
const amount = formattedAmountToBigNumber(amountFieldProps.value);

const amount = new BigNumber(amountFieldProps.value || 0);

let fees = null;
let total = null;
Expand Down Expand Up @@ -310,19 +309,21 @@ export default class WalletSendForm extends Component<Props, State> {
{...amountFieldProps}
className="amount"
label={intl.formatMessage(messages.amountLabel)}
maxBeforeDot={currencyMaxIntegerDigits}
maxAfterDot={currencyMaxFractionalDigits}
numberLocaleOptions={{
minimumFractionDigits: currencyMaxFractionalDigits,
}}
error={transactionFeeError || amountField.error}
onChange={value => {
this._isCalculatingFee = true;
amountField.onChange(value || '');
amountField.onChange(value);
}}
// AmountInputSkin props
currency={currencyUnit}
fees={fees}
total={total}
skin={AmountInputSkin}
onKeyPress={this.handleSubmitOnEnter}
allowSigns={false}
/>
</div>

Expand All @@ -339,7 +340,7 @@ export default class WalletSendForm extends Component<Props, State> {

{isDialogOpen(WalletSendConfirmationDialog) ? (
<WalletSendConfirmationDialogContainer
amount={amountFieldProps.value}
amount={amount.toFormat(currencyMaxFractionalDigits)}
receiver={receiverFieldProps.value}
totalAmount={total}
transactionFee={fees}
Expand Down
48 changes: 24 additions & 24 deletions source/renderer/app/i18n/locales/defaultMessages.json
View file
Expand Up @@ -7460,167 +7460,167 @@
"description": "Label for the \"Title\" text input in the wallet send form.",
"end": {
"column": 3,
"line": 37
"line": 36
},
"file": "source/renderer/app/components/wallet/WalletSendForm.js",
"id": "wallet.send.form.title.label",
"start": {
"column": 14,
"line": 33
"line": 32
}
},
{
"defaultMessage": "!!!E.g: Money for Frank",
"description": "Hint inside the \"Receiver\" text input in the wallet send form.",
"end": {
"column": 3,
"line": 43
"line": 42
},
"file": "source/renderer/app/components/wallet/WalletSendForm.js",
"id": "wallet.send.form.title.hint",
"start": {
"column": 13,
"line": 38
"line": 37
}
},
{
"defaultMessage": "!!!Receiver",
"description": "Label for the \"Receiver\" text input in the wallet send form.",
"end": {
"column": 3,
"line": 48
"line": 47
},
"file": "source/renderer/app/components/wallet/WalletSendForm.js",
"id": "wallet.send.form.receiver.label",
"start": {
"column": 17,
"line": 44
"line": 43
}
},
{
"defaultMessage": "!!!Wallet Address",
"description": "Hint inside the \"Receiver\" text input in the wallet send form.",
"end": {
"column": 3,
"line": 54
"line": 53
},
"file": "source/renderer/app/components/wallet/WalletSendForm.js",
"id": "wallet.send.form.receiver.hint",
"start": {
"column": 16,
"line": 49
"line": 48
}
},
{
"defaultMessage": "!!!Amount",
"description": "Label for the \"Amount\" number input in the wallet send form.",
"end": {
"column": 3,
"line": 59
"line": 58
},
"file": "source/renderer/app/components/wallet/WalletSendForm.js",
"id": "wallet.send.form.amount.label",
"start": {
"column": 15,
"line": 55
"line": 54
}
},
{
"defaultMessage": "!!!Description",
"description": "Label for the \"description\" text area in the wallet send form.",
"end": {
"column": 3,
"line": 65
"line": 64
},
"file": "source/renderer/app/components/wallet/WalletSendForm.js",
"id": "wallet.send.form.description.label",
"start": {
"column": 20,
"line": 60
"line": 59
}
},
{
"defaultMessage": "!!!You can add a message if you want",
"description": "Hint in the \"description\" text area in the wallet send form.",
"end": {
"column": 3,
"line": 70
"line": 69
},
"file": "source/renderer/app/components/wallet/WalletSendForm.js",
"id": "wallet.send.form.description.hint",
"start": {
"column": 19,
"line": 66
"line": 65
}
},
{
"defaultMessage": "!!!Next",
"description": "Label for the next button on the wallet send form.",
"end": {
"column": 3,
"line": 75
"line": 74
},
"file": "source/renderer/app/components/wallet/WalletSendForm.js",
"id": "wallet.send.form.next",
"start": {
"column": 19,
"line": 71
"line": 70
}
},
{
"defaultMessage": "!!!Please enter a valid address.",
"description": "Error message shown when invalid address was entered.",
"end": {
"column": 3,
"line": 80
"line": 79
},
"file": "source/renderer/app/components/wallet/WalletSendForm.js",
"id": "wallet.send.form.errors.invalidAddress",
"start": {
"column": 18,
"line": 76
"line": 75
}
},
{
"defaultMessage": "!!!Please enter a valid amount.",
"description": "Error message shown when invalid amount was entered.",
"end": {
"column": 3,
"line": 85
"line": 84
},
"file": "source/renderer/app/components/wallet/WalletSendForm.js",
"id": "wallet.send.form.errors.invalidAmount",
"start": {
"column": 17,
"line": 81
"line": 80
}
},
{
"defaultMessage": "!!!Please enter a title with at least 3 characters.",
"description": "Error message shown when invalid transaction title was entered.",
"end": {
"column": 3,
"line": 91
"line": 90
},
"file": "source/renderer/app/components/wallet/WalletSendForm.js",
"id": "wallet.send.form.errors.invalidTitle",
"start": {
"column": 16,
"line": 86
"line": 85
}
},
{
"defaultMessage": "!!!This wallet is currently being synced with the blockchain. While synchronisation is in progress transacting is not possible and transaction history is not complete.",
"description": "Syncing transactions message shown during async wallet restore in the wallet send form.",
"end": {
"column": 3,
"line": 98
"line": 97
},
"file": "source/renderer/app/components/wallet/WalletSendForm.js",
"id": "wallet.send.form.syncingTransactionsMessage",
"start": {
"column": 30,
"line": 92
"line": 91
}
}
],
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
View file
Expand Up @@ -10910,9 +10910,9 @@ react-number-format@3.0.3:
dependencies:
prop-types "^15.6.0"

react-polymorph@0.8.7:
version "0.8.7"
resolved "https://registry.yarnpkg.com/react-polymorph/-/react-polymorph-0.8.7.tgz#1f31c509006736bf1334ed2fa2386b4c74f19e3b"
react-polymorph@0.9.0-rc.15:
version "0.9.0-rc.15"
resolved "https://registry.yarnpkg.com/react-polymorph/-/react-polymorph-0.9.0-rc.15.tgz#aff039bc034b9baa03289308042d4e98cd46f6ed"
dependencies:
create-react-context "0.2.2"
create-react-ref "0.1.0"
Expand Down

0 comments on commit 139f97f

Please sign in to comment.