-
Notifications
You must be signed in to change notification settings - Fork 2.9k
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.
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
Add displaying svg logos inside QR code #39072
Add displaying svg logos inside QR code #39072
Conversation
ff214cf
to
4be94bd
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
@sobitneupane Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
Thanks for the update @Kicu. There are some places like Task page and MoneyRequest Page where we don't show logo at all. We used to show Expensify logo earlier. TBH, I am not sure what we want to show. |
@sobitneupane thanks for finding this views, I have somehow missed them (still don't know the app that well 😅). I will make sure that they look decent. |
@sobitneupane pushed a commit that fixes what you described. recheck please 🙏 |
ab01c27
to
270069d
Compare
Thanks for the update @Kicu Instead of Expensify logo, a different logo is displayed in personal IOU Money Request Page. I cannot reproduce the issue in some of the IOUs but mostly I can. Can you please test it in your end? |
@sobitneupane thank you for testing 🙏 I am still sometimes surprised by parts of the app functionality and I can miss these cases. I have pushed a small commit that fixes this and I now tested much more cases.
Verified that all the old cases still work. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
status update: Im awaiting for @luacmartins to manage to give me the push rights to the fork, so that I can open my PR on the expensify for of qr-code library |
Pinged infra again. Here's the internal issue for reference |
Update on this: What we need is a fork of this package: react-native-qrcode-svg - because this is the one we use in Expensify App 😄 So please take a look at this and I'm waiting on further updates. |
@nathanmetcalf is this ☝️ something that you could help with? creating the fork of correct package? |
8d2412a
to
f1296ae
Compare
I'm sure @shawnborton will have context here, but I thought we only had one with the Expensify logo in the middle? |
For workspaces or #rooms on workspaces, is it possible to use a rounded square instead of a circle for the avatar? Not sure if that will break the QR code functionality, but I like the idea of trying to reuse exactly what's found in the chat report header for these. |
Honestly - a substantial amount of work was put (by me 😅) to make them rounded, and I've been trying to add this functionality since March. I'd prefer to leave it as is. The colors and the initial letter are 100% the same, its just the shape. Technically it would be possible to make them squared, however I would prefer to not add this, at least not in this PR. Right now at least all logos inside qr code have the same shape and size. |
Heh, I do appreciate how much work you've put into this, but do you agree that the rounded workspace avatars in QR codes create an inconsistency with how we display workspace avatars literally everywhere else in the product? I think we should avoid that inconsistency if we can. |
@shawnborton yeah I totally get it. Originally the visual aspect was not specified in the issue at all, and the main job of this PR was to allow us to display SVG Avatars (images) inside the QR code. So when I saw the other cases of avatars inside QR being circle, then I made this one a circle as well. We can definitely change this. That being said, if it's not a problem that for a few days these workspace avatars would be displayed as a circle, then I'd prefer first merging this PR and upgrading how they look in a separate one. |
Cool cool, thanks for understanding. Totally down to change the shape in a follow up PR if you think that approach is best. |
@sobitneupane can you continue with your review please. Let's get this one merged! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking good. Left a few small comments
Also I just wanted to confirm - even though this PR title focuses on svg, do we agree that we always want the avatar found in the chat header to be used in the Share QR Code as well? Just want to make sure we address that, regardless of whether or not it's an svg or an uploaded image. Thanks! |
@shawnborton at least to me this is clear now and I'm happy to continue working on these avatars. However this PR might not handle all the cases the way you want it right now. Even right now in the app we don't have this behaviour correctly for every case. For example an expense thats split between several people will have the "multiple people" avatar in header but expensify logo in ShareCode. |
That works for me - @dylanexpensify since we chatted about this briefly in Slack, do you mind doing the honors of creating the clean issue for this? Otherwise I am happy to do it as well. |
@luacmartins implemented all but 2 of your suggestions, please take a look. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewer Checklist
- I have verified the author checklist is complete (all boxes are checked off).
- I verified the correct issue is linked in the
### Fixed Issues
section above - I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the
Tests
section - I verified the steps for Staging and/or Production testing are in the
QA steps
section - I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I verified the steps for local testing are in the
- I checked that screenshots or videos are included for tests on all platforms
- I included screenshots or videos for tests on all platforms
- I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
- If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
- I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e.
toggleReport
and notonIconClick
). - I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g.
myBool && <MyComponent />
. - I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to
src/languages/*
files and using the translation method - I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in
STYLE.md
) were followed
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e.
- If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
- I verified that this PR follows the guidelines as stated in the Review Guidelines
- I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like
Avatar
, I verified the components usingAvatar
have been tested & I retested again) - I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
- I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
- If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a
/** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to
this
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor) - Any internal methods bound to
this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
) - All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
- If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
- If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e.
StyleUtils.getBackgroundAndBorderStyle(theme.componentBG
)
- If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
- If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like
Avatar
is modified, I verified thatAvatar
is working as expected in all cases) - If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
- If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
- If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added
Design
label and/or tagged@Expensify/design
so the design team can review the changes.
- If a new page is added, I verified it's using the
ScrollView
component to make it scrollable when more elements are added to the page. - If the
main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
@dylanexpensify @shawnborton please tag @Kicu and I when the new issue is created. Thank you! |
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
🚀 Deployed to staging by https://github.com/luacmartins in version: 9.0.10-2 🚀
|
🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.0.10-3 🚀
@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes. |
🚀 Deployed to production by https://github.com/mountiny in version: 9.0.10-7 🚀
|
🚀 Deployed to production by https://github.com/francoisl in version: 9.0.11-5 🚀
|
Details
This PR
is PoC thatuses Expensify fork ofreact-native-qrcode-svg
to display Svg avatars inside generated QR code. The PR that introduces required changes to the library is here: Kicu/react-native-qrcode-svg#1This now correctly handles every QR code Share page in the app.
Native and web recordings provided.
I will provide more recordings soon (these 2 I hope are enough to show that it works).Fixed Issues
$ #27288
PROPOSAL:
react-native-qrcode-svg
library (provided we get ownership of it) to support displaying SVGs (done in my PR in the fork, needs reviewing)Tests
Offline tests
QA Steps
PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)myBool && <MyComponent />
.src/languages/*
files and using the translation methodSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)Design
label and/or tagged@Expensify/design
so the design team can review the changes.ScrollView
component to make it scrollable when more elements are added to the page.main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps.Screenshots/Videos
Android: Native
rec-svg-avtr-final-android.mp4
Android: mWeb Chrome
iOS: Native
rec-svg-avtr-final-ios2.mp4
iOS: mWeb Safari
MacOS: Chrome / Safari
rec-svg-avtr-final-web.mp4
MacOS: Desktop