breaking things

lib/cwtch/cwtchNotifier.dart

@@ -30,8 +30,8 @@ class CwtchNotifier {
         break;
       case "PeerCreated":
         profileCN.getProfile(data["ProfileOnion"]).contactList.add(ContactInfoState(
-              profileOnion: data["ProfileOnion"],
-              onion: data["RemotePeer"],
+              data["ProfileOnion"],
+              data["RemotePeer"],
               nickname: data["nick"],
               status: data["status"],
               imagePath: data["picture"],
@@ -98,7 +98,8 @@ class CwtchNotifier {
         // TODO Add Group Dynamically
         dynamic groupInvite = jsonDecode(data["GroupInvite"]);
         profileCN.getProfile(data["ProfileOnion"]).contactList.add(ContactInfoState(
-            onion: groupInvite["GroupID"],
+            "",
+            groupInvite["GroupID"],
             isInvitation: true,
             imagePath: data["PicturePath"],
             nickname:  groupInvite["GroupName"],

lib/model.dart

@@ -142,8 +142,8 @@ class ProfileInfoState extends ChangeNotifier {
       List<dynamic> contacts = jsonDecode(contactsJson);
       this._contacts.addAll(contacts.map((contact) {
         return ContactInfoState(
-            profileOnion: this.onion,
-            onion: contact["onion"],
+            this.onion,
+            contact["onion"],
             nickname: contact["name"],
             status: contact["status"],
             imagePath: contact["picture"],
@@ -231,9 +231,9 @@ class ContactInfoState extends ChangeNotifier {
   bool _isGroup;
   String _server;
 
-  ContactInfoState({
+  ContactInfoState(
     this.profileOnion,
-    this.onion,
+    this.onion,{
     nickname = "",
     isGroup = false,
     isInvitation = false,

lib/widgets/messagebubble.dart

@@ -52,20 +52,20 @@ class _MessageBubbleState extends State<MessageBubble> {
                 textAlign: TextAlign.left,
                 textWidthBasis: TextWidthBasis.longestLine,
               ),
-              // Row(
-              //   children: [
+              Align(alignment: fromMe ? Alignment.bottomLeft : Alignment.bottomRight,child: Row(
+                 children: [
                   Text(prettyDate,
                       style: TextStyle(
                         fontSize: 9.0,
                         color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor(),
                       ),
                       textAlign: fromMe ? TextAlign.right : TextAlign.left),
-              //     Provider.of<MessageState>(context).ackd
-              //         ? Icon(Icons.check_circle_outline, color: Provider.of<Settings>(context).theme.messageFromMeTextColor(), size: 12)
-              //         : Icon(Icons.hourglass_bottom_outlined, color: Provider.of<Settings>(context).theme.messageFromMeTextColor(), size: 12)
-              //   ],
-              // )
-            ])),
+                  Provider.of<MessageState>(context).ackd
+                      ? Icon(Icons.check_circle_outline, color: Provider.of<Settings>(context).theme.messageFromMeTextColor(), size: 12)
+                      : Icon(Icons.hourglass_bottom_outlined, color: Provider.of<Settings>(context).theme.messageFromMeTextColor(), size: 12)
+                ],
+              )
+              )])),
       ));
     });
   }

lib/widgets/messagelist.dart

@@ -34,7 +34,7 @@ class _MessageListState extends State<MessageList> {
         });
       }
     } else {
-      setState(() => null);
+      //setState(() => null);
     }
   }