Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ 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:
registry: ghcr.io
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
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ 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:
registry: ghcr.io
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
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion public/assets/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"nextStep": "Next Step",
"prevStep": "Prev Step",
"next": "next",
"all": "all",
"all": "ALL",
"prev": "prev",
"ask": "ask",
"bid": "bid",
Expand Down
4 changes: 2 additions & 2 deletions src/components/AccordionBox/AccordionBox.js
Original file line number Diff line number Diff line change
@@ -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";

Expand All @@ -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(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"))}
Expand Down