-
Notifications
You must be signed in to change notification settings - Fork 298
[DDW-106] Wallet import feature #1956
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
Merged
nikolaglumac
merged 154 commits into
develop
from
feature/ddw-106-wallet-import-feature
Apr 16, 2020
Merged
Changes from 1 commit
Commits
Show all changes
154 commits
Select commit
Hold shift + click to select a range
673d29b
[DDW-106] Adds CHANGELOG
nikolaglumac 9942297
[DDW-106] Enable wallet import for mainnet, flight and testnet
nikolaglumac af50847
bump SL: new export-wallets
disassembler 3c06fb8
Merge branch 'develop' into feature/ddw-106-wallet-import-feature
nikolaglumac 2069a2e
[DDW-106] Genesis file update
nikolaglumac e8fa7d4
[DDW-106] Fix scenario name
nikolaglumac db97ba9
[DDW-106] - Wallet import feature
DeeJayElly 6db0300
[DDW-106] - Wallet import feature
DeeJayElly 320e497
[DDW-106] - Wallet import feature
DeeJayElly 3700c8b
[DDW-106] - Wallet import feature
DeeJayElly 4dc8cef
[DDW-106] - Wallet import feature
DeeJayElly 31e5dec
[DDW-106] - Wallet import feature
DeeJayElly de3aacf
[DDW-106] - Wallet import feature
DeeJayElly 860e9e4
[DDW-106] - Wallet import feature
DeeJayElly afd2f4c
[DDW-106] - Wallet import feature
DeeJayElly 03618a2
[DDW-106] - Wallet import feature
DeeJayElly 4a5a4d1
[DDW-106] - Wallet import feature
DeeJayElly ef402c3
[DDW-106] - Wallet import feature
DeeJayElly d476249
[DDW-106] - Wallet import feature
DeeJayElly 6ed23b7
[DDW-106] - Wallet import feature
DeeJayElly 2f8939f
[DDW-106] - Wallet import feature
DeeJayElly ea2928d
[DDW-106] Fix env flags
nikolaglumac 340fe16
[DDW-106] - Wallet import feature
DeeJayElly 76481b5
Merge remote-tracking branch 'origin/feature/ddw-106-wallet-import-fe…
DeeJayElly b8ff629
[DDW-106] - Wallet import feature
DeeJayElly b8d0841
[DDW-106] Export types fix
nikolaglumac 7cc851b
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
nikolaglumac 06ff6e9
[DDW-106] Improve logging
nikolaglumac 94a11ac
Merge branch 'develop' into feature/ddw-106-wallet-import-feature
nikolaglumac 653dda3
[DDW-106] - Wallet import feature
DeeJayElly eac6754
Merge branch 'develop' into feature/ddw-106-wallet-import-feature
DeeJayElly c2801e2
Merge remote-tracking branch 'origin/feature/ddw-106-wallet-import-fe…
DeeJayElly d80123f
[DDW-106] - Wallet import feature
DeeJayElly eab4f81
[DDW-106] - Wallet import feature
DeeJayElly 294bb89
[DDW-106] Wallet migration logic WIP
nikolaglumac 5ae78d6
[DDW-106] Reorder methods
nikolaglumac 95139a7
[DDW-106] Introduce skipped wallet migration state
nikolaglumac 92e5068
[DDW-106] Record skipped wallet migration
nikolaglumac c737261
[DDW-106] - Wallet import feature - fixing lint errors
DeeJayElly 02e49d4
Merge remote-tracking branch 'origin/feature/ddw-106-wallet-import-fe…
DeeJayElly ca82fc4
[DDW-106] Update migration store
nikolaglumac 0342d24
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
nikolaglumac 02d3299
[DDW-106] Update export tool
nikolaglumac 74e4795
[DDW-106] Introduce pending import wallets
nikolaglumac a67f6af
[DDW-106] Connect UI with store logicu
nikolaglumac d8eab2a
[DDW-106] Add name/selection handlers
nikolaglumac aaf24ab
[DDW-106] Fix lint errors
nikolaglumac b32ea37
[DDW-106] Merges develop
nikolaglumac ccf4ec5
[DDW-106] Button spinner
thedanheller 38e3204
[DDW-106] Fix default mainnet legacy state dir path
nikolaglumac f9e383c
Merge branch 'feature/ddw-106-wallet-import-feature' of https://githu…
thedanheller eacf6b6
[DDW-106] Enable export source path selection
nikolaglumac 40f3390
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
nikolaglumac f068366
[DDW-106] Improve button state handling
nikolaglumac 0b8c7f3
[DDW-106] Wallet Rename - WIP
thedanheller 0319f28
Merge branch 'feature/ddw-106-wallet-import-feature' of https://githu…
thedanheller ba7b657
[DDW-106] Fix opacity
nikolaglumac 26995b9
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
nikolaglumac efa2f2c
[DDW-106] Wallet Rename - WIP
thedanheller 1fdfcc3
Merge branch 'feature/ddw-106-wallet-import-feature' of https://githu…
thedanheller 158dd6f
[DDW-106] Wallet Rename - WIP
thedanheller f6f027c
[DDW-106] Restores
thedanheller 9b464b8
[DDW-106] Prevent text selection
nikolaglumac 5b3b02f
[DDW-106] Separate nameless wallets
nikolaglumac 3107a33
[DDW-106] Input adjustment
thedanheller 7379f2e
Merge branch 'feature/ddw-106-wallet-import-feature' of https://githu…
thedanheller c83301c
[DDW-106] Remove Fragment
nikolaglumac bc03c67
[DDW-106] - Wallet import feature
DeeJayElly 98f1c51
Merge remote-tracking branch 'origin/feature/ddw-106-wallet-import-fe…
DeeJayElly ed08c74
[DDW-106] Buttons adjustments - WIP
thedanheller 67a83bf
Merge branch 'feature/ddw-106-wallet-import-feature' of https://githu…
thedanheller 894bde9
[DDW-106] - Wallet import feature
DeeJayElly 14548d8
Merge remote-tracking branch 'origin/feature/ddw-106-wallet-import-fe…
DeeJayElly 3af113a
[DDW-106] Merges develop
nikolaglumac 520c12a
[DDW-106] Enable pending wallet selection
nikolaglumac f4ce3fa
[DDW-106] - Wallet import feature
DeeJayElly 46ee559
Merge remote-tracking branch 'origin/feature/ddw-106-wallet-import-fe…
DeeJayElly 2ec9691
[DDW-106] Buttons actions
thedanheller cefdb5a
Merge branch 'feature/ddw-106-wallet-import-feature' of https://githu…
thedanheller 103639c
[DDW-106] Translation manager
thedanheller 5206fa5
[DDW-106] Prevent closing wallet import dialog after first wallet is …
nikolaglumac 8a829c9
[DDW-106] - Wallet import feature
DeeJayElly f125b5f
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
DeeJayElly 28e96e4
[DDW-106] Finish wallet name field implementation
nikolaglumac d1034ef
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
nikolaglumac 5b4fea2
[DDW-106] Improve import wallet selection
nikolaglumac 8979725
[DDW-106] - Wallet import feature
DeeJayElly 0247844
[DDW-106] Improve inline editing input
nikolaglumac 302975b
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
nikolaglumac 2bd8e47
[DDW-105] Fix set password overlay scrollbar
nikolaglumac 7892942
[DDW-106] Improve wallet name handling
nikolaglumac 71eaaf0
[DDW-106] Separate existing/completed status
nikolaglumac 8759b19
[DDW-106] - Wallet import feature
DeeJayElly d10e438
[DDW-106] - Wallet import feature
DeeJayElly 63ca165
[DDW-106] Small styling adjustment
thedanheller 1230d09
[DDW-106] Storybook story
thedanheller e28f834
[DDW-106] Storybook story
thedanheller 16ff13f
[DDW-106] Unamed wallets header
thedanheller 61746f0
[DDW-106] Close window link
thedanheller cb0a95e
[DDW-106] - Wallet import feature
DeeJayElly 98d2573
Merge remote-tracking branch 'origin/feature/ddw-106-wallet-import-fe…
DeeJayElly 6724bf6
[DDW-106] - Wallet import feature
DeeJayElly 4726a7e
[DDW-106]: Fix button styles of wallet import dialog
topseniors f11d40b
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
topseniors 22c990f
[DDW-106]: Fix inline edit input style
topseniors a973e9d
[DDW-106] 'Enter a wallet name' tooltip
thedanheller 1106ea3
Merge branch 'feature/ddw-106-wallet-import-feature' of https://githu…
thedanheller 5b2f151
[DDW-106] Hide Wallet import learn more link
9af0aef
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
c9bef96
[DDW-106] - Wallet import feature
DeeJayElly 5f750b4
Merge remote-tracking branch 'origin/feature/ddw-106-wallet-import-fe…
DeeJayElly c801845
[DDW-106] Remove learn more link
thedanheller f7b655e
[DDW-106] - Wallet import feature
DeeJayElly 2ced38a
Merge branch 'feature/ddw-106-wallet-import-feature' of https://githu…
thedanheller 7686d16
Merge branch 'feature/ddw-106-wallet-import-feature' of https://githu…
thedanheller f07cea2
[DDW-106] Improve styling
nikolaglumac 0141a34
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
nikolaglumac f52d87e
[DDW-106] - Wallet import feature
DeeJayElly 66f5d91
Merge remote-tracking branch 'origin/feature/ddw-106-wallet-import-fe…
DeeJayElly 8f895c8
[DDW-106]: Fix disabled inline edit input style
topseniors 45161de
[DDW-106] Split import description to 2 lines
908fde8
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
topseniors b4a07d9
[DDW-106] Styling improvements
nikolaglumac fff252e
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
nikolaglumac d5849d9
[DDW-106] Merge and fix conflicts
deca5d6
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
5248871
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
nikolaglumac 6d8f557
Merge branch 'develop' into feature/ddw-106-wallet-import-feature
nikolaglumac 1ef2204
[DDW-106] Conditional walletsWithoutNames header
thedanheller 6cf8582
[DDW-106] Change inline editing input border opacity
d6c7f79
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
965a410
Merge branch 'feature/ddw-106-wallet-import-feature' of https://githu…
thedanheller c9d7a01
Merge branch 'feature/ddw-106-wallet-import-feature' of https://githu…
thedanheller b3b5468
[DDW-106] Fix tests
nikolaglumac 4283c8a
[DDW-106] Fix failing tests
nikolaglumac da5ee53
[DDW-106]: Fix checkbox style on wallet import modal
topseniors 4ea53d0
[DDW-106]: Fix checkbox style on wallet import modal
topseniors e3c90c7
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
topseniors 7e732ea
[DDW-106] Update e2e address classes
06ddcea
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
c2f6383
[DDW-106] Update e2e ITN address classes
dadc64e
[DDW-106] Storybook improvements
thedanheller 9346056
Merge branch 'feature/ddw-106-wallet-import-feature' of https://githu…
thedanheller 75e78c4
[DDW-106]: Fix form field error style on wallet import modal
topseniors 3286492
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
topseniors 9f9abf7
[DDW-106] - Wallet import feature
DeeJayElly 76c9cd6
Merge remote-tracking branch 'origin/feature/ddw-106-wallet-import-fe…
DeeJayElly 547d7e2
[DDW-106]: Fix form field error style on wallet import modal
topseniors 3e2e4ed
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
topseniors 283deac
[DDW-106] Scroller fix
nikolaglumac 5ea02a8
Merge branch 'feature/ddw-106-wallet-import-feature' of github.com:in…
nikolaglumac 7b2b2bf
[DDW-106] Bump Daedalus version
nikolaglumac cc4913c
[DDW-106] Small fix
thedanheller 44e4bbe
Merge branch 'feature/ddw-106-wallet-import-feature' of https://githu…
thedanheller File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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 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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@yakovkaravelov this should be at least 52px (I think) -> so it should be around 6px distance between the input field and the error