Skip to content

Commit

Permalink
Merge branch 'main' into issue-11131
Browse files Browse the repository at this point in the history
  • Loading branch information
hassnian authored Nov 21, 2024
2 parents b69f944 + 8d7da62 commit 9a18b0e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions components/navbar/ConnectedProfile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
root-class="!px-2"
label-class="flex gap-[10px] items-center"
aria-label="open profile menu"
data-testid="navbar-connected-profile"
:active="isWalletModalOpen"
@click="$emit('click')"
>
Expand Down
3 changes: 3 additions & 0 deletions libs/ui/src/components/NeoModal/NeoModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
:destroy-on-hide="destroyOnHide"
:can-cancel="canCancel"
:full-screen="fullScreen"
:data-testid="dataTestid"
:content-class="[
...contentClassName,
noShadow ? 'no-shadow' : '',
Expand Down Expand Up @@ -50,6 +51,7 @@ const props = withDefaults(
mobileBreakpoint?: string
appendToBody?: boolean
noOverlap?: boolean
dataTestid?: string
}>(),
{
destroyOnHide: true,
Expand All @@ -62,6 +64,7 @@ const props = withDefaults(
maxHeight: '80vh',
mobileBreakpoint: '768px',
appendToBody: true,
dataTestid: undefined,
},
)
Expand Down
2 changes: 2 additions & 0 deletions tests/e2e/sidebar.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ test('Sidebar Interactions', async ({ page, Commands }) => {
await page.goto(LANDING_PATH)
await test.step('Switches trough sidebars and check if they overlap each other', async () => {
// profile
// wait for profile pill to load
await expect(page.getByTestId('navbar-connected-profile')).toBeVisible({ timeout: 10000 })
await page.getByTestId('navbar-profile-dropdown').click()
await expect(page.getByTestId('sidebar-wallet-container')).toBeVisible()
// cart
Expand Down

0 comments on commit 9a18b0e

Please sign in to comment.