Merge pull request #313 from hypha-dao/chore/implement-dao-and-creato…

…r-image refactor: remove Json keys and add creator and voter names to placeholder display
hypha-dao · Sep 23, 2024 · 4a4cab5 · 4a4cab5
2 parents 4b3a15e + 5e13338
commit 4a4cab5
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/lib/core/network/models/base_proposal_model.dart b/lib/core/network/models/base_proposal_model.dart
@@ -8,7 +8,6 @@ abstract class BaseProposalModel {
   @JsonKey(name: 'docId')
   final String id;
 
-  @JsonKey(name: 'dao')
   DaoData? dao;
 
   @JsonKey(name: 'details_timeShareX100_i')
@@ -26,7 +25,6 @@ abstract class BaseProposalModel {
   @JsonKey(name: 'ballot_expiration_t')
   final DateTime? expiration;
 
-  @JsonKey(name: 'creator')
   ProfileData? creator;
 
   @JsonKey(name: 'vote')

diff --git a/lib/design/avatar_image/hypha_avatar_image.dart b/lib/design/avatar_image/hypha_avatar_image.dart
@@ -53,7 +53,6 @@ class HyphaAvatarImage extends StatelessWidget {
     } else if (name != null) {
       image = _buildFallbackAvatar(context);
     } else {
-      // TODO(Zied): change the icon
       image = Icon(HyphaIcons.image, size: imageRadius, color: context.textTheme.titleSmall?.color);
     }
 

diff --git a/lib/ui/proposals/components/proposal_creator.dart b/lib/ui/proposals/components/proposal_creator.dart
@@ -15,6 +15,7 @@ class ProposalCreator extends StatelessWidget {
         HyphaAvatarImage(
           imageRadius: 24,
           imageFromUrl: creator?.avatarUrl,
+          name: creator?.name,
         ),
         const SizedBox(width: 10),
         Expanded(

diff --git a/lib/ui/proposals/details/components/proposal_voters.dart b/lib/ui/proposals/details/components/proposal_voters.dart
@@ -47,6 +47,7 @@ class ProposalVoters extends StatelessWidget {
                   : HyphaAvatarImage(
                       imageRadius: 24,
                       imageFromUrl: votes[index].voterImageUrl,
+                      name: votes[index].voter,
                     ),
             );
           },