show preview and correct style for replies

Author: Allie Crevier

securedrop_client/gui/widgets.py

@@ -844,7 +844,6 @@ def setup(self, controller):
         # Handle source related messages.
         self.controller.message_ready.connect(self.set_snippet)
         self.controller.reply_ready.connect(self.set_snippet)
-        self.controller.reply_succeeded.connect(self.set_snippet)
         self.controller.file_ready.connect(self.set_snippet)
 
     def update(self, sources: List[Source]):
@@ -1765,16 +1764,17 @@ def _set_reply_state(self, status: str) -> None:
         elif status == 'PENDING':
             self.setStyleSheet(self.CSS_REPLY_PENDING)
 
-    @pyqtSlot(str)
-    def _on_reply_success(self, message_id: str) -> None:
+    @pyqtSlot(str, str)
+    def _on_reply_success(self, message_id: str, new_reply_id: str) -> None:
         """
         Conditionally update this ReplyWidget's state if and only if the message_id of the emitted
         signal matches the message_id of this widget.
         """
         if message_id == self.message_id:
-            logger.debug('Message {} succeeded'.format(message_id))
+            self.message_id = new_reply_id
             self._set_reply_state('SUCCEEDED')
 
+
     @pyqtSlot(str)
     def _on_reply_failure(self, message_id: str) -> None:
         """

securedrop_client/logic.py

@@ -101,10 +101,10 @@ class Controller(QObject):
     sync_events = pyqtSignal(str)
 
     """
-    Signal that notifies that a reply was accepted by the server. Emits the reply's
-    UUID and content as a string.
+    Signal that notifies that a reply was accepted by the server. Emits the reply's draft UUID and
+    UUID as a string.
     """
-    reply_succeeded = pyqtSignal([str, str, str])
+    reply_succeeded = pyqtSignal([str, str])
 
     """
     Signal that notifies that a reply failed to be accepted by the server. Emits the reply's UUID
@@ -782,7 +782,8 @@ def on_reply_success(self, reply_uuid: str) -> None:
         self.gui.clear_error_status()  # remove any permanent error status message
         self.session.commit()
         reply = storage.get_reply(self.session, reply_uuid)
-        self.reply_succeeded.emit(reply.source.uuid, reply_uuid, reply.content)
+        self.reply_succeeded.emit(reply_uuid, reply.uuid)
+        self.reply_ready.emit(reply.source.uuid, reply.uuid, reply.content)
 
     def on_reply_failure(
         self,