Fix some minor chat issues (#10332)
This commit is contained in:
@@ -28,7 +28,10 @@ export function AvatarBubbles({
|
|||||||
size = 'large',
|
size = 'large',
|
||||||
}: Props) {
|
}: Props) {
|
||||||
const {currentAccount} = useSession()
|
const {currentAccount} = useSession()
|
||||||
const profiles = allProfiles.filter(p => p.did !== currentAccount?.did)
|
const profiles =
|
||||||
|
allProfiles.length > 2
|
||||||
|
? allProfiles.filter(p => p.did !== currentAccount?.did)
|
||||||
|
: allProfiles
|
||||||
const containerSize =
|
const containerSize =
|
||||||
typeof size === 'number'
|
typeof size === 'number'
|
||||||
? size
|
? size
|
||||||
@@ -86,7 +89,7 @@ export function AvatarBubbles({
|
|||||||
let avatars = (
|
let avatars = (
|
||||||
<>
|
<>
|
||||||
<AvatarBubble
|
<AvatarBubble
|
||||||
profile={profiles[0] ?? allProfiles[0]}
|
profile={profiles[0]}
|
||||||
scale={p0}
|
scale={p0}
|
||||||
size={76}
|
size={76}
|
||||||
x={-2}
|
x={-2}
|
||||||
|
|||||||
@@ -168,12 +168,18 @@ let MessageItem = ({
|
|||||||
isInCluster && !effectiveFirstInCluster && !effectiveLastInCluster
|
isInCluster && !effectiveFirstInCluster && !effectiveLastInCluster
|
||||||
|
|
||||||
const hasReactions = message.reactions && message.reactions.length > 0
|
const hasReactions = message.reactions && message.reactions.length > 0
|
||||||
|
const prevHasReactions =
|
||||||
|
prevIsMessage &&
|
||||||
|
prevMessage.reactions != null &&
|
||||||
|
prevMessage.reactions.length > 0
|
||||||
const squaredBottomCorner =
|
const squaredBottomCorner =
|
||||||
!hasReactions &&
|
!hasReactions &&
|
||||||
isInCluster &&
|
isInCluster &&
|
||||||
(isInMiddleOfCluster || effectiveFirstInCluster)
|
(isInMiddleOfCluster || effectiveFirstInCluster)
|
||||||
const squaredTopCorner =
|
const squaredTopCorner =
|
||||||
isInCluster && (isInMiddleOfCluster || effectiveLastInCluster)
|
!prevHasReactions &&
|
||||||
|
isInCluster &&
|
||||||
|
(isInMiddleOfCluster || effectiveLastInCluster)
|
||||||
|
|
||||||
const pendingColor = t.palette.primary_300
|
const pendingColor = t.palette.primary_300
|
||||||
|
|
||||||
|
|||||||
@@ -919,7 +919,6 @@ function SettingsHeader({
|
|||||||
|
|
||||||
function SettingsHeaderPlaceholder() {
|
function SettingsHeaderPlaceholder() {
|
||||||
const t = useTheme()
|
const t = useTheme()
|
||||||
const {t: l} = useLingui()
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={[a.px_xl, a.py_4xl, a.border_b, t.atoms.border_contrast_low]}>
|
<View style={[a.px_xl, a.py_4xl, a.border_b, t.atoms.border_contrast_low]}>
|
||||||
@@ -928,7 +927,7 @@ function SettingsHeaderPlaceholder() {
|
|||||||
</View>
|
</View>
|
||||||
<Text
|
<Text
|
||||||
style={[a.text_2xl, a.font_bold, a.text_center, a.pt_lg, t.atoms.text]}>
|
style={[a.text_2xl, a.font_bold, a.text_center, a.pt_lg, t.atoms.text]}>
|
||||||
{l`…`}
|
…
|
||||||
</Text>
|
</Text>
|
||||||
<Text
|
<Text
|
||||||
style={[
|
style={[
|
||||||
@@ -1015,7 +1014,7 @@ function SettingsButtonPlaceholder() {
|
|||||||
a.pt_xs,
|
a.pt_xs,
|
||||||
t.atoms.text,
|
t.atoms.text,
|
||||||
]}>
|
]}>
|
||||||
{l`…`}
|
…
|
||||||
</Text>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ export function MessageListError({item}: {item: ConvoItem & {type: 'error'}}) {
|
|||||||
{description}
|
{description}
|
||||||
{item.retry && (
|
{item.retry && (
|
||||||
<>
|
<>
|
||||||
|
{' '}
|
||||||
·{' '}
|
·{' '}
|
||||||
<InlineLinkText
|
<InlineLinkText
|
||||||
label={help}
|
label={help}
|
||||||
|
|||||||
Reference in New Issue
Block a user