Devop/fix develop #83
Merged
Conversation
This file contains 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
Scan To Download modal added
…t into ui/helpcenter
…velop # Conflicts: # src/components/Buttons/ButtonWithQrCode/ButtonWithQrCode.scss # src/components/Buttons/ButtonWithQrCode/ButtonWithQrCode.vue # src/components/Buttons/ButtonWithQrCode/index.js # src/components/Buttons/HelpCenterButton/HelpCenterButton.scss # src/components/Buttons/HelpCenterButton/HelpCenterButton.vue # src/components/Buttons/HelpCenterButton/index.js # src/components/DropDownAddressSelector/DropDownAddressSelector.scss # src/components/DropDownAddressSelector/DropDownAddressSelector.vue # src/components/DropDownAddressSelector/index.js # src/components/PopOver/PopOver.vue # src/containers/ByMnemonicContainer/ByMnemonicContainer.vue # src/layouts/AccessWalletLayout/components/AccessByMnemonicphraseModal/AccessByMnemonicphraseModal.vue # src/layouts/AccessWalletLayout/components/AccessByMnemonicphraseModal/index.js # src/layouts/AccessWalletLayout/components/AccessByMnemonicphrasePasswordModal/AccessByMnemonicphrasePasswordModal.scss # src/layouts/AccessWalletLayout/components/AccessByMnemonicphrasePasswordModal/AccessByMnemonicphrasePasswordModal.vue # src/layouts/AccessWalletLayout/components/AccessByMnemonicphrasePasswordModal/index.js # src/layouts/AccessWalletLayout/components/InstallMetamaskModal/InstallMetamaskModal.vue # src/layouts/AccessWalletLayout/components/MetamaskModal/MetamaskModal.vue # src/layouts/AccessWalletLayout/components/NetworkAndAddressModal/NetworkAndAddressModal.vue # src/layouts/AccessWalletLayout/components/PrivateKeyModal/PrivateKeyModal.vue # src/layouts/AccessWalletLayout/components/SoftwareModal/SoftwareModal.scss # src/layouts/AccessWalletLayout/components/SoftwareModal/SoftwareModal.vue # src/layouts/AccessWalletLayout/containers/AccessMyWalletContainer/AccessMyWalletContainer.vue # src/layouts/CreateWalletLayout/CreateWalletLayout.scss # src/layouts/CreateWalletLayout/CreateWalletLayout.vue # src/layouts/CreateWalletLayout/components/ScanToDownloadModal/ScanToDownloadModal.scss # src/layouts/CreateWalletLayout/components/ScanToDownloadModal/ScanToDownloadModal.vue # src/layouts/CreateWalletLayout/components/ScanToDownloadModal/index.js # src/layouts/InterfaceLayout/components/InterfaceBalanceModal/InterfaceBalanceModal.scss # src/layouts/InterfaceLayout/components/InterfaceBalanceModal/InterfaceBalanceModal.vue # src/layouts/InterfaceLayout/components/InterfaceNetwork/InterfaceNetwork.scss # src/layouts/InterfaceLayout/components/InterfaceNetwork/InterfaceNetwork.vue # src/layouts/InterfaceLayout/components/InterfaceNetworkModal/InterfaceNetworkModal.scss # src/layouts/InterfaceLayout/components/InterfaceNetworkModal/InterfaceNetworkModal.vue # src/layouts/InterfaceLayout/components/ProvidersRadioSelector/ProvidersRadioSelector.scss # src/layouts/InterfaceLayout/components/ProvidersRadioSelector/ProvidersRadioSelector.vue # src/layouts/InterfaceLayout/components/ProvidersRadioSelector/index.js # src/layouts/InterfaceLayout/containers/SwapContainer/SwapContainer.scss # src/layouts/InterfaceLayout/containers/SwapContainer/SwapContainer.vue # src/layouts/InterfaceLayout/containers/SwapContainer/components/SwapConfirmationModal/SwapConfirmationModal.scss # src/layouts/InterfaceLayout/containers/SwapContainer/components/SwapConfirmationModal/SwapConfirmationModal.vue # src/layouts/InterfaceLayout/containers/SwapContainer/components/SwapConfirmationModal/components/DetailInformation/DetailInformation.scss # src/layouts/InterfaceLayout/containers/SwapContainer/components/SwapConfirmationModal/components/DetailInformation/DetailInformation.vue # src/layouts/InterfaceLayout/containers/SwapContainer/components/SwapConfirmationModal/components/DetailInformation/index.js # src/layouts/InterfaceLayout/containers/SwapContainer/components/SwapConfirmationModal/index.js # src/layouts/KnowledgeBase/KnowledgeBase.scss # src/layouts/KnowledgeBase/KnowledgeBase.vue # src/layouts/KnowledgeBase/index.js # src/scss/CustomForms.scss # src/scss/Globals.scss
gamalielhere
reviewed
Sep 5, 2018
| @@ -0,0 +1,21 @@ | |||
| <template> | |||
| <div class="helpcenter-button"> | |||
There was a problem hiding this comment.
This looks like the InterfaceBottomText component
| selectedAddress: '', | ||
| validAddress: false, | ||
| dropdownOpen: false, | ||
| addresses: [ |
There was a problem hiding this comment.
Probably better to move this to props since it looks like this component will be set to receive the addresses.
| @@ -126,7 +126,7 @@ export default { | |||
| contents: [ | |||
| { | |||
| text: this.$t('footer.units'), | |||
| to: '/' | |||
| to: '/convert-units' | |||
There was a problem hiding this comment.
might make more sense to change this route to /conversion or something.
gamalielhere
approved these changes
Sep 7, 2018
hsurf22
approved these changes
Sep 7, 2018
Codecov Report
@@ Coverage Diff @@
## develop #83 +/- ##
==========================================
- Coverage 1.73% 1.62% -0.12%
==========================================
Files 295 345 +50
Lines 3972 4256 +284
Branches 489 507 +18
==========================================
Hits 69 69
- Misses 3569 3850 +281
- Partials 334 337 +3
Continue to review full report at Codecov.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Bring Develop branch back up to par
Devop