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

Merge Develop to Staging v24.30.0 #8171

Merged
merged 12 commits into from
Jul 17, 2024
Merged

Merge Develop to Staging v24.30.0 #8171

merged 12 commits into from
Jul 17, 2024

Conversation

nihal467
Copy link
Member

Proposed Changes

  • Fixes #issue_number
  • Change 1
  • Change 2
  • More?

@coronasafe/care-fe-code-reviewers @coronasafe/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

rithviknishad and others added 4 commits July 16, 2024 18:15
@rithviknishad
Replace usages of gray color shade with secondary (alias of gray) for…
465f8e0 
… consistency and maintainability (#8138)

* Replace usages of `gray` shade with `secondary` shade

* remove irrelavant comment from tailwind config
@rithviknishad
Refactor rendering of array of strings to utilise humanizeStrings u…
4e32402 
…tility method (#8128)

* Refactor rendering of array of strings to utilise `humanizeStrings` utility method

* handle empty arrays gracefully
@rithviknishad
Update meta description; fixes #8091 (#8141)
bd3b95c
@nihal467
fix the icon size (#8159)
5bcef50
@nihal467 nihal467 requested a review from a team as a code owner July 17, 2024 10:50
@vercel Vercel
Copy link

vercel bot commented Jul 17, 2024 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
care-storybook ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jul 17, 2024 5:01pm

@netlify Netlify
Copy link

netlify bot commented Jul 17, 2024 •
edited
Loading

✅ Deploy Preview for care-egov-staging ready!

Name Link
🔨 Latest commit 629ae0f
🔍 Latest deploy log https://app.netlify.com/sites/care-egov-staging/deploys/6697f8da44bb760008ef6f86
😎 Deploy Preview https://deploy-preview-8171--care-egov-staging.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.

@cypress Cypress
Copy link

cypress bot commented Jul 17, 2024 •
edited
Loading

Passing run #2894 ↗︎

0 126 0 0 Flakiness 0

Details:

Merge Develop to Staging v24.30.0
Project: CARE Commit: f3151935cd
Status: Passed Duration: 03:06 💡
Started: Jul 17, 2024 2:34 PM Ended: Jul 17, 2024 2:38 PM

Review all test suite changes for PR #8171 ↗︎

@rithviknishad
Show medicine's generic in prescriptions table and details card (#8137)
7264652 
* fixes #8135; show medicine generic in prescriptions table

* show generic and brand in prescription details card

* fix cypress
@rithviknishad
Improve visual feedback when filters are applied in CNS and Live Feed…
a990d8d 
… page (#8156)

* Update CNS Setting and Filters

* Update live monitoring settings and filters

* fix checks for button state
@shivankacker
Added consent indicators and filters (#8003)
261255b 
* Added consent indicators and filters

* fix info card

* string change

* fixed

* made alert filter sensitive

* type changes

* minor fix

* uopdates
@rithviknishad
Fix usages of gray shade that had spelling mistake with grey (#8167)
df8817d 
* Fix usages of gray shade that had spelling mistake with grey

* fix colors

* fix colors

* fixes 8169; adds missing gray color

* disable prettier on eslint
@khavinshankar @rithviknishad @nihal467
Block expired patients from being transfered (#8123)
629ae0f 
Co-authored-by: Rithvik Nishad <[email protected]>
Co-authored-by: Mohammed Nihal <[email protected]>
@gigincg gigincg merged commit 7d941ce into staging Jul 17, 2024
14 of 16 checks passed
@github-actions GitHub Actions
Copy link

@nihal467 Your efforts have helped advance digital healthcare and TeleICU systems. 🚀 Thank you for taking the time out to make CARE better. We hope you continue to innovate and contribute; your impact is immense! 🙌

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nihal467 @gigincg @rithviknishad @shivankacker @khavinshankar