Integrate UI 2 #6819

tomusdrw · 2017-10-18T14:50:57Z

Integrates UI-2 as a main Parity Wallet.
v1 of the wallet is still available as a Dapp.

Known issues:

Parity Extension does not display the signer (will be done in a separate PR, right now we might re-think how the code is actually referenced)

All kudos to @jacogr :)

Obviously the whole PR is not reviewable, you might look at some last commits to see how the integration was done.

NOTE: I propose this PR is not merged using "Squash & Merge", specific commits might be useful.

* File paths * Align balance overlays & sizes * Copy works as expected * Re-arrange imports * Icon props * Move packages to their original dependencies * Dependencies to packages * Update test babel overrides

# Conflicts: # js/src/shared/redux/middleware.js # js/src/shared/redux/providers/registry/middleware.js # js/src/shell/Application/application.js # js/src/ui/Actionbar/actionbar.js # js/src/ui/Button/button.js # js/src/ui/Form/AddressSelect/addressSelect.js # js/src/ui/Form/Input/input.js # js/src/ui/MethodDecoding/methodDecoding.js

dropdowns

* Remove mui/Paper from PasswordManager * Aliasses for @parity packages * Remove mui/Card from contract queries * Toggle component replacement (mui-only) * Semantic-ui toggle component * LabelComponent warpper for Toggle * Convert Selectors * Test fixes * Fix case

* Remove mui IconButton * Token type selection * Convert RadioButtons * RadioButtons consistency * Import @parity/ui * Import @parity/ui * Explicit name for RadioButtons * Convert to semantic Radio

* Stepper from semantic-ui * Tabs component * ui/Tabs in loadContract * Adapt Dropdown events * Remove direct use of semantic-ui * Remove IconButton & Subheader * Remove IconMenu * ui/List & List.Item * Be explicit in context props

* Loader spinner * Progressbar conversion * Update Progress * Transfer operational again * Remove List/ListItem from features * Remove extra animation * Remove iconButton * Remove underline(input to be replaced) * Convert Sort to Popup * Remove unused AutoComplete component * Simplify ModalBox * Allow empty Actionbar * Adjust shapeshift icon * Simplify MUI theme (before removal) * Update tests

* Split chip rendering from input * Slider component * Render Chip without MUI * Adjust InputChip styling * Remove mui chip input * Remove mui-chip-input from build * Convert input to sui

# Conflicts: # js/src/shell/Signer/components/TransactionPendingFormConfirm/transaction PendingFormConfirm.js # js/src/ui/Container/Title/title.js # js/src/views/Application/Snackbar/snackbar.js # js/src/views/Status/Peers/peers.js

* Convert DateTime input component * Remove muiTheme context

* Remove unused components * Move to dapp/index.js * Move assets to @parity/shared

* FLOW * ui-2-one more fix

# Conflicts: # js/src/views/Signer/components/SignRequest/signRequest.js

5chdn · 2017-10-19T09:36:36Z

To my understanding, it completely replaces the old UI. I propose to merge this rather early and directly start testing nightly builds with this. Not sure how this can be reviewed anyways.

Note:

Parity Extension does not display the signer (will be done in a separate PR, right now we might re-think how the code is actually referenced)

I have the same issue with the old UI by the way.

5chdn · 2017-10-19T09:55:09Z

Test fails

error[E0063]: missing field `dapps_address` in initializer of `rpc::WsConfiguration`
    --> parity/configuration.rs:1310:65
     |
1310 | 		assert_eq!(conf.into_command().unwrap().cmd, Cmd::SignerToken(WsConfiguration {
     | 		                                                              ^^^^^^^^^^^^^^^ missing `dapps_address`

error: aborting due to previous error

error: Could not compile `parity`.
warning: build failed, waiting for other jobs to finish...
error: build failed
ERROR: Job failed: exit code 1

5chdn · 2017-10-19T10:19:08Z

Also, #6818 should go in first unless @jacogr wants to directly point that one to beta.

jacogr · 2017-10-19T10:31:48Z

@5chdn #6818 will merge into the paritytech/js-shared repo. (and #6756 in paritytech/js-ui)

@tomusdrw I believe it should be "squashed and merged" as per normal - there is a lot of noise in the commits from "merge master into other repos, update the dependencies" - not sure it is useful since as it stands the useful commits get lost in the noise anyway

5chdn · 2017-10-19T12:59:51Z

Tests are good. Has some conflicts from #6818

Does this replace #5486 ? Also, do we merge #6756 before this or do we close #6756 ? @jacogr this keeps confusing me :p

CraigglesO and others added 30 commits May 9, 2017 21:06

grumbles

19d9713

Merge branch 'menu' of github.com:paritytech/parity into menu

f014891

SemanticButton

66843a3

style fix

a0929c4

style fix

4944f59

Ui 2 depends & fixes (#5590)

b9c4e5b

* File paths * Align balance overlays & sizes * Copy works as expected * Re-arrange imports * Icon props * Move packages to their original dependencies * Dependencies to packages * Update test babel overrides

Merge branch 'ui-2' into menu

1c262b2

Simplify Dropdown, pass label correctly

c3ee7f0

Fix tests

7799883

Revert to original label (everything lowercase atm UI-wide)

35a5c47

Updates after merge (last remaining middleware nigglies)

7c78dff

Merge pull request #5559 from paritytech/menu

85cf93e

dropdowns

Merge branch 'master' into ui-2

b1a3909

Merge branch 'master' into ui-2

79e991d

Ui 2 radios & imports (#5609)

5da7c32

* Remove mui IconButton * Token type selection * Convert RadioButtons * RadioButtons consistency * Import @parity/ui * Import @parity/ui * Explicit name for RadioButtons * Convert to semantic Radio

Merge remote-tracking branch 'origin/ui-2' into ui-2

1243728

Ui 2 remove mui from views & shell (#5613)

7cdddd3

* Stepper from semantic-ui * Tabs component * ui/Tabs in loadContract * Adapt Dropdown events * Remove direct use of semantic-ui * Remove IconButton & Subheader * Remove IconMenu * ui/List & List.Item * Be explicit in context props

Merge branch 'master' into ui-2

9bc8254

Merge branch 'master' into ui-2

c5fa984

Ui 2 mui to sui conversion (#5633)

665998e

* Split chip rendering from input * Slider component * Render Chip without MUI * Adjust InputChip styling * Remove mui chip input * Remove mui-chip-input from build * Convert input to sui

Merge branch 'master' into ui-2

31be9d2

# Conflicts: # js/src/shell/Signer/components/TransactionPendingFormConfirm/transaction PendingFormConfirm.js # js/src/ui/Container/Title/title.js # js/src/views/Application/Snackbar/snackbar.js # js/src/views/Status/Peers/peers.js

Ui 2 complete MUI removal (#5635)

95f6f70

* Convert DateTime input component * Remove muiTheme context

Ui 2 cleanups (unused components, shared assets) (#5636)

673cde3

* Remove unused components * Move to dapp/index.js * Move assets to @parity/shared

Merge branch 'master' into ui-2

f7ea667

Merge branch 'master' into ui-2

ab86f9e

flow (#5606)

78461d8

* FLOW * ui-2-one more fix

Merge remote-tracking branch 'origin/ui-2' into ui-2

4b5a1d0

jacogr and others added 11 commits October 17, 2017 09:09

Updated dependencies

9c5b96c

Merge branch 'master' into ui-2

d852e6b

# Conflicts: # js/src/views/Signer/components/SignRequest/signRequest.js

Updated dependencies

9a62119

Integrate old UI.

0f8fb62

Updated dependencies

fc2b58a

Support both versions.

304b067

Update dependencies (should fix account)

9e04be7

Merge branch 'ui-2' into td-ui-2

2472a2b

Enable access to WebSockets for dapps.

48ac6cb

Update build scripts.

da6bd41

Merge branch 'master' into td-ui-2

195305c

tomusdrw added A0-pleasereview 🤓 Pull request needs code review. M7-ui Q9-epic 🌪 Can only be fixed by John Skeet. labels Oct 18, 2017

tomusdrw requested a review from jacogr October 18, 2017 14:50

5chdn added the A9-buythatmanabeer 🍻 Pull request is reviewed well and worth buying the author a beer. label Oct 19, 2017

5chdn added this to the 1.9 milestone Oct 19, 2017

Fix tests.

490f771

5chdn added the B7-releasenotes 📜 Changes should be mentioned in the release notes of the next minor version release. label Oct 19, 2017

5chdn added the P2-asap 🌊 No need to stop dead in your tracks, however issue should be addressed as soon as possible. label Oct 19, 2017

Merge branch 'master' into td-ui-2

bfcf4c4

arkpar added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Oct 19, 2017

arkpar merged commit 41eabfc into master Oct 19, 2017

arkpar deleted the td-ui-2 branch October 19, 2017 20:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integrate UI 2 #6819

Integrate UI 2 #6819

tomusdrw commented Oct 18, 2017 •

edited by arkpar

Loading

5chdn commented Oct 19, 2017 •

edited

Loading

5chdn commented Oct 19, 2017 •

edited

Loading

5chdn commented Oct 19, 2017

jacogr commented Oct 19, 2017

5chdn commented Oct 19, 2017

Integrate UI 2 #6819

Integrate UI 2 #6819

Conversation

tomusdrw commented Oct 18, 2017 • edited by arkpar Loading

5chdn commented Oct 19, 2017 • edited Loading

5chdn commented Oct 19, 2017 • edited Loading

5chdn commented Oct 19, 2017

jacogr commented Oct 19, 2017

5chdn commented Oct 19, 2017

tomusdrw commented Oct 18, 2017 •

edited by arkpar

Loading

5chdn commented Oct 19, 2017 •

edited

Loading

5chdn commented Oct 19, 2017 •

edited

Loading