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: 3 additions & 1 deletion public/assets/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@
"TBNB": "TBNB",
"TBUSD": "TBUSD",
"BCH": "BCH",
"TRX": "TRX"
"TRX": "TRX",
"SOL": "SOL",
"TON": "TON"
},
"marketInterval": {
"24h": "24 hours",
Expand Down
4 changes: 3 additions & 1 deletion public/assets/locales/fa/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@
"TBNB": "بایننس (ت)",
"TBUSD": "دلار بایننس(ت)",
"BCH": "بیتکوین کش",
"TRX": "ترون"
"TRX": "ترون",
"SOL": "سولانا",
"TON": "تون کوین"
},
"marketInterval": {
"24h": "24 ساعت",
Expand Down
4 changes: 4 additions & 0 deletions src/assets/images.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import tron from "./images/src/tron.svg";
import testTron from "./images/src/testTron.svg";
import ethereumLight from "./images/src/ethereumLight.svg";
import toman from "./images/src/toman.svg";
import toncoin from "./images/src/toncoin.svg";
import solana from "./images/src/solana.svg";
import spaceStar from "./images/src/spaceStar.png";
import astronaut from "./images/src/astronaut.svg";
import astronautAlone from "./images/src/astronautAlone.svg";
Expand Down Expand Up @@ -62,6 +64,8 @@ export const images = {
TTRX: testTron,
ETH: ethereumLight,
IRT: toman,
TON: toncoin,
SOL: solana,
spaceStar: spaceStar,
astronaut: astronaut,
astronautAlone: astronautAlone,
Expand Down
36 changes: 36 additions & 0 deletions src/assets/images/src/solana.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 19 additions & 1 deletion src/assets/images/src/tether.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions src/assets/images/src/toncoin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ const WalletSubMenu = () => {
const {t} = useTranslation();
const [showZero, setShowZero] = useState(false);
const assets = useSelector((state) => state.exchange.assets)

console.log("assets", assets)
const {data: data, isLoading} = useGetUserAccount()
console.log("data", data)

return (
<div className={`width-100 card-bg column ${classes.container}`}>
Expand All @@ -32,8 +35,8 @@ const WalletSubMenu = () => {
</div>
<WalletBalance/>
<ScrollBar customClass={`column`}>
{assets.filter(asset => data.wallets[asset].free > 0)
.concat(assets.filter(asset => data.wallets[asset].free === 0))
{assets?.filter(asset => data?.wallets?.[asset]?.free > 0)
.concat(assets.filter(asset => data?.wallets?.[asset]?.free === 0))
.map((name) => <WalletListItem key={name} assetName={name} showZero={showZero}/>)}
</ScrollBar>
</div>
Expand Down