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.

Sign up for GitHub

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

Jump to bottom

Use different title for scan button for self verification #4525

Merged
merged 6 commits into from
Jul 9, 2021
Merged

Use different title for scan button for self verification #4525

merged 6 commits into from
Jul 9, 2021

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented Jul 2, 2021 •
edited
Loading

Because it's not 'their' device, it's your own device.

Pull Request Checklist

  • I read the contributing guide
  • UI change has been tested on both light and dark themes, in portrait and landscape orientations and on iPhone and iPad simulators -- hopefully not necessary for a string change
  • Pull request is based on the develop branch
  • Pull request updates CHANGES.rst
  • Pull request includes screenshots or videos of UI changes
  • Pull request includes a sign off

IMG_1731373856F1-1

Will do the same on android in a bit

dbkr added 2 commits July 2, 2021 17:38
@dbkr
Use different title for scan button for self verification
2faaf12 
Because it's not 'their' device, it's your own device.
@dbkr
changelog
d55cc56
@dbkr dbkr mentioned this pull request Jul 2, 2021
Merged
6 tasks
dbkr added 3 commits July 6, 2021 15:36
@dbkr
Merge remote-tracking branch 'origin/develop' into dbkr/scan_button_t…
ed3f789 
…itle
@dbkr
Don't show dialog on cancel if self-verifying
0fae773 
The user should know they cancelled in if they're self verifying since
they're the one who cancelled, from their other device (the copy referred
to 'the other party', so was inaccurate, so we may as well just remove it).
@dbkr
Merge remote-tracking branch 'origin/develop' into dbkr/scan_button_t…
b11c935 
…itle
@pixlwave pixlwave self-requested a review July 9, 2021 16:45
pixlwave
pixlwave approved these changes Jul 9, 2021
View reviewed changes
Copy link
Member

@pixlwave pixlwave left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Looks good to me. Only two little typos in the comments that I spotted (and fixed).

@pixlwave
Copy link
Member

pixlwave commented Jul 9, 2021

Tested both verifying my own device and someone else, and worked great 👍

@pixlwave pixlwave merged commit 4e34cb0 into develop Jul 9, 2021
@pixlwave pixlwave deleted the dbkr/scan_button_title branch July 9, 2021 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pixlwave pixlwave pixlwave approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dbkr @pixlwave