emoji [nfc]: Make popularEmojiCandidates non-static

Author: chrisbobbe

lib/model/emoji.dart

@@ -115,11 +115,7 @@ mixin EmojiStore {
   ///
   /// See description in the web code:
   ///   https://github.com/zulip/zulip/blob/83a121c7e/web/shared/src/typeahead.ts#L3-L21
-  // Someday this list may start varying rather than being hard-coded,
-  // and then this will become a non-static member on EmojiStore.
-  // For now, though, the fact it's constant is convenient when writing
-  // tests of the logic that uses this data; so we guarantee it in the API.
-  static Iterable<EmojiCandidate> get popularEmojiCandidates {
+  Iterable<EmojiCandidate> get popularEmojiCandidates {
     return EmojiStoreImpl._popularCandidates;
   }
 
@@ -320,7 +316,7 @@ class EmojiStoreImpl extends PerAccountStoreBase with EmojiStore {
 
     // Include the "popular" emoji, in their canonical order
     // relative to each other.
-    results.addAll(EmojiStore.popularEmojiCandidates);
+    results.addAll(popularEmojiCandidates);
 
     final namesOverridden = {
       for (final emoji in activeRealmEmoji) emoji.name,

lib/widgets/action_sheet.dart

@@ -665,11 +665,12 @@ class ReactionButtons extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    assert(EmojiStore.popularEmojiCandidates.every(
+    final store = PerAccountStoreWidget.of(pageContext);
+    final popularEmojiCandidates = store.popularEmojiCandidates;
+    assert(popularEmojiCandidates.every(
       (emoji) => emoji.emojiType == ReactionType.unicodeEmoji));
 
     final zulipLocalizations = ZulipLocalizations.of(context);
-    final store = PerAccountStoreWidget.of(pageContext);
     final designVariables = DesignVariables.of(context);
 
     bool hasSelfVote(EmojiCandidate emoji) {
@@ -685,7 +686,7 @@ class ReactionButtons extends StatelessWidget {
         color: designVariables.contextMenuItemBg.withFadedAlpha(0.12)),
       child: Row(children: [
         Flexible(child: Row(spacing: 1, children: List.unmodifiable(
-          EmojiStore.popularEmojiCandidates.mapIndexed((index, emoji) =>
+          popularEmojiCandidates.mapIndexed((index, emoji) =>
             _buildButton(
               context: context,
               emoji: emoji,

test/model/emoji_test.dart

@@ -78,7 +78,7 @@ void main() {
     });
   });
 
-  final popularCandidates = EmojiStore.popularEmojiCandidates;
+  final popularCandidates = eg.store().popularEmojiCandidates;
 
   Condition<Object?> isUnicodeCandidate(String? emojiCode, List<String>? names) {
     return (it_) {

test/widgets/action_sheet_test.dart

@@ -810,7 +810,7 @@ void main() {
 
   group('message action sheet', () {
     group('ReactionButtons', () {
-      final popularCandidates = EmojiStore.popularEmojiCandidates;
+      final popularCandidates = eg.store().popularEmojiCandidates;
 
       for (final emoji in popularCandidates) {
         final emojiDisplay = emoji.emojiDisplay as UnicodeEmojiDisplay;

test/widgets/emoji_reaction_test.dart

@@ -299,7 +299,7 @@ void main() {
   // - Non-animated image emoji is selected when intended
 
   group('EmojiPicker', () {
-    final popularCandidates = EmojiStore.popularEmojiCandidates;
+    final popularCandidates = eg.store().popularEmojiCandidates;
 
     Future<void> setupEmojiPicker(WidgetTester tester, {
       required StreamMessage message,