Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 5 additions & 20 deletions tests/e2e/web/specs/signIn.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,7 @@ test.describe('when given valid input', () => {
await app.people.verifyProfileCount(totalProfiles)
})

test('show profiles with the correct education level', async ({
app,
signedInAccount,
}) => {
test('show profiles with the correct education level', async ({app, signedInAccount}) => {
await app.home.clickPeopleLink()

const totalProfiles = await app.people.profileCountLocator.textContent()
Expand All @@ -107,10 +104,7 @@ test.describe('when given valid input', () => {
await app.people.verifyProfileCount(totalProfiles)
})

test('show profiles with the correct smoking preference', async ({
app,
signedInAccount,
}) => {
test('show profiles with the correct smoking preference', async ({app, signedInAccount}) => {
await app.home.clickPeopleLink()

const totalProfiles = await app.people.profileCountLocator.textContent()
Expand All @@ -133,10 +127,7 @@ test.describe('when given valid input', () => {
await app.people.verifyProfileCount(totalProfiles)
})

test('show profiles with the correct cannabis preference', async ({
app,
signedInAccount,
}) => {
test('show profiles with the correct cannabis preference', async ({app, signedInAccount}) => {
await app.home.clickPeopleLink()

const totalProfiles = await app.people.profileCountLocator.textContent()
Expand All @@ -148,10 +139,7 @@ test.describe('when given valid input', () => {
await app.people.verifyProfileCount(totalProfiles)
})

test('show profiles with the correct political preference', async ({
app,
signedInAccount,
}) => {
test('show profiles with the correct political preference', async ({app, signedInAccount}) => {
await app.home.clickPeopleLink()

const totalProfiles = await app.people.profileCountLocator.textContent()
Expand All @@ -161,10 +149,7 @@ test.describe('when given valid input', () => {
await app.people.verifyProfileCount(totalProfiles)
})

test('show profiles with the correct religion preference', async ({
app,
signedInAccount,
}) => {
test('show profiles with the correct religion preference', async ({app, signedInAccount}) => {
await app.home.clickPeopleLink()

const totalProfiles = await app.people.profileCountLocator.textContent()
Expand Down
9 changes: 6 additions & 3 deletions web/pages/messages/[channelId].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ import {useTextEditor} from 'web/components/widgets/editor'
import {CompassLoadingIndicator} from 'web/components/widgets/loading-indicator'
import {BannedBadge, UserAvatarAndBadge} from 'web/components/widgets/user-link'
import {useIsMobile} from 'web/hooks/use-is-mobile'
import {usePrivateMessages, useSortedPrivateMessageMemberships,} from 'web/hooks/use-private-messages'
import {
usePrivateMessages,
useSortedPrivateMessageMemberships,
} from 'web/hooks/use-private-messages'
import {useRedirectIfSignedOut} from 'web/hooks/use-redirect-if-signed-out'
import {useUser} from 'web/hooks/use-user'
import {useUsersInStore} from 'web/hooks/use-user-supabase'
Expand Down Expand Up @@ -272,7 +275,7 @@ export const PrivateChat = (props: {
avatars={members}
onClick={() => setShowUsers(true)}
/>
) : (
) : otherUsers === undefined ? null : (
<Avatar size="sm" username="?" noLink />
)}
{members && members.length > 0 ? (
Expand All @@ -295,7 +298,7 @@ export const PrivateChat = (props: {
.join(', ')}
{members.length > 2 && ` & ${members.length - 2} more`}
</span>
) : (
) : otherUsers === undefined ? null : (
<span className={'ml-1 italic text-ink-500 text-sm'}>
{t('messages.deleted_user', 'Deleted user')}
</span>
Expand Down
Loading