Merge branch 'master' into feature/new-ui

2020-10-12 15:00:08 +02:00
parent 9ff4c156f5 10dfbbde9c
commit 2780936de3
28 changed files with 538 additions and 93 deletions
@@ -35,7 +35,7 @@ class ReactionPicker extends StatelessWidget {
        mainAxisAlignment: MainAxisAlignment.center,
        mainAxisSize: MainAxisSize.min,
        children: reactionAssets.map((reactionAsset) {
-          final ownReactionIndex = message.ownReactions?.indexWhere(
+          final ownReactionIndex = message.latestReactions?.indexWhere(
                  (reaction) => reaction.type == reactionAsset.type) ??
              -1;
          return IconButton(