Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Integrate UI 2 #6819

Merged
merged 344 commits into from Oct 19, 2017
Merged

Integrate UI 2 #6819

merged 344 commits into from Oct 19, 2017

Conversation

tomusdrw
Copy link
Collaborator

@tomusdrw tomusdrw commented Oct 18, 2017

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.

CraigglesO and others added 30 commits May 9, 2017 21:06
* 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
* 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
@tomusdrw 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 tomusdrw requested a review from jacogr October 18, 2017 14:50
@5chdn 5chdn added the A9-buythatmanabeer 🍻 Pull request is reviewed well and worth buying the author a beer. label Oct 19, 2017
@5chdn 5chdn added this to the 1.9 milestone Oct 19, 2017
@5chdn
Copy link
Contributor

5chdn commented Oct 19, 2017

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
Copy link
Contributor

5chdn commented Oct 19, 2017

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
Copy link
Contributor

5chdn commented Oct 19, 2017

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

@jacogr
Copy link
Contributor

jacogr commented Oct 19, 2017

@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 5chdn added the B7-releasenotes 📜 Changes should be mentioned in the release notes of the next minor version release. label Oct 19, 2017
@5chdn
Copy link
Contributor

5chdn commented Oct 19, 2017

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

@5chdn 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
@arkpar arkpar added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Oct 19, 2017
@arkpar arkpar merged commit 41eabfc into master Oct 19, 2017
@arkpar arkpar deleted the td-ui-2 branch October 19, 2017 20:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well. A9-buythatmanabeer 🍻 Pull request is reviewed well and worth buying the author a beer. B7-releasenotes 📜 Changes should be mentioned in the release notes of the next minor version release. P2-asap 🌊 No need to stop dead in your tracks, however issue should be addressed as soon as possible. Q9-epic 🌪 Can only be fixed by John Skeet.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants