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

[FIX] Resolve tab bar merge conflicts #5809

Merged
merged 5 commits into from
Feb 23, 2023
Merged

[FIX] Resolve tab bar merge conflicts #5809

merged 5 commits into from
Feb 23, 2023

Conversation

Cal-L
Copy link
Contributor

@Cal-L Cal-L commented Feb 21, 2023

Development & PR Process

  1. Follow MetaMask Mobile Coding Standards
  2. Add release-xx label to identify the PR slated for a upcoming release (will be used in release discussion)
  3. Add needs-dev-review label when work is completed
  4. Add needs-qa label when dev review is completed
  5. Add QA Passed label when QA has signed off

Description

Revert #5800 and reintroduce correct types to TabBar component. Also introduce better typing.

@Cal-L Cal-L requested a review from a team as a code owner February 21, 2023 21:40
@github-actions
Copy link
Contributor

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

@Cal-L Cal-L changed the title Fix/resolve tab bar merge conflicts [FIX] Resolve tab bar merge conflicts Feb 21, 2023
@Cal-L Cal-L added needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) Spot Check on the Release Build If a ticket doesn't require feature QA, but does require some form of manual spot checking release-6.1.0 labels Feb 21, 2023
@sethkfman sethkfman removed the needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) label Feb 22, 2023
@Cal-L Cal-L merged commit cd02e01 into main Feb 23, 2023
@Cal-L Cal-L deleted the fix/resolve-tab-bar-merge-conflicts branch February 23, 2023 01:15
@github-actions github-actions bot locked and limited conversation to collaborators Feb 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@blackdevelopa blackdevelopa blackdevelopa approved these changes

Assignees
No one assigned
Labels
release-6.1.0 Spot Check on the Release Build If a ticket doesn't require feature QA, but does require some form of manual spot checking
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Cal-L @blackdevelopa @sethkfman