Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
78b0d91
DDW-603 - Enable pasting of wallet recovery phrase - changelog changes
DeeJayElly Mar 15, 2021
3993a1b
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Mar 19, 2021
32475d6
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
nikolaglumac Mar 19, 2021
88c85ad
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Mar 23, 2021
aacd2eb
Merge remote-tracking branch 'origin/feature/ddw-603-enable-pasting-o…
DeeJayElly Mar 23, 2021
7347cca
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Mar 25, 2021
5c357ad
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Mar 25, 2021
270387c
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Mar 29, 2021
bc5b18b
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Mar 29, 2021
aff58c1
DDW-602 - Enable pasting of wallet recovery phase - updating react po…
DeeJayElly Mar 29, 2021
e01e9ce
Merge remote-tracking branch 'origin/feature/ddw-603-enable-pasting-o…
DeeJayElly Mar 29, 2021
632536b
DDW-602 - Enable pasting of wallet recovery phase - updating react po…
DeeJayElly Mar 29, 2021
9759d12
DDW-602 - Enable pasting of wallet recovery phase - updating react po…
DeeJayElly Mar 29, 2021
ddc7267
DDW-603 - Enable pasting of wallet recovery phase - temp enable voting
DeeJayElly Mar 29, 2021
4424d00
DDW-603 - Enable pasting of wallet recovery phase
DeeJayElly Mar 29, 2021
f7bdfff
DDW-605 - Display rewards address - yarn lock
DeeJayElly Mar 29, 2021
3769d8d
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
nikolaglumac Mar 29, 2021
234edb8
[DDW-603] Fixes lockfile
nikolaglumac Mar 29, 2021
de278cf
DDW-603 - Enable pasting of wallet recovery phrase - yarn fix
DeeJayElly Mar 30, 2021
5be7f73
Merge remote-tracking branch 'origin/feature/ddw-603-enable-pasting-o…
DeeJayElly Mar 30, 2021
9f43e24
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Mar 30, 2021
f117b0c
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Mar 31, 2021
bf2f125
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Apr 1, 2021
758383b
DDW-603 - Enable pasting of wallet recovery phrase - fixing dropdown …
DeeJayElly Apr 1, 2021
4c5ef4d
DDW-603 - Enable pasting of wallet recovery phrase - fixing yarn lock
DeeJayElly Apr 1, 2021
d4ebbcc
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Apr 2, 2021
b89f645
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Apr 2, 2021
27b7d3f
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Apr 7, 2021
ce799a3
Update CHANGELOG.md
DeeJayElly Apr 7, 2021
897082e
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Apr 8, 2021
ff70f63
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Apr 9, 2021
cf9bd08
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Apr 14, 2021
87f1541
Merge remote-tracking branch 'origin/feature/ddw-603-enable-pasting-o…
DeeJayElly Apr 14, 2021
2746fa9
DDW-595 - Warn user when pasting an address of the same wallet - fixi…
DeeJayElly Apr 14, 2021
574f378
DDW-603 - Enable pasting of wallet recovery phrases - yarn.lock
DeeJayElly Apr 14, 2021
93271f1
[DDW-603] Improve CHANGELOG
nikolaglumac Apr 15, 2021
7a32683
[DDW-603] Merges develop
nikolaglumac Apr 16, 2021
057673f
[DDW-603] Updates RP
nikolaglumac Apr 16, 2021
d8b4f35
[DDW-603] Semver fix attempt
nikolaglumac Apr 16, 2021
4d5ced9
[DDW-603] Revert semver fix attempt
nikolaglumac Apr 16, 2021
6f89ce5
[DDW-603] Update to react-polymorph@0.9.8-rc.18
DominikGuzei Apr 16, 2021
9a7f013
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
nikolaglumac Apr 17, 2021
6fb8687
[DDW-603] Bumps RP
nikolaglumac Apr 17, 2021
e2317fb
DDW-603 - Enable pasting of wallet recovery phrase fixes
DeeJayElly Apr 19, 2021
ba584d8
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Apr 20, 2021
b632df4
DDW-603 - Enable pasting of wallet recovery phrase fixes - update rea…
DeeJayElly Apr 21, 2021
5b9f91a
DDW-603 - Enable pasting of wallet recovery phrase fixes - temp updat…
DeeJayElly Apr 21, 2021
9b293cb
DDW-603 - Improve pin entry component ux - update RP version
DeeJayElly Apr 22, 2021
8012587
DDW-603 - Improve pin entry component ux - update RP version
DeeJayElly Apr 22, 2021
9b6267c
DDW-603 - Improve pin entry component ux - update RP version to new r…
DeeJayElly Apr 22, 2021
661353c
DDW-603 - Improve pin entry component ux - update RP version to new r…
DeeJayElly Apr 22, 2021
e730f14
Merge branch 'develop' into feature/ddw-603-enable-pasting-of-wallet-…
DeeJayElly Apr 22, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ Changelog

## vNext

### Features

- Enabled pasting of wallet recovery phrase ([PR 2459](https://github.com/input-output-hk/daedalus/pull/2459))

### Fixes

- Fixed blank currency selection after updating to 4.0.5 ([PR 2529](https://github.com/input-output-hk/daedalus/pull/2529))
Expand Down Expand Up @@ -102,9 +106,6 @@ Changelog
### Features

- Added native token support [PR 2292](https://github.com/input-output-hk/daedalus/pull/2292)

### Features

- Enabled rewards withdrawals on hardware wallets ([PR 2408](https://github.com/input-output-hk/daedalus/pull/2408))

### Fixes
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
"react-intl": "2.7.2",
"react-lottie": "1.2.3",
"react-markdown": "4.3.1",
"react-polymorph": "0.9.8-rc.11",
"react-polymorph": "0.9.8-rc.21",
"react-router": "5.2.0",
"react-router-dom": "5.2.0",
"react-svg-inline": "2.1.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export default class MnemonicsDialog extends Component<Props> {
expectedWordCount,
} = this.props;
const recoveryPhraseField = this.form.$('recoveryPhrase');
const canSubmit = !recoveryPhraseField.error;
const canSubmit = recoveryPhraseField.isValid && !recoveryPhraseField.error;
return (
<WalletRestoreDialog
stepNumber={1}
Expand Down
15 changes: 4 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4722,12 +4722,6 @@ create-react-context@0.3.0, create-react-context@^0.3.0:
gud "^1.0.0"
warning "^4.0.3"

create-react-ref@0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/create-react-ref/-/create-react-ref-0.1.0.tgz#0aa42aae4e66d8b164207ac8c468c35ce7bbd8eb"
dependencies:
fbjs "^0.8.16"

cross-env@7.0.2:
version "7.0.2"
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.2.tgz#bd5ed31339a93a3418ac4f3ca9ca3403082ae5f9"
Expand Down Expand Up @@ -6664,7 +6658,7 @@ fb-watchman@^2.0.0:
dependencies:
bser "2.1.1"

fbjs@^0.8.0, fbjs@^0.8.16:
fbjs@^0.8.0:
version "0.8.17"
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
dependencies:
Expand Down Expand Up @@ -12657,13 +12651,12 @@ react-modal@3.1.12:
prop-types "^15.5.10"
warning "^3.0.0"

react-polymorph@0.9.8-rc.11:
version "0.9.8-rc.11"
resolved "https://registry.yarnpkg.com/react-polymorph/-/react-polymorph-0.9.8-rc.11.tgz#52f09791fe6b7d70198c2251cdea4d8245bf3a2f"
react-polymorph@0.9.8-rc.21:
version "0.9.8-rc.21"
resolved "https://registry.yarnpkg.com/react-polymorph/-/react-polymorph-0.9.8-rc.21.tgz#aeec762dd5e8db0dfb47d114c04522134f4ccaa2"
dependencies:
"@tippyjs/react" "4.2.1"
create-react-context "0.2.2"
create-react-ref "0.1.0"
fast-password-entropy "1.1.1"
filter-react-dom-props "0.0.2"
popper.js "1.16.1"
Expand Down