Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Updates recovery dialog text and buttons #13742

Merged
merged 1 commit into from
Apr 18, 2018

Conversation

NejcZdovc
Copy link
Contributor

@NejcZdovc NejcZdovc commented Apr 5, 2018

Resolves #11857

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed. (Ask a Brave employee to help if you cannot access this document.)

Test Plan:

  • start browser
  • enable payments
  • go to recovery dialog
  • make sure that it's the same as spec

New look
image

Reviewer Checklist:

  • Request a security/privacy review as needed if one was not already requested.

Tests

  • Adequate test coverage exists to prevent regressions
  • Tests should be independent and work correctly when run individually or as a suite ref
  • New files have MPL2 license header

@codecov-io
Copy link

codecov-io commented Apr 5, 2018

Codecov Report

Merging #13742 into master will decrease coverage by 0.04%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master   #13742      +/-   ##
==========================================
- Coverage   56.53%   56.49%   -0.05%     
==========================================
  Files         283      283              
  Lines       28817    28818       +1     
  Branches     4777     4776       -1     
==========================================
- Hits        16293    16281      -12     
- Misses      12524    12537      +13
Flag Coverage Δ
#unittest 56.49% <0%> (-0.05%) ⬇️
Impacted Files Coverage Δ
app/renderer/components/preferences/paymentsTab.js 68.27% <ø> (ø) ⬆️
js/about/preferences.js 61.18% <ø> (-0.07%) ⬇️
...r/components/preferences/payment/ledgerRecovery.js 38% <0%> (+0.74%) ⬆️
js/stores/appStoreRenderer.js 91.66% <0%> (-8.34%) ⬇️
app/renderer/components/reduxComponent.js 57.75% <0%> (-3.45%) ⬇️
js/stores/windowStore.js 28.46% <0%> (-0.3%) ⬇️
app/browser/api/ledger.js 62.43% <0%> (-0.18%) ⬇️

@arsalankhalid
Copy link
Contributor

arsalankhalid commented Apr 8, 2018

Oh no, that sucks I did this :( I guess I took too long to get it covered as it was on my plate. I'll give your branch a whirl, although not sure why you removed all this stuff in preferences, with hiding overlays?

if (overlayName === 'addFunds' && isVisible === false) {	
-      // Hide the child overlays when the parent is closed	
-      stateDiff['bitcoinOverlayVisible'] = false	
-      stateDiff['qrcodeOverlayVisible'] = false	
-    }

And also some first, second recovery keys.

@NejcZdovc
Copy link
Contributor Author

@arsalankhalid this is just some dead old code that was there and I removed it.

@jasonrsadler jasonrsadler self-requested a review April 13, 2018 10:20
@@ -166,14 +164,14 @@ ledgerBackupText1=Below, you will find the anonymized recovery key that is requi
ledgerBackupText2=Make sure you keep this key private, or else your wallet will be compromised.
ledgerBackupTitle=Backup your Brave wallet
ledgerPaymentsShown=Brave Payments
ledgerRecoveryContent=Your previous wallet will now be used. Your new wallet will be discarded.
ledgerRecoveryContent=Note: The recovered BAT wallet will be replace the current BAT wallet, which will be discarded.
Copy link
Contributor

@jasonrsadler jasonrsadler Apr 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'....will be replace the current...' should be '.....will replace the current....'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

Copy link
Contributor

@jasonrsadler jasonrsadler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Font doesn't look the same from mockup on that sentence either. I'll let @bradleyrichter weigh in.

@NejcZdovc NejcZdovc force-pushed the fix/#11857-recover branch from 041c603 to d4ea370 Compare April 16, 2018 10:15
@NejcZdovc NejcZdovc requested a review from jasonrsadler April 16, 2018 10:23
@bradleyrichter
Copy link
Contributor

The font on the footnote can be Regular and not Bold. Otherwise, it looks good!

@NejcZdovc
Copy link
Contributor Author

@bradleyrichter remove bold, updated image in the first comment

@NejcZdovc NejcZdovc force-pushed the fix/#11857-recover branch from d4ea370 to deda04c Compare April 16, 2018 14:22
Copy link
Contributor

@bradleyrichter bradleyrichter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks all!

Copy link
Contributor

@jasonrsadler jasonrsadler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks Good!

@NejcZdovc NejcZdovc modified the milestones: Completed work, 0.22.x Release 3 (Beta channel) Apr 16, 2018
@NejcZdovc NejcZdovc merged commit 36d892d into brave:master Apr 18, 2018
NejcZdovc added a commit that referenced this pull request Apr 18, 2018
Updates recovery dialog text and buttons
NejcZdovc added a commit that referenced this pull request Apr 18, 2018
Updates recovery dialog text and buttons
@NejcZdovc
Copy link
Contributor Author

master 36d892d
0.23 0d64197
0.22 5564d3a

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants