From b992f9430f8b3dbd822b51ba06a4355c5201ada1 Mon Sep 17 00:00:00 2001 From: sarah-thong Date: Thu, 15 Dec 2022 15:37:49 +0800 Subject: [PATCH] Update token icons --- package.json | 2 +- src/@demex-info/assets/tokens/DYDX.svg | 20 ++++++ src/@demex-info/assets/tokens/STATOM.svg | 22 +++++++ src/@demex-info/assets/tokens/STOSMO.svg | 16 +++++ src/@demex-info/assets/tokens/STRD.svg | 4 ++ src/@demex-info/assets/tokens/USC.svg | 37 +++++++++++ src/@demex-info/assets/tokens/index.ts | 5 ++ .../components/CoinIcon/CoinIcon.tsx | 14 ++-- yarn.lock | 64 ++++++++----------- 9 files changed, 141 insertions(+), 43 deletions(-) create mode 100644 src/@demex-info/assets/tokens/DYDX.svg create mode 100644 src/@demex-info/assets/tokens/STATOM.svg create mode 100644 src/@demex-info/assets/tokens/STOSMO.svg create mode 100644 src/@demex-info/assets/tokens/STRD.svg create mode 100644 src/@demex-info/assets/tokens/USC.svg diff --git a/package.json b/package.json index 2d9cb3d4..92ae82cb 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@types/redux-logger": "^3.0.8", "animate.css": "^4.1.1", "bignumber.js": "^9.0.1", - "carbon-js-sdk": "^0.2.8", + "carbon-js-sdk": "^0.3.13", "chart.js": "^3.2.0", "dayjs": "^1.11.5", "eslint": "^7.23.0", diff --git a/src/@demex-info/assets/tokens/DYDX.svg b/src/@demex-info/assets/tokens/DYDX.svg new file mode 100644 index 00000000..0f7fd9d1 --- /dev/null +++ b/src/@demex-info/assets/tokens/DYDX.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/@demex-info/assets/tokens/STATOM.svg b/src/@demex-info/assets/tokens/STATOM.svg new file mode 100644 index 00000000..c3e505f8 --- /dev/null +++ b/src/@demex-info/assets/tokens/STATOM.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/@demex-info/assets/tokens/STOSMO.svg b/src/@demex-info/assets/tokens/STOSMO.svg new file mode 100644 index 00000000..73d29604 --- /dev/null +++ b/src/@demex-info/assets/tokens/STOSMO.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/@demex-info/assets/tokens/STRD.svg b/src/@demex-info/assets/tokens/STRD.svg new file mode 100644 index 00000000..5fbe603f --- /dev/null +++ b/src/@demex-info/assets/tokens/STRD.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/@demex-info/assets/tokens/USC.svg b/src/@demex-info/assets/tokens/USC.svg new file mode 100644 index 00000000..32bd9541 --- /dev/null +++ b/src/@demex-info/assets/tokens/USC.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/@demex-info/assets/tokens/index.ts b/src/@demex-info/assets/tokens/index.ts index f88e2d0d..9d0f21d5 100644 --- a/src/@demex-info/assets/tokens/index.ts +++ b/src/@demex-info/assets/tokens/index.ts @@ -53,6 +53,7 @@ export { ReactComponent as DGB } from "./DGB.svg"; export { ReactComponent as DODO } from "./DODO.svg"; export { ReactComponent as DOGE } from "./DOGE.svg"; export { ReactComponent as DOT } from "./DOT.svg"; +export { ReactComponent as DYDX } from "./DYDX.svg"; export { ReactComponent as EGLD } from "./EGLD.svg"; export { ReactComponent as ELA } from "./ELA.svg"; export { ReactComponent as ENJ } from "./ENJ.svg"; @@ -154,10 +155,13 @@ export { ReactComponent as SHIB } from "./SHIB.svg"; export { ReactComponent as SNT } from "./SNT.svg"; export { ReactComponent as SNX } from "./SNX.svg"; export { ReactComponent as SOL } from "./SOL.svg"; +export { ReactComponent as STATOM } from "./STATOM.svg"; export { ReactComponent as STEEM } from "./STEEM.svg"; export { ReactComponent as STMX } from "./STMX.svg"; export { ReactComponent as STORJ } from "./STORJ.svg"; +export { ReactComponent as STOSMO } from "./STOSMO.svg"; export { ReactComponent as STRAX } from "./STRAX.svg"; +export { ReactComponent as STRD } from "./STRD.svg"; export { ReactComponent as STX } from "./STX.svg"; export { ReactComponent as SUSHI } from "./SUSHI.svg"; export { ReactComponent as SWTH } from "./SWTH.svg"; @@ -175,6 +179,7 @@ export { ReactComponent as TUSD } from "./TUSD.svg"; export { ReactComponent as UBQ } from "./UBQ.svg"; export { ReactComponent as UNA } from "./UNA.svg"; export { ReactComponent as UNI } from "./UNI.svg"; +export { ReactComponent as USC } from "./USC.svg"; export { ReactComponent as USD } from "./USD.svg"; export { ReactComponent as USDC } from "./USDC.svg"; export { ReactComponent as USDT } from "./USDT.svg"; diff --git a/src/@demex-info/components/CoinIcon/CoinIcon.tsx b/src/@demex-info/components/CoinIcon/CoinIcon.tsx index 3cec92b7..5d55fa6f 100644 --- a/src/@demex-info/components/CoinIcon/CoinIcon.tsx +++ b/src/@demex-info/components/CoinIcon/CoinIcon.tsx @@ -1,5 +1,5 @@ import * as COINS from "@demex-info/assets"; -import { makeStyles, SvgIconProps } from "@material-ui/core"; +import { makeStyles, SvgIconProps, Theme } from "@material-ui/core"; import clsx from "clsx"; import React from "react"; @@ -45,22 +45,26 @@ const CoinIcon: React.FunctionComponent = ( defaultIcon = undefined; } - const Icon = symbolToIcon[tokenName] || defaultIcon; + const selectedIcon = symbolToIcon[tokenName]; + const Icon = selectedIcon ?? defaultIcon; return ( ); }; -const useStyles = makeStyles({ +const useStyles = makeStyles((theme: Theme) => ({ svg: { fontSize: "inherit", width: "2em", height: "2em", + "&.isDefault path": { + fill: theme.palette.common.white, + }, }, -}); +})); export default CoinIcon; diff --git a/yarn.lock b/yarn.lock index b600ff72..fc1e14a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1210,6 +1210,22 @@ secure-random "1.1.2" wif "2.0.6" +"@cityofzion/neon-js@^4.9.0": + version "4.9.0" + resolved "https://registry.yarnpkg.com/@cityofzion/neon-js/-/neon-js-4.9.0.tgz#39f46720cff76f807128d5882832a3d722d9fd25" + integrity sha512-YYeMbQGZJkC8Wq2UQt98OUys8f8tPCaXMplbV8GwiJEdG+PJJOFGg3NkvrDGUfcuasff0dcn8LWjXTPKPp+Gyw== + dependencies: + "@cityofzion/neon-api" "^4.9.0" + "@cityofzion/neon-core" "^4.9.0" + "@cityofzion/neon-nep5" "^4.9.0" + +"@cityofzion/neon-nep5@^4.9.0": + version "4.9.0" + resolved "https://registry.yarnpkg.com/@cityofzion/neon-nep5/-/neon-nep5-4.9.0.tgz#aa170bfa83c5ef75270d10951e02f87e7faf4f47" + integrity sha512-MSRXHl+UGYnh8f9FC7zZvMNRblnl496VxG3tjA+GIShtLR6u75/FK7syVXua9h8/khljL7qqSfnNqA+sy7q+eg== + dependencies: + "@cityofzion/neon-core" "^4.9.0" + "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz" @@ -2622,9 +2638,9 @@ resolved "https://registry.npmjs.org/@keplr-wallet/router/-/router-0.9.6.tgz" integrity sha512-TZfqkRwGOMk0nbgel41xLfD8ifM59WIXNt90rJjKynNT1/TOLTGxRDC8Ie5yY9Oak0lz7rmdrWNTOsvtWyuplA== -"@keplr-wallet/stores@~0.9.0-alpha.10": +"@keplr-wallet/stores@~0.9.12": version "0.9.18" - resolved "https://registry.npmjs.org/@keplr-wallet/stores/-/stores-0.9.18.tgz" + resolved "https://registry.yarnpkg.com/@keplr-wallet/stores/-/stores-0.9.18.tgz#5652d4a479131a2d5a88459c80a9925a137431f0" integrity sha512-F+u144HUqaxl/KxRfS8JJIgXTruYGQRHggLcsDxCZ/JohgwgTgQuURRfh+G/zlg438F2XYNU3sbUqQe1GWyEBw== dependencies: "@cosmjs/encoding" "^0.24.0-alpha.25" @@ -2648,7 +2664,7 @@ p-queue "^6.6.2" utility-types "^3.10.0" -"@keplr-wallet/types@^0.9.12": +"@keplr-wallet/types@^0.9.12", "@keplr-wallet/types@~0.9.12": version "0.9.12" resolved "https://registry.npmjs.org/@keplr-wallet/types/-/types-0.9.12.tgz" integrity sha512-vtAczeD3+CgGExSZCnU9Wzs9Y8BpdbOii+UjIFHwCR57OXFQphbWHh2j15QFpV4CbebpDcBzIm+/4IAyLeI0Yw== @@ -2659,17 +2675,6 @@ long "^4.0.0" secretjs "^0.17.0" -"@keplr-wallet/types@~0.8.13": - version "0.8.13" - resolved "https://registry.npmjs.org/@keplr-wallet/types/-/types-0.8.13.tgz" - integrity sha512-UaVATHmGaC5REyprLahyNIC3pZZQV+VTxMz10X3+hD6w2YgyLKimmqVg7ndVQhZrNZrVmMqgATl/UCCFgE6hlQ== - dependencies: - "@cosmjs/launchpad" "^0.24.0-alpha.25" - "@cosmjs/proto-signing" "^0.24.0-alpha.25" - axios "^0.21.0" - long "^4.0.0" - secretjs "^0.16.0" - "@keplr-wallet/unit@^0.9.12": version "0.9.12" resolved "https://registry.npmjs.org/@keplr-wallet/unit/-/unit-0.9.12.tgz" @@ -4541,7 +4546,7 @@ axios@0.21.1: dependencies: follow-redirects "^1.10.0" -axios@^0.21.0, axios@^0.21.1, axios@^0.21.2, axios@^0.21.4: +axios@^0.21.1, axios@^0.21.2, axios@^0.21.4: version "0.21.4" resolved "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz" integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== @@ -5352,19 +5357,20 @@ capture-exit@^2.0.0: dependencies: rsvp "^4.8.4" -carbon-js-sdk@^0.2.8: - version "0.2.8" - resolved "https://registry.yarnpkg.com/carbon-js-sdk/-/carbon-js-sdk-0.2.8.tgz#0ee57007e6dba5793f5664ba07dfddf596b7c60d" - integrity sha512-OOSLIcsNXTBlWXj1wJy1J6cpksCkWnPH9g//zbOS9FtX4rhYzcsK7XIZOut2m6BKxeLI6N0xlMgmvYNp3PaIww== +carbon-js-sdk@^0.3.13: + version "0.3.13" + resolved "https://registry.yarnpkg.com/carbon-js-sdk/-/carbon-js-sdk-0.3.13.tgz#5defd8f74b1e2d38dcd274ce15db05e2c2e97296" + integrity sha512-Y535lciQJoIOFVqcKobbrb3ZoruNlRTg35pgUatH180IRGxzTKNAKSJUCG2n1KPqyIMcrqV59BKyhtuF7sfuFg== dependencies: "@cityofzion/neon-api" "^4.9.0" "@cityofzion/neon-core" "^4.9.0" "@cityofzion/neon-core-next" "npm:@cityofzion/neon-core@^5.0.0" + "@cityofzion/neon-js" "^4.9.0" "@cosmjs/proto-signing" "^0.28.10" "@cosmjs/stargate" "^0.28.10" "@grpc/grpc-js" "^1.3.2" - "@keplr-wallet/stores" "~0.9.0-alpha.10" - "@keplr-wallet/types" "~0.8.13" + "@keplr-wallet/stores" "~0.9.12" + "@keplr-wallet/types" "~0.9.12" "@ledgerhq/hw-app-eth" "^6.11.2" "@ledgerhq/hw-transport" "^6.3.0" "@ledgerhq/hw-transport-webhid" "^6.4.1" @@ -13374,22 +13380,6 @@ secp256r1@^0.0.3: nan "^2.2.1" safe-buffer "^5.1.0" -secretjs@^0.16.0: - version "0.16.7" - resolved "https://registry.npmjs.org/secretjs/-/secretjs-0.16.7.tgz" - integrity sha512-HL2Ekui0TFQhWrzQ5IenI3a54IaD9UdXwdyYMMLhisQCm5/quMw/v4CxmjEro+b5FxlEYvWcgzFO6nntduywDg== - dependencies: - "@iov/crypto" "2.1.0" - "@iov/encoding" "2.1.0" - "@iov/utils" "2.0.2" - axios "0.21.1" - curve25519-js "0.0.4" - fast-deep-equal "3.1.1" - js-crypto-hkdf "0.7.3" - miscreant "0.3.2" - pako "1.0.11" - secure-random "1.1.2" - secretjs@^0.17.0: version "0.17.5" resolved "https://registry.npmjs.org/secretjs/-/secretjs-0.17.5.tgz"