Skip to content
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

fix: don't close custom peer modal when clicking inside #1204

Merged
merged 7 commits into from Jun 24, 2019

Conversation

Projects
None yet
6 participants
@j-a-m-l
Copy link
Contributor

commented Apr 24, 2019

Proposed changes

After opening the modal to add a custom peer, it's impossible to use it, because when clicking inside it, it's automatically closed.

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • Refactoring (improve a current implementation without adding a new feature or fixing a bug)

Checklist

  • I have read the CONTRIBUTING documentation
  • Lint and unit tests pass locally with my changes
@alexbarnsley

This comment has been minimized.

Copy link
Member

commented May 3, 2019

I think I tested this a few days ago but I've slept since. Just to confirm, this is when clicking the overlay to close the modal, it should keep the peer settings menu open in the sidebar? @j-a-m-l

@codecov-io

This comment has been minimized.

Copy link

commented May 3, 2019

Codecov Report

Merging #1204 into develop will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1204      +/-   ##
===========================================
- Coverage     40.2%   40.19%   -0.02%     
===========================================
  Files          232      232              
  Lines         6372     6374       +2     
  Branches      1255     1255              
===========================================
  Hits          2562     2562              
- Misses        3588     3590       +2     
  Partials       222      222
Impacted Files Coverage Δ
...nents/App/AppSidemenu/AppSidemenuNetworkStatus.vue 0% <ø> (ø) ⬆️
src/renderer/components/Button/ButtonModal.vue 50% <ø> (-25%) ⬇️
...erer/components/Network/NetworkCustomPeerModal.vue 24.48% <ø> (ø)

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 d2c786d...1e4312e. Read the comment docs.

@j-a-m-l

This comment has been minimized.

Copy link
Contributor Author

commented May 3, 2019

@alexbarnsley I've updated the PR description.

@alexbarnsley

This comment has been minimized.

Copy link
Member

commented May 6, 2019

🤔 i didn't experience that. I will re-test, probably after the next release

@dated

This comment has been minimized.

Copy link
Contributor

commented May 12, 2019

This is more of a problem with the click-outside directive imho, as the problem is present elsewhere as well (settings -> reset data for instance). The current behaviour also stops a menu from closing after re-clicking on the button which opens it.

@dated

This comment has been minimized.

Copy link
Contributor

commented May 12, 2019

Well, the easy fix for the reset data modal is an extra condition to emitting the close signal:

if (this.outsideClick && !this.isResetDataModalOpen) {
  this.$emit('close')
}

I added that in #1146; the second issue mentioned is still standing.

faustbrian and others added some commits May 27, 2019

@codecov-io

This comment has been minimized.

Copy link

commented Jun 18, 2019

Codecov Report

Merging #1204 into develop will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1204      +/-   ##
===========================================
- Coverage    39.97%   39.96%   -0.02%     
===========================================
  Files          228      228              
  Lines         6321     6323       +2     
  Branches      1239     1246       +7     
===========================================
  Hits          2527     2527              
- Misses        3573     3574       +1     
- Partials       221      222       +1
Impacted Files Coverage Δ
...nents/App/AppSidemenu/AppSidemenuNetworkStatus.vue 0% <ø> (ø) ⬆️
src/renderer/components/Button/ButtonModal.vue 50% <ø> (-25%) ⬇️
...erer/components/Network/NetworkCustomPeerModal.vue 24.48% <ø> (ø)
src/renderer/components/Network/NetworkModal.vue 29.13% <0%> (ø) ⬆️

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 4c7a3ce...73de525. Read the comment docs.

@alexbarnsley alexbarnsley changed the title fix: do not close the custom peer modal when clicking inside it fix: don't close custom peer modal when clicking inside Jun 24, 2019

@alexbarnsley alexbarnsley merged commit 44f5e25 into develop Jun 24, 2019

1 check passed

ci/circleci: test-node-11 Your tests passed on CircleCI!
Details

@ArkEcosystemBot ArkEcosystemBot deleted the fix-custom-peer-modal branch Jun 24, 2019

alexbarnsley added a commit that referenced this pull request Jun 26, 2019

chore: merge develop to master (#1304)
* fix: improve validation for epoch format (#1164)

* chore: upgrade Vue and other dependencies and use Node 11 on CI (#1160)

* feat: allow using a pool of background workers and use create a unified HTTP client (#1120)

* fix: `InputSelect` dropdowns (#1174)

* fix: `InputSelect` dropdowns

* refactor: use the new Vue 2.6 syntax for named slots

* fix: do not allow more than 1 `InputSelect` open at the same time

* fix: other network fees when higher than ARK default static fees (#1172)

* fix: main sidebar menus (settings and peers/networks) (#1175)

* fix: the wallet selection dropdown and the wallet sidebar filters (#1184)

* fix: do not fail when navigating to other page while loading transactions (#1185)

* fix: use of getStruct in ledger transactions (#1190)

* chore: add ItsANameToo as code owner

* fix: add network modal validation (#1173)

* fix: network validation being overwritten

* feat: pull active delegates from api

* fix: make sure active delegates value exists

* refactor: improve server regex

* test: network modal for adding network

* chore: replace todo with comment

* fix: use one loop with prefilled values as backup

* refactor: allow string or number for input text

* refactor: allow fetching fees for specific network

* fix: fetch network fees when adding/editing

* fix: fetch fees & wait before add/update

* chore: remove mario from contributors (#1196)

* chore: add Altilly Exchange Wallet (#1199)

* fix: align the add profile placeholder (#1202)

* fix: days on the X axis of the market chart (#1203)

* fix: fetch fees only if the network is available (#1206)

* fix: stop hover from displacing address container (#1242)

* fix: vue-i18n-extract commands (#1247)

* refactor: require user action when generating 2nd passphrase (#1229)

* feat: store sidebar sorting and filters (#1148)

* feat: add option to hide the wallet button text (#1146)

* fix: get children of TransitionGroup when available & word-break of vendorfield (#1234)

* feat: show remaining bytes in vendorfield helper text (#1259)

* chore: use organization-wide GitHub Configuration (#1267)

* misc: Italian language update (#1268)

* fix: tidy permission method names & check exists (#1260)

* feat: add option to export wallets (#1244)

* feat: use the theme colours for the wallet filters instead of white (#1270)

* deps: upgrade `axios` (CVE-2019-10742) (#1271)

* fix: saving of invalid profile name on leave (#1101)

* bugfix: saving of invalid profile editions

* refactor: dont disable save button when profile name valid

even when the 'isNameEditable' don't disable save button. Instead disable it only when the name has an error.

* Update en-US.js

* Update ProfileEdition.vue

* refactor: show failed update message on close

* refactor: add update failure reason

* fix: disable both save buttons if name invalid

* fix: display the wallet sidebar filters on the right position (#1201)

* fix: highlight filters button when expanded if active

* fix: display the wallet sidebar filters on the right position

* refactor: add the status icon and plus/minus sign in the transaction show modal (#1272)

* fix: use webview instead of iframe for changelly (#1277)

* revert: worker changes from commit e42290

* refactor: use nock to mock tests (#1291)

* fix: add options mock requests

* fix: tests not mocking api

* fix: duplicated key warning on `WalletNew`

* Update src/renderer/pages/Wallet/WalletNew.vue

Co-Authored-By: Edgar Goetzendorff <hello@dated.fun>

* fix: ledger options on build (#1300)

* fix: ledger options on build

* fix: use component directly

* fix: change order of arguments in uniqBy call (#1297)

* fix: don't close custom peer modal when clicking inside (#1204)

* refactor: rename `NetworkCustomPeer` to `NetworkCustomPeerModal`

* fix: do not close the custom peer modal when clicking inside it

* refactor: wallet address & balance clickable on WalletAll page (#1301)

* fix: ledger wallet sidebar filter (#1292)

* fix: ledger whitescreen (#1296)

* fix: ledger whitescreen errors

* refactor: all ledger errors are failures

* refactor: improve ledger connection check

* refactor: improve ledger & use hid-singleton

* test: fix failing

* chore: remove e2e tests

* fix: open transaction modal on dashboard (#1281)

* fix: remove deeplink validation prefix

* fix: open transaction modal on dashboard

* fix: don't switch twice when selecting wallet on WalletSidebar (#1302)

* chore: bump version to 2.5.0 (#1303)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.