Merge branch 'feature/new-ui' of github.com:GetStream/stream-chat-flutter into feature/theme

Conflicts: lib/src/message_widget.dart lib/src/sending_indicator.dart
2020-12-31 16:35:56 +05:30
parent f011bf32fc d9abd35100
commit 6e35bb2f7e
7 changed files with 169 additions and 151 deletions
@@ -110,14 +110,16 @@ class MessageReactionsModal extends StatelessWidget {
                                translateUserAvatar: false,
                                showSendingIndicator: DisplayWidget.gone,
                                shape: messageShape,
-                                showReactionPickerIndicator: true,
+                                showInChannelIndicator: false,
+                                showReactionPickerIndicator: showReactions &&
+                                    (message.status ==
+                                            MessageSendingStatus.SENT ||
+                                        message.status == null),
                              ),
                            ),
                          );
                        }),
-                    SizedBox(
-                      height: 16,
-                    ),
+                    SizedBox(height: 8),
                    if (message.latestReactions?.isNotEmpty == true)
                      _buildReactionCard(context),
                  ],