Compare commits

..

No commits in common. "a73e2ff14bd2bfd46b9dbdcfe33b5bf42edce29b" and "13d0d1ef84d5bfb3acbdff119d6f58e4dc6338c6" have entirely different histories.

View File

@ -1250,10 +1250,7 @@ class _MessageItem extends StatelessWidget {
_isDuplicateCpInviteMessageForConversation(customData)) {
return const SizedBox.shrink();
}
final isCpInviteMessage =
customData != null && _isCpInvitePayload(customData);
final cpRelationFormedCard =
isCpInviteMessage ? null : _cpRelationFormedMessageCard();
final cpRelationFormedCard = _cpRelationFormedMessageCard();
final cpStatusLineText = _cpStatusLineTextForMessage();
return Container(
margin: EdgeInsets.symmetric(horizontal: 15.w, vertical: 8.w),
@ -1307,12 +1304,8 @@ class _MessageItem extends StatelessWidget {
),
child: cpRelationFormedCard,
)
else if (cpStatusLineText == null || isCpInviteMessage)
Padding(
padding: EdgeInsets.only(
top: cpStatusLineText == null ? 0 : 10.w,
),
child: Row(
else if (cpStatusLineText == null)
Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
textDirection:
@ -1327,10 +1320,7 @@ class _MessageItem extends StatelessWidget {
SCNavigatorUtils.push(
context,
replace:
AccountStorage()
.getCurrentUser()
?.userProfile
?.id !=
AccountStorage().getCurrentUser()?.userProfile?.id !=
message.sender,
"${SCMainRoute.person}?isMe=${AccountStorage().getCurrentUser()?.userProfile?.id == message.sender}&tageId=${message.sender}",
);
@ -1386,7 +1376,6 @@ class _MessageItem extends StatelessWidget {
Spacer(),
],
),
),
],
),
);