ok

src/components/Modal.js

@@ -63,14 +63,10 @@ const Modal = ({ user, shop, isOpen, onClose, modalContent, deviceType, setModal
     onClose(); // Close the modal
   };
 
-  const handleYes = (event) => {
-    if(onModalYesFunction) 
-      onModalYesFunction();
-    onClose(); // Close the modal
-  }
-
   const handleNo = (event) => {
-    if(onModalCloseFunction) onModalCloseFunction();
+    if(onModalCloseFunction) 
+      onModalCloseFunction();
+    onClose();
   }
 
   // Function to handle clicks on the modal content
@@ -133,7 +129,7 @@ const Modal = ({ user, shop, isOpen, onClose, modalContent, deviceType, setModal
         {modalContent === "join" && <Join setModal={setModal} />}
         {modalContent === "claim-coupon" && <Join setModal={setModal} />}
         {modalContent === "loading" && <Loading setModal={setModal} />}
-        {modalContent === "message" && <Message handleYes={handleYes}/>}
+        {modalContent === "message" && <Message handleYes={onModalYesFunction} handleNo={handleNo}/>}
         {modalContent === "player-prompt" && <PlayerPrompt cafeId={shop.cafeId} setModal={setModal} handleClose={handleOverlayClick} welcomePageConfig={shop.welcomePageConfig}/>}
       </div>
     </div>

src/components/MusicPlayer.js

@@ -108,7 +108,7 @@ export function MusicPlayer({ socket, shopId, user, shopOwnerId, isSpotifyNeedLo
           //   setSubtitleColor("white");
           //   setSubtitleBG("black");
           // }
-          const proxiedUrl = `https://dev.api.kedaimaster.com/image?url=${encodeURIComponent(modifyUrl(imageUrl))}`;  // Use your proxy to fetch the image
+          const proxiedUrl = `https://api.kedaimaster.com/image?url=${encodeURIComponent(modifyUrl(imageUrl))}`;  // Use your proxy to fetch the image
 
           setBackgroundImage(proxiedUrl);
         } catch (error) {