From fafd459498b07b2f9098ad5fcf05b5495bd95f9f Mon Sep 17 00:00:00 2001
From: Benyamin <Koorosh.azimi1@gmail.com>
Date: Sat, 3 Aug 2024 16:28:15 +0330
Subject: [PATCH 1/2] Fix WSOD

---
 public/assets/locales/en/translation.json                     | 2 +-
 src/components/AccordionBox/AccordionBox.js                   | 4 ++--
 .../SubMenu/components/MarketSubMenu/MarketSubMenu.js         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/assets/locales/en/translation.json b/public/assets/locales/en/translation.json
index 64dcf069..70ce4e9f 100644
--- a/public/assets/locales/en/translation.json
+++ b/public/assets/locales/en/translation.json
@@ -28,7 +28,7 @@
   "nextStep": "Next Step",
   "prevStep": "Prev Step",
   "next": "next",
-  "all": "all",
+  "all": "ALL",
   "prev": "prev",
   "ask": "ask",
   "bid": "bid",
diff --git a/src/components/AccordionBox/AccordionBox.js b/src/components/AccordionBox/AccordionBox.js
index 34efde76..7d405e37 100644
--- a/src/components/AccordionBox/AccordionBox.js
+++ b/src/components/AccordionBox/AccordionBox.js
@@ -1,4 +1,4 @@
-import React, {useState, useEffect} from "react";
+import React, {useEffect, useState} from "react";
 import classes from "./AccordionBox.module.css";
 import {isMobile, isSafari} from "react-device-detect";
 
@@ -11,7 +11,7 @@ const AccordionBox = ({title, customClass, content, activeTab, setActiveTab ,...
     };
 
     useEffect(() => {
-        if (activeTab !== undefined) setActive(activeTab)
+        if (activeTab !== undefined && content[activeTab] !== undefined) setActive(activeTab)
     }, [activeTab]);
 
     useEffect(() => {
diff --git a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/MarketSubMenu.js b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/MarketSubMenu.js
index f840b2cd..f7aa2128 100644
--- a/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/MarketSubMenu.js
+++ b/src/main/Browser/Pages/UserPanel/Sections/SubMenu/components/MarketSubMenu/MarketSubMenu.js
@@ -63,11 +63,11 @@ const MarketSubMenu = () => {
             ),
         },
         {
-            id: 4,
+            id: 3,
             title: t("currency.USDT"),
             body: (
                 <MarketCard
-                    id="4"
+                    id="3"
                     type="USDT"
                     favPair={fav}
                     pairs={symbols.filter(p => (p.baseAsset === "USDT" || p.quoteAsset === "USDT"))}

From 77f64b800615a8ecd7effade6a2e15026be2f603 Mon Sep 17 00:00:00 2001
From: Benyamin <Koorosh.azimi1@gmail.com>
Date: Sat, 3 Aug 2024 16:40:44 +0330
Subject: [PATCH 2/2] #207:Fix WSOD

---
 .github/workflows/dev.yml  | 4 ++--
 .github/workflows/main.yml | 4 ++--
 .github/workflows/pr.yml   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 0671ccab..7a60f140 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Build Docker images
         env:
           GENERATE_SOURCEMAP: '' 
-        run: docker-compose -f docker-compose.build.yml build
+        run: docker compose -f docker-compose.build.yml build
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
@@ -25,4 +25,4 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Push images to GitHub Container Registry
-        run: docker-compose -f docker-compose.build.yml push
+        run: docker compose -f docker-compose.build.yml push
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 85a53235..9d780b11 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Build Docker images
         env:
           GENERATE_SOURCEMAP: false 
-        run: docker-compose -f docker-compose.build.yml build
+        run: docker compose -f docker-compose.build.yml build
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
@@ -25,4 +25,4 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Push images to GitHub Container Registry
-        run: docker-compose -f docker-compose.build.yml push
+        run: docker compose -f docker-compose.build.yml push
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index d9e44603..efc24c86 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -15,4 +15,4 @@ jobs:
         env:
           TAG: latest
           GENERATE_SOURCEMAP: false
-        run: docker-compose -f docker-compose.build.yml build
+        run: docker compose -f docker-compose.build.yml build