Skip to content
This repository has been archived by the owner on Mar 23, 2023. It is now read-only.

merge develop to master #1434

Merged
merged 15 commits into from Sep 4, 2019
Merged

merge develop to master #1434

merged 15 commits into from Sep 4, 2019

Conversation

alexbarnsley
Copy link
Member

No description provided.

dependabot bot and others added 13 commits August 29, 2019 07:14
chore(deps): bump mixin-deep from 1.3.1 to 1.3.2

Co-authored-by: null <49699333+dependabot[bot]@users.noreply.github.com>
* chore: update peers package

* fix: cater for new breaking changes

* fix: add peers to got webpack whitelist

* fix: add version to custom network form

* test: fix failing
* fix: development mode message in production

* fix: remove error log

* chore: add script to build win x64
* fix: properly format crypto currencies

* chore: typo `precissely` -> `precisely`

* test: remove `only`
…gate to transactions tab always (#1143)

* fix: close transaction show when clicking on and address and navigate to transactions tab always

* fix: close vote modal when clicking on and address and navigate to transactions tab always

* fix: hide the tooltip when clicking on a wallet address
* chore(deps): update all electron dependencies

* chore: resolve conflicts
* refactor: remove dot from extensions

* feat: add electron_readFile mixin

* refactor: also return filePath from electron_readFile mixin

* feat: basic structure for loading a transaction

* refactor: change error handling and populate form

* refactor: check if properties exist

* refactor: improved error handling and validation

* chore: wording

* chore: wording

* fix: allowClose prop requiredness

* chore: replace icon

* test: add TransactionFormTransfer tests

* chore: remove debugger statement

* style: update imports

* chore: restore shalloMount import
* feat: use websockets in plugins

* test: plugin websocket

* fix: websocket readystate

* refactor: improve inline de-structuring speed

* chore: update yarn.lock
@ghost
Copy link

ghost commented Sep 3, 2019

Your pull request doesn't follow our contribution guidelines. Please review and correct it.

@ghost ghost added the Complexity: Undetermined Needs specialized, in-depth review. label Sep 3, 2019
@alexbarnsley alexbarnsley changed the title merge master to develop merge develop to master Sep 3, 2019
@codecov-io
Copy link

codecov-io commented Sep 4, 2019

Codecov Report

Merging #1434 into master will increase coverage by 0.78%.
The diff coverage is 55%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1434      +/-   ##
==========================================
+ Coverage   39.94%   40.72%   +0.78%     
==========================================
  Files         236      237       +1     
  Lines        6452     6536      +84     
  Branches     1278     1300      +22     
==========================================
+ Hits         2577     2662      +85     
+ Misses       3637     3631       -6     
- Partials      238      243       +5
Impacted Files Coverage Δ
...c/renderer/components/Modal/ModalExportWallets.vue 36.5% <ø> (ø) ⬆️
...omponents/Wallet/WalletExchange/WalletExchange.vue 17.39% <ø> (-0.8%) ⬇️
...ransaction/TransactionForm/TransactionFormVote.vue 12.5% <ø> (ø) ⬆️
...ts/Transaction/TransactionForm/TransactionForm.vue 46.15% <ø> (ø) ⬆️
...nderer/components/Modal/ModalAdditionalLedgers.vue 47.82% <ø> (ø) ⬆️
.../components/Wallet/WalletDetails/WalletDetails.vue 9.8% <ø> (-0.2%) ⬇️
src/renderer/components/Modal/ModalWindow.vue 62.5% <ø> (ø) ⬆️
src/renderer/mixins/currency.js 81.39% <ø> (ø) ⬆️
src/renderer/mixins/electron.js 0% <0%> (ø) ⬆️
src/renderer/components/Wallet/WalletAddress.vue 48.48% <0%> (-3.24%) ⬇️
... and 21 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 09abff0...45657c3. Read the comment docs.

@alexbarnsley alexbarnsley merged commit 0525de5 into master Sep 4, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Complexity: Undetermined Needs specialized, in-depth review.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants