Skip to content

Fixed country flag is not rendered in vpn panel #16976

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
Merged
merged 2 commits into from
Feb 3, 2023
Merged

Fixed country flag is not rendered in vpn panel #16976

merged 2 commits into from
Feb 3, 2023

Conversation

simonhong
Copy link
Member

@simonhong simonhong commented Feb 2, 2023 •
edited
Loading

fix brave/brave-browser#28181

Dynamic importing causes TrustedScriptURL assignment error.
Fixed by setting static image src.

Resolves

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

See the linked issue

@simonhong simonhong self-assigned this Feb 2, 2023
@github-actions github-actions bot added CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/storybook-url Deploy storybook and provide a unique URL for each build labels Feb 2, 2023
@simonhong simonhong force-pushed the vpn_panel_trusted_types branch from d550980 to 77f99da Compare February 2, 2023 04:33
@simonhong simonhong force-pushed the vpn_panel_trusted_types branch from 77f99da to 0914754 Compare February 2, 2023 04:59
@simonhong simonhong changed the title Fixed TrustedScriptURL assignment error in vpn panel Fixed country flag is not rendered in vpn panel Feb 2, 2023
@simonhong simonhong force-pushed the vpn_panel_trusted_types branch from 0914754 to 51219ac Compare February 2, 2023 09:49
@simonhong simonhong marked this pull request as ready for review February 2, 2023 09:50
@simonhong simonhong force-pushed the vpn_panel_trusted_types branch 2 times, most recently from acda20a to b499a98 Compare February 2, 2023 09:54
@simonhong simonhong requested a review from nullhook February 2, 2023 09:59
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@simonhong
Fixed country flag is not rendered in vpn panel
f24311f 
fix brave/brave-browser#28181

Dynamic importing causes TrustedScriptURL assignment error.
Fixed by setting static image src.
@simonhong simonhong force-pushed the vpn_panel_trusted_types branch from b499a98 to f24311f Compare February 2, 2023 23:01
nullhook
nullhook suggested changes Feb 2, 2023
View reviewed changes
Copy link
Contributor

@nullhook nullhook left a comment

Choose a reason for hiding this comment

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

I've been wanting to transfer the icons to the C++ side.

Thanks for doing this.

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@simonhong
Copy link
Member Author

@nullhook Thanks for review! All addressed at c294214 PTAL again.

@simonhong simonhong requested a review from nullhook February 3, 2023 00:18
@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

nullhook
nullhook approved these changes Feb 3, 2023
View reviewed changes
Copy link
Contributor

@nullhook nullhook left a comment

Choose a reason for hiding this comment

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

lgtm

@simonhong simonhong merged commit 33c6a1b into master Feb 3, 2023
@simonhong simonhong deleted the vpn_panel_trusted_types branch February 3, 2023 04:23
@github-actions github-actions bot added this to the 1.50.x - Nightly milestone Feb 3, 2023
petemill
petemill reviewed Feb 3, 2023
View reviewed changes
Copy link
Member

@petemill petemill left a comment

Choose a reason for hiding this comment

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

nice work!

@brave-builds brave-builds mentioned this pull request Feb 3, 2023
Merged
7 tasks
brave-builds added a commit that referenced this pull request Feb 3, 2023
@brave-builds
Uplift of #16976 (squashed) to beta
942524b
simonhong added a commit that referenced this pull request Feb 3, 2023
@simonhong
Merge pull request #16976 from brave/vpn_panel_trusted_types
6bc6367 
 Fixed country flag is not rendered in vpn panel
@simonhong simonhong mentioned this pull request Feb 3, 2023
Merged
7 tasks
@stephendonner
Copy link
Contributor

Verified PASSED using

Brave 1.50.7 Chromium: 110.0.5481.77 (Official Build) nightly (x86_64)
Revision 65ed616c6e8ee3fe0ad64fe83796c020644d42af-refs/branch-heads/5481@{#839}
OS macOS Version 11.7.3 (Build 20G1116)
Light Dark
Screen Shot 2023-02-03 at 10 16 48 PM Screen Shot 2023-02-03 at 10 16 27 PM

kjozwiak pushed a commit that referenced this pull request Feb 6, 2023
@brave-builds
Fixed country flag is not rendered in vpn panel (uplift to 1.49.x) (#…
2b46045 
…17008)

Uplift of #16976 (squashed) to beta
kjozwiak pushed a commit that referenced this pull request Feb 6, 2023
@simonhong
Fixed country flag is not rendered in vpn panel (uplift to 1.48.x) (#…
4e8ca2f 
…17009)

Merge pull request #16976 from brave/vpn_panel_trusted_types

 Fixed country flag is not rendered in vpn panel
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petemill petemill petemill left review comments

@nullhook nullhook nullhook approved these changes

Assignees

@simonhong simonhong

Labels
CI/run-audit-deps Check for known npm/cargo vulnerabilities (audit_deps) CI/storybook-url Deploy storybook and provide a unique URL for each build
Projects
None yet
Milestone
1.50.x - Release
Development

Successfully merging this pull request may close these issues.

Country flag is not visible from VPN main panel
5 participants
@simonhong @brave-builds @stephendonner @petemill @nullhook