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.

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

fix: added tooltips for Discussion Notes icons (#8618) #8637

Open
wants to merge 31 commits into
base: develop
Choose a base branch
from

Conversation

syedfardeenjeelani
Copy link
Contributor

@syedfardeenjeelani syedfardeenjeelani commented Sep 26, 2024

Proposed Changes

Demo Video

icons.1.mp4

@ohcnetwork/care-fe-code-reviewers

Merge Checklist

  • Add specs that demonstrate bug / test a new feature.
  • Update product documentation.
  • Ensure that UI text is kept in I18n files.
  • Prep screenshot or demo video for changelog entry, and attach it to issue.
  • Request for Peer Reviews.
  • Completion of QA.

@syedfardeenjeelani syedfardeenjeelani requested a review from a team as a code owner September 26, 2024 11:34
Copy link

netlify bot commented Sep 26, 2024

Deploy Preview for care-ohc ready!

Name Link
🔨 Latest commit 3c8ac9e
🔍 Latest deploy log https://app.netlify.com/sites/care-ohc/deploys/670fb2bd7841da00085cc549
😎 Deploy Preview https://deploy-preview-8637--care-ohc.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Member

@rithviknishad rithviknishad left a comment

Choose a reason for hiding this comment

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

LGTM, but do keep the representable texts in i18n locale files and use useTranslations as mentioned in the PR merge checklist

Comment on lines 79 to 82
"open_in_full_window": "Open in full window",
"minimize_screen":"Minimize",
"close_screen":"Close",
"send_message":"Send"
Copy link
Member

@rithviknishad rithviknishad Sep 26, 2024

Choose a reason for hiding this comment

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

Let's keep it in Common.json as these texts by themselves are generic although maybe used in Consultation and/or anywhere else.

src/Locale/en/Asset.json Outdated Show resolved Hide resolved
@nihal467
Copy link
Member

LGTM

@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Sep 30, 2024
Copy link

👋 Hi, @syedfardeenjeelani,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.


This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

Copy link
Member

@bodhish bodhish left a comment

Choose a reason for hiding this comment

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

src/Components/Common/components/Page.tsx Outdated Show resolved Hide resolved
@rithviknishad rithviknishad added hacktoberfest-accepted and removed merge conflict pull requests with merge conflict labels Oct 1, 2024
@@ -231,6 +231,11 @@
"SORT_OPTIONS__-name": "Patient name Z-A",
"SORT_OPTIONS__bed__name": "Bed No. 1-N",
"SORT_OPTIONS__-bed__name": "Bed No. N-1",
"open_in_full_window": "Open in full window",
Copy link
Member

Choose a reason for hiding this comment

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

I think Fullscreen is better 🤔

"open_in_full_window": "Open in full window",
"minimize_screen":"Minimize",
"close_screen":"Close",
"send_discussion_message":"Send",
Copy link
Member

Choose a reason for hiding this comment

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

Can't this be just Send? 🤔 Same for the others as its added to the common.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Can't this be just Send? 🤔 Same for the others as its added to the common.

please review the changes @bodhish

@rithviknishad
Copy link
Member

Sync your fork's develop branch with latest develop, and merge develop to your PR branch. And while resolving conflicts, move the newly added keys to en.json file and delete the Common.json

@rithviknishad rithviknishad removed changes required merge conflict pull requests with merge conflict labels Oct 13, 2024
Copy link
Member

@rithviknishad rithviknishad left a comment

Choose a reason for hiding this comment

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

Ensure prettier is configured and used properly.

src/Locale/en.json Outdated Show resolved Hide resolved
@nihal467
Copy link
Member

LGTM

Copy link

👋 Hi, @syedfardeenjeelani,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.


This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Oct 16, 2024
@github-actions github-actions bot removed the merge conflict pull requests with merge conflict label Oct 16, 2024
Copy link

👋 Hi, @syedfardeenjeelani,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.


This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Oct 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge conflict pull requests with merge conflict needs review tested
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add tooltip for Discussion Notes Icons
5 participants