Clipboard: handleAnything cleanup #1291
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kaloudis
reviewed
Feb 1, 2023
| lnurl = decodelnurl(data); | ||
| } catch (e) {} | ||
| // if the value is from clipboard and looks like a url we don't want to decode it | ||
| if (!isClipboardValue || !data.match(/^https?:\/\//i)) { |
There was a problem hiding this comment.
Let's catch http:// as well
There was a problem hiding this comment.
Sir, that regex should catch http:// and https://
kaloudis
reviewed
Feb 1, 2023
| @@ -146,7 +146,7 @@ export default class WalletHeader extends React.Component< | |||
| if (settings.privacy && settings.privacy.clipboard) { | |||
| const clipboard = await Clipboard.getString(); | |||
|
|
|||
| if (!!clipboard && isClipboardValue(clipboard)) { | |||
| if (!!clipboard && (await isClipboardValue(clipboard))) { | |||
There was a problem hiding this comment.
were the awaits actually required here or did you just add them for correctness?
There was a problem hiding this comment.
handleAnything (and therefore isClipboardValue) returns a Promise so without await they were always evaluating to true
kaloudis
approved these changes
Feb 4, 2023
kaloudis
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Relates to issue: ZEUS-0000
Fixing issue where paste from clipboard would appear when regular URLs (or any other invalid data) was in the clipboard.
This pull request is categorized as a:
Checklist
yarn run tscand made sure my code compiles correctlyyarn run lintand made sure my code didn’t contain any problematic patternsyarn run prettierand made sure my code is formatted correctlyyarn run testand made sure all of the tests passTesting
If you modified or added a utility file, did you add new unit tests?
I have tested this PR on the following platforms (please specify OS version and phone model/VM):
I have tested this PR with the following types of nodes (please specify node version and API version where appropriate):
Locales
Third Party Dependencies and Packages
yarnafter this PR is merged inpackage.jsonandyarn.lockhave been properly updatedOther: