chore: merge latest changes

Signed-off-by: xsahil03x <[email protected]>

packages/stream_chat_flutter/lib/src/message_actions_modal/message_actions_modal.dart

@@ -19,6 +19,7 @@ class MessageActionsModal extends StatefulWidget {
     this.showDeleteMessage = true,
     this.showEditMessage = true,
     this.onReplyTap,
+    this.onConfirmDeleteTap,
     this.onThreadReplyTap,
     this.showCopyMessage = true,
     this.showReplyMessage = true,
@@ -44,6 +45,9 @@ class MessageActionsModal extends StatefulWidget {
   /// The action to perform when "reply" is tapped
   final OnMessageTap? onReplyTap;
 
+  /// The action to perform when delete confirmation button is tapped.
+  final Future<void> Function(Message)? onConfirmDeleteTap;
+
   /// Message in focus for actions
   final Message message;
 
@@ -359,7 +363,12 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
     if (answer == true) {
       try {
         Navigator.of(context).pop();
-        await StreamChannel.of(context).channel.deleteMessage(widget.message);
+        final onConfirmDeleteTap = widget.onConfirmDeleteTap;
+        if (onConfirmDeleteTap != null) {
+          await onConfirmDeleteTap(widget.message);
+        } else {
+          await StreamChannel.of(context).channel.deleteMessage(widget.message);
+        }
       } catch (err) {
         _showErrorAlertBottomSheet();
       }

packages/stream_chat_flutter/lib/src/message_actions_modal/resend_message_button.dart

@@ -27,12 +27,7 @@ class ResendMessageButton extends StatelessWidget {
     return InkWell(
       onTap: () {
         Navigator.of(context).pop();
-        message.state.whenOrNull(failed: (state, error) {
-          state.whenOrNull(
-            sendingFailed: () => channel.sendMessage(message),
-            updatingFailed: () => channel.updateMessage(message),
-          );
-        });
+        channel.retryMessage(message);
       },
       child: Padding(
         padding: const EdgeInsets.symmetric(vertical: 11, horizontal: 16),