From 70eb160abc67c830216788771763db81a3081a84 Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Tue, 22 Feb 2022 11:09:44 -0800
Subject: [PATCH] Add Message Status Widget to File Bubble

Also fix bug in peer settings
---
 lib/views/peersettingsview.dart | 2 +-
 lib/widgets/filebubble.dart     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/views/peersettingsview.dart b/lib/views/peersettingsview.dart
index 5164cab3..ce311f9a 100644
--- a/lib/views/peersettingsview.dart
+++ b/lib/views/peersettingsview.dart
@@ -57,7 +57,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
       return LayoutBuilder(builder: (BuildContext context, BoxConstraints viewportConstraints) {
         String? acnCircuit = Provider.of<ContactInfoState>(context).acnCircuit;
 
-        Widget path = Text(Provider.of<ContactInfoState>(context, listen: false).status);
+        Widget path = Text(Provider.of<ContactInfoState>(context).status);
 
         if (acnCircuit != null) {
           var hops = acnCircuit.split(",");
diff --git a/lib/widgets/filebubble.dart b/lib/widgets/filebubble.dart
index 4d91de6d..a091c2e5 100644
--- a/lib/widgets/filebubble.dart
+++ b/lib/widgets/filebubble.dart
@@ -80,6 +80,8 @@ class FileBubbleState extends State<FileBubble> {
     var downloadActive = Provider.of<ProfileInfoState>(context).downloadActive(widget.fileKey());
     var downloadGotManifest = Provider.of<ProfileInfoState>(context).downloadGotManifest(widget.fileKey());
 
+    var messageStatusWidget = MessageBubbleDecoration(ackd: metadata.ackd, errored: metadata.error, prettyDate: prettyDate, fromMe: fromMe);
+
     // If the sender is not us, then we want to give them a nickname...
     var senderDisplayStr = "";
     var senderIsContact = false;
@@ -195,7 +197,7 @@ class FileBubbleState extends State<FileBubble> {
                 crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
                 mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
                 mainAxisSize: MainAxisSize.min,
-                children: [wdgSender, isPreview ? Container() : wdgMessage, wdgDecorations]),
+                children: [wdgSender, isPreview ? Container() : wdgMessage, wdgDecorations, messageStatusWidget]),
           ));
     });
   }