Adds captcha to UGP flow #14189

NejcZdovc · 2018-05-21T06:12:52Z

Resolves #14188

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:

clean profile
start browser with staging flag
enable payments
claim promotion
verify that you can see captcha overlay
solve (and try to miss) the captcha
make sure that success overlay is displayed
close overlay and make sure that you received 10BAT

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

jasonrsadler · 2018-05-25T11:30:25Z

test/unit/app/browser/reducers/ledgerReducerTest.js

+
+  describe('APP_ON_CAPTCHA_RESPONSE', function () {
+
+  })


Do we need tests on these two?

lol I added them but then forgot to actually add them 😄 thx

tests added

jasonrsadler · 2018-05-25T13:26:21Z

app/renderer/components/preferences/payment/captcha.js

+const promotionStatuses = require('../../../../common/constants/promotionStatuses')
+
+// Styles
+const cx = require('../../../../../js/lib/classSet')


Were we deprecating the use of className cx()? It's implied from the styling guidelines but I don't know for sure.

not sure, this is what it was used so far

jasonrsadler · 2018-05-25T13:30:13Z

app/renderer/components/preferences/payment/captcha.js

+        [css(styles.enabledContent__overlay)]: true,
+        [css(styles.enabledContent__captcha)]: true,
+        'enabledContent__overlay': true
+      })}


can we just use [css(styles.enabledContent__overlay, styles.enabledContent__captcha)]?

jasonrsadler · 2018-05-25T13:34:04Z

app/renderer/components/preferences/payment/enabledContent.js

@@ -632,6 +644,23 @@ const styles = StyleSheet.create({
    }
  },

+  enabledContent__captcha: {
+    // TODO we need to make sure that text is not in DND zone


These don't look like they're used here. They're defined in the captcha component as well.

jasonrsadler · 2018-05-25T13:34:17Z

app/renderer/components/preferences/payment/enabledContent.js

+    padding: '20px'
+  },
+
+  enabledContent__captcha__drop: {


jasonrsadler · 2018-05-25T14:37:41Z

app/renderer/components/preferences/payment/captcha.js

+    return <div
+      className={cx({
+        [css(styles.enabledContent__overlay, styles.enabledContent__captcha)]: true,
+        'enabledContent__overlay': true


I meant:
is styles.enabledContent__overlay and the enabledContent__overlay below it reference the same styling? If so, then just:
className={css(styles.enabledContent__overlay, styles.enabledContent__captcha)}

Resolves brave#14188 Auditors: Test Plan:

jasonrsadler · 2018-05-25T16:18:11Z

Really awesome.

There were a couple times where I had dragged over the outline but was still told to 'try again'. Should we implement an onhover over the outline coordinates [and maybe bolden the outline on hover] to let the user know when they are dropping on the right answer? (I'm assuming the coordinate answer is sent to the client)

NejcZdovc · 2018-05-25T16:20:16Z

@jasonrsadler we don't know the coordinates, we just send dropped coordinates to the server and server then decides if it's ok or not

jasonrsadler · 2018-05-25T16:21:42Z

Had a feeling that's how it was working. Just checking.

jasonrsadler

++ 🥇

Adds captcha to UGP flow

NejcZdovc · 2018-05-25T16:34:39Z

master 8e9be72
0.23 97c2bb9
0.22 d99e390

NejcZdovc added feature/rewards PR/work-in-progress ⚒ labels May 21, 2018

NejcZdovc self-assigned this May 21, 2018

NejcZdovc added this to the 0.22.x Release 4 (Beta channel) milestone May 21, 2018

NejcZdovc force-pushed the feature/#14188-captcha branch from d0139c3 to 88f286b Compare May 21, 2018 08:30

kjozwiak added release-notes/include and removed release-notes/include labels May 21, 2018

bsclifton modified the milestones: 0.22.x Release 4 (Beta channel), 0.22.x Release 5 May 22, 2018

NejcZdovc force-pushed the feature/#14188-captcha branch 4 times, most recently from 13e5cee to 0cc88ed Compare May 23, 2018 16:37

This was referenced May 24, 2018

can't dismiss the captcha modal using "X" #14225

Closed

captcha icon sometimes overlaps text #14226

Closed

NejcZdovc force-pushed the feature/#14188-captcha branch 3 times, most recently from d4428e0 to da64db6 Compare May 25, 2018 05:07

NejcZdovc mentioned this pull request May 25, 2018

dismissing the captcha when user disables/enables Payments while captcha is visible #14242

Closed

NejcZdovc removed the PR/work-in-progress ⚒ label May 25, 2018

NejcZdovc requested review from ryanml, bsclifton and jasonrsadler May 25, 2018 09:57

NejcZdovc added the PR/pending-review label May 25, 2018

NejcZdovc force-pushed the feature/#14188-captcha branch from 320d02e to 4e8d576 Compare May 25, 2018 09:58

jasonrsadler reviewed May 25, 2018

View reviewed changes

NejcZdovc force-pushed the feature/#14188-captcha branch from 4e8d576 to 1041f91 Compare May 25, 2018 12:01

NejcZdovc requested a review from jasonrsadler May 25, 2018 12:01

jasonrsadler reviewed May 25, 2018

View reviewed changes

NejcZdovc requested a review from jasonrsadler May 25, 2018 13:46

NejcZdovc force-pushed the feature/#14188-captcha branch from 1041f91 to 1d5794e Compare May 25, 2018 13:46

jasonrsadler reviewed May 25, 2018

View reviewed changes

Adds capctha to the grant flow

fa6124b

Resolves brave#14188 Auditors: Test Plan:

NejcZdovc requested a review from jasonrsadler May 25, 2018 16:18

NejcZdovc force-pushed the feature/#14188-captcha branch from 1d5794e to fa6124b Compare May 25, 2018 16:18

jasonrsadler approved these changes May 25, 2018

View reviewed changes

NejcZdovc merged commit 8e9be72 into brave:master May 25, 2018

NejcZdovc added a commit that referenced this pull request May 25, 2018

Merge pull request #14189 from NejcZdovc/feature/#14188-captcha

97c2bb9

Adds captcha to UGP flow

NejcZdovc added a commit that referenced this pull request May 25, 2018

Merge pull request #14189 from NejcZdovc/feature/#14188-captcha

d99e390

Adds captcha to UGP flow

NejcZdovc mentioned this pull request May 29, 2018

UGP captcha #14188

Closed

kjozwiak removed the PR/pending-review label May 31, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds captcha to UGP flow #14189

Adds captcha to UGP flow #14189

NejcZdovc commented May 21, 2018 •

edited

Loading

jasonrsadler May 25, 2018

NejcZdovc May 25, 2018

NejcZdovc May 25, 2018

jasonrsadler May 25, 2018

NejcZdovc May 25, 2018 •

edited

Loading

NejcZdovc May 25, 2018

jasonrsadler May 25, 2018

NejcZdovc May 25, 2018

jasonrsadler May 25, 2018

NejcZdovc May 25, 2018

jasonrsadler May 25, 2018

jasonrsadler May 25, 2018

NejcZdovc May 25, 2018

jasonrsadler commented May 25, 2018

NejcZdovc commented May 25, 2018

jasonrsadler commented May 25, 2018

jasonrsadler left a comment

NejcZdovc commented May 25, 2018

Adds captcha to UGP flow #14189

Adds captcha to UGP flow #14189

Conversation

NejcZdovc commented May 21, 2018 • edited Loading

Submitter Checklist:

Test Plan:

Reviewer Checklist:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NejcZdovc May 25, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jasonrsadler commented May 25, 2018

NejcZdovc commented May 25, 2018

jasonrsadler commented May 25, 2018

jasonrsadler left a comment

Choose a reason for hiding this comment

NejcZdovc commented May 25, 2018

NejcZdovc commented May 21, 2018 •

edited

Loading

NejcZdovc May 25, 2018 •

edited

Loading