Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
RulaKhaled committed May 7, 2024
1 parent 35962c7 commit 77afa48
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ describe('ActivationBanner', () => {
/ActivationRequiredBanner/
)
expect(ActivationRequiredBanner).toBeInTheDocument()
})

it('renders seats limit reached banner if user has no seats left and on free plan', async () => {
setup(true, 'ONGOING', 'users-basic', false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ function ActivationBanner() {

if (!seatsLimitReached && !isFreePlanValue) {
return <ActivationRequiredBanner />
}

if (seatsLimitReached && isFreePlanValue) {
return <FreePlanSeatsLimitBanner />
Expand Down

0 comments on commit 77afa48

Please sign in to comment.