From aba0f3c3c9f1497ce30a1bd6ef7922a0db2488d2 Mon Sep 17 00:00:00 2001
From: Shir Serlui <70711723+shirser121@users.noreply.github.com>
Date: Mon, 15 Aug 2022 18:53:28 +0300
Subject: [PATCH] Fix buttons sending (#1655)

* Fix buttons sending

* Quick reply id must be a string

* Update src/util/Injected.js

* Update src/structures/Buttons.js

Co-authored-by: Rajeh Taher <rajeh@reforward.dev>
---
 src/structures/Buttons.js |  2 +-
 src/util/Injected.js      | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/structures/Buttons.js b/src/structures/Buttons.js
index e35e609..567240b 100644
--- a/src/structures/Buttons.js
+++ b/src/structures/Buttons.js
@@ -98,7 +98,7 @@ class Buttons {
                     index,
                     quickReplyButton: {
                         displayText: button.body, 
-                        id: button.id || index
+                        id: button.id || `${index}`
                     }
                 };
             }
diff --git a/src/util/Injected.js b/src/util/Injected.js
index 2ce9fec..cc44f0b 100644
--- a/src/util/Injected.js
+++ b/src/util/Injected.js
@@ -222,6 +222,14 @@ exports.ExposeStore = (moduleRaidStr) => {
             };
             delete proto.templateMessage;
         }
+        if (proto.buttonsMessage) {
+            proto.viewOnceMessage = {
+                message: {
+                    buttonsMessage: proto.buttonsMessage,
+                },
+            };
+            delete proto.buttonsMessage;
+        }
         if (proto.listMessage) {
             proto.viewOnceMessage = {
                 message: {
@@ -348,7 +356,6 @@ exports.LoadUtils = () => {
 
     window.WWebJS.prepareMessageButtons = (buttonsOptions) => {
         const returnObject = {};
-
         if (!buttonsOptions.buttons) {
             return returnObject;
         }
@@ -397,7 +404,7 @@ exports.LoadUtils = () => {
             returnObject.isDynamicReplyButtonsMsg = true;
 
             returnObject.dynamicReplyButtons = buttonsOptions.buttons.map((button, index) => ({
-                buttonId: button.index || `${index}`,
+                buttonId: button.quickReplyButton.id.toString() || `${index}`,
                 buttonText: {displayText: button.quickReplyButton?.displayText},
                 type: 1,
             }));