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

fixed tabs view and added types at required places #8875

Closed

Conversation

nithish1018
Copy link
Contributor

Proposed Changes

This is how it looks now:

image

@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

@nithish1018 nithish1018 requested a review from a team as a code owner October 22, 2024 11:00
Copy link

netlify bot commented Oct 22, 2024

Deploy Preview for care-ohc ready!

Name Link
🔨 Latest commit 05386a6
🔍 Latest deploy log https://app.netlify.com/sites/care-ohc/deploys/6718da05590c080008f82aaf
😎 Deploy Preview https://deploy-preview-8875--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.

@nihal467
Copy link
Member

LGTM

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

👋 Hi, @nithish1018,
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.

@rithviknishad
Copy link
Member

rithviknishad commented Oct 23, 2024

@nithish1018 To clear conflicts and merge latest develop to PR branch cleanly:

Pre-requisite: Ensure you have ohcnetwork in remotes (check using git remote -v)

git remote add upstream https://github.com/ohcnetwork/care_fe.git

and then merge ohcnetwork's remote develop branch into your PR branch:

git merge upstream develop

Merge will be paused due to conflicts. Clear the conflicts from your editor and commit the merge commit.

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.

Active and Archive Tabs are not properly visible in Shifting Page
4 participants