From ebfd5f1fa845ff66006cb1441f2e10ebc2549031 Mon Sep 17 00:00:00 2001 From: Oleg Shilov Date: Sat, 6 Apr 2024 00:04:35 +0700 Subject: [PATCH 1/8] fix: get rid vercel analytics --- apps/haqq-website/app/layout.tsx | 1 - apps/islamic-website/app/[locale]/layout.tsx | 1 - apps/shell/src/app/layout.tsx | 1 - package.json | 1 - yarn.lock | 25 -------------------- 5 files changed, 29 deletions(-) diff --git a/apps/haqq-website/app/layout.tsx b/apps/haqq-website/app/layout.tsx index 8c838a287..dfda790fc 100644 --- a/apps/haqq-website/app/layout.tsx +++ b/apps/haqq-website/app/layout.tsx @@ -1,5 +1,4 @@ import type { PropsWithChildren } from 'react'; -import { Analytics } from '@vercel/analytics/react'; import { SpeedInsights } from '@vercel/speed-insights/next'; import type { Metadata, Viewport } from 'next'; import dynamic from 'next/dynamic'; diff --git a/apps/islamic-website/app/[locale]/layout.tsx b/apps/islamic-website/app/[locale]/layout.tsx index 61c462a48..35d8d9dd4 100644 --- a/apps/islamic-website/app/[locale]/layout.tsx +++ b/apps/islamic-website/app/[locale]/layout.tsx @@ -1,5 +1,4 @@ import { PropsWithChildren } from 'react'; -import { Analytics } from '@vercel/analytics/react'; import { SpeedInsights } from '@vercel/speed-insights/next'; import clsx from 'clsx'; import type { Metadata, Viewport } from 'next'; diff --git a/apps/shell/src/app/layout.tsx b/apps/shell/src/app/layout.tsx index d143c77fd..3fb5237c6 100644 --- a/apps/shell/src/app/layout.tsx +++ b/apps/shell/src/app/layout.tsx @@ -1,5 +1,4 @@ import type { PropsWithChildren } from 'react'; -import { Analytics } from '@vercel/analytics/react'; import { SpeedInsights } from '@vercel/speed-insights/next'; import clsx from 'clsx'; import type { Metadata, Viewport } from 'next'; diff --git a/package.json b/package.json index 89515e986..35f026c54 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,6 @@ "@storybook/test": "8.0.5", "@tanstack/react-query": "5.28.12", "@tanstack/react-query-devtools": "5.28.12", - "@vercel/analytics": "1.2.2", "@vercel/edge": "1.1.1", "@vercel/speed-insights": "1.0.10", "@wagmi/chains": "1.8.0", diff --git a/yarn.lock b/yarn.lock index 35edd1d37..8f28259ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3236,7 +3236,6 @@ __metadata: "@types/react-router-dom": "npm:5.3.3" "@typescript-eslint/eslint-plugin": "npm:7.5.0" "@typescript-eslint/parser": "npm:7.5.0" - "@vercel/analytics": "npm:1.2.2" "@vercel/edge": "npm:1.1.1" "@vercel/speed-insights": "npm:1.0.10" "@wagmi/chains": "npm:1.8.0" @@ -8558,23 +8557,6 @@ __metadata: languageName: node linkType: hard -"@vercel/analytics@npm:1.2.2": - version: 1.2.2 - resolution: "@vercel/analytics@npm:1.2.2" - dependencies: - server-only: "npm:^0.0.1" - peerDependencies: - next: ">= 13" - react: ^18 || ^19 - peerDependenciesMeta: - next: - optional: true - react: - optional: true - checksum: 10/18b9e006249e1df214c65e4fdb0672522edf4f690b57e460e714b2119faf0f872ddecc92f543797533cb26b9a09308821e30554b2329b17f46eff769a5f9f855 - languageName: node - linkType: hard - "@vercel/edge@npm:1.1.1": version: 1.1.1 resolution: "@vercel/edge@npm:1.1.1" @@ -25328,13 +25310,6 @@ __metadata: languageName: node linkType: hard -"server-only@npm:^0.0.1": - version: 0.0.1 - resolution: "server-only@npm:0.0.1" - checksum: 10/c432348956641ea3f460af8dc3765f3a1bdbcf7a1e0205b0756d868e6e6fe8934cdee6bff68401a1dd49ba4a831c75916517a877446d54b334f7de36fa273e53 - languageName: node - linkType: hard - "set-blocking@npm:^2.0.0": version: 2.0.0 resolution: "set-blocking@npm:2.0.0" From 2d4ab8e2720e1ddd098ab6e4bd9073e77aec910e Mon Sep 17 00:00:00 2001 From: Oleg Shilov Date: Mon, 15 Apr 2024 16:11:13 +0700 Subject: [PATCH 2/8] chore(deps): add `@testing-library/dom` to dev deps --- package.json | 1 + yarn.lock | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 35f026c54..400202fc3 100644 --- a/package.json +++ b/package.json @@ -136,6 +136,7 @@ "@swc/helpers": "0.5.8", "@swc/jest": "0.2.36", "@tailwindcss/typography": "0.5.12", + "@testing-library/dom": "10.0.0", "@testing-library/react": "14.2.2", "@testing-library/user-event": "14.5.2", "@types/jest": "29.5.12", diff --git a/yarn.lock b/yarn.lock index 8f28259ff..9b95b8ff5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3225,6 +3225,7 @@ __metadata: "@tailwindcss/typography": "npm:0.5.12" "@tanstack/react-query": "npm:5.28.12" "@tanstack/react-query-devtools": "npm:5.28.12" + "@testing-library/dom": "npm:10.0.0" "@testing-library/react": "npm:14.2.2" "@testing-library/user-event": "npm:14.5.2" "@types/jest": "npm:29.5.12" @@ -7383,6 +7384,22 @@ __metadata: languageName: node linkType: hard +"@testing-library/dom@npm:10.0.0": + version: 10.0.0 + resolution: "@testing-library/dom@npm:10.0.0" + dependencies: + "@babel/code-frame": "npm:^7.10.4" + "@babel/runtime": "npm:^7.12.5" + "@types/aria-query": "npm:^5.0.1" + aria-query: "npm:5.3.0" + chalk: "npm:^4.1.0" + dom-accessibility-api: "npm:^0.5.9" + lz-string: "npm:^1.5.0" + pretty-format: "npm:^27.0.2" + checksum: 10/d0d0ffffed0dae705c5c615d8779348743e66704b2da1ce3e2df7c2d038cde55d7f11819e9b50ca53d3ec815050fab928c8845316c2f713141b9fb8ad50921f6 + languageName: node + linkType: hard + "@testing-library/dom@npm:^9.0.0, @testing-library/dom@npm:^9.3.4": version: 9.3.4 resolution: "@testing-library/dom@npm:9.3.4" @@ -9790,7 +9807,7 @@ __metadata: languageName: node linkType: hard -"aria-query@npm:^5.0.0, aria-query@npm:^5.3.0": +"aria-query@npm:5.3.0, aria-query@npm:^5.0.0, aria-query@npm:^5.3.0": version: 5.3.0 resolution: "aria-query@npm:5.3.0" dependencies: From d2cd912f8217271f36e30a9ece7a6ba3c653272d Mon Sep 17 00:00:00 2001 From: Oleg Shilov Date: Mon, 15 Apr 2024 16:13:08 +0700 Subject: [PATCH 3/8] ci: change tag for action runners --- .github/workflows/ci.yml | 4 ++-- .github/workflows/preview-vercel-haqq-website.yml | 2 +- .github/workflows/preview-vercel-islamic-website.yml | 2 +- .github/workflows/preview-vercel-shell.yml | 2 +- .github/workflows/preview-vercel-storybook.yml | 2 +- .github/workflows/preview-vercel-vesting.yml | 2 +- .github/workflows/production-vercel-haqq-website.yml | 2 +- .github/workflows/production-vercel-islamic-website.yml | 2 +- .github/workflows/production-vercel-shell.yml | 2 +- .github/workflows/production-vercel-storybook.yml | 2 +- .github/workflows/production-vercel-vesting.yml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3068a100..7277fe386 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: test-and-lint: name: Test and Lint runs-on: - - ubuntu + - frontend - self-hosted if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev') timeout-minutes: 15 @@ -42,7 +42,7 @@ jobs: # build: # name: Build # runs-on: - # - ubuntu + # - frontend # - self-hosted # if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev') # needs: test-and-lint diff --git a/.github/workflows/preview-vercel-haqq-website.yml b/.github/workflows/preview-vercel-haqq-website.yml index cd5010f64..b66166ebe 100644 --- a/.github/workflows/preview-vercel-haqq-website.yml +++ b/.github/workflows/preview-vercel-haqq-website.yml @@ -12,7 +12,7 @@ on: jobs: Preview: runs-on: - - ubuntu + - frontend - self-hosted if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev') env: diff --git a/.github/workflows/preview-vercel-islamic-website.yml b/.github/workflows/preview-vercel-islamic-website.yml index bb7db2a56..bb36bf2f3 100644 --- a/.github/workflows/preview-vercel-islamic-website.yml +++ b/.github/workflows/preview-vercel-islamic-website.yml @@ -12,7 +12,7 @@ on: jobs: Preview: runs-on: - - ubuntu + - frontend - self-hosted if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev') env: diff --git a/.github/workflows/preview-vercel-shell.yml b/.github/workflows/preview-vercel-shell.yml index 3ed6fd955..a6dac2944 100644 --- a/.github/workflows/preview-vercel-shell.yml +++ b/.github/workflows/preview-vercel-shell.yml @@ -12,7 +12,7 @@ on: jobs: Preview: runs-on: - - ubuntu + - frontend - self-hosted if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev') env: diff --git a/.github/workflows/preview-vercel-storybook.yml b/.github/workflows/preview-vercel-storybook.yml index 419b67c02..89363aa38 100644 --- a/.github/workflows/preview-vercel-storybook.yml +++ b/.github/workflows/preview-vercel-storybook.yml @@ -12,7 +12,7 @@ on: jobs: Preview: runs-on: - - ubuntu + - frontend - self-hosted if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev') env: diff --git a/.github/workflows/preview-vercel-vesting.yml b/.github/workflows/preview-vercel-vesting.yml index cba36d407..7f62a15fa 100644 --- a/.github/workflows/preview-vercel-vesting.yml +++ b/.github/workflows/preview-vercel-vesting.yml @@ -12,7 +12,7 @@ on: jobs: Preview: runs-on: - - ubuntu + - frontend - self-hosted if: (github.event_name == 'pull_request' && !github.event.pull_request.draft) || (github.event_name == 'push' && github.ref == 'refs/heads/dev') env: diff --git a/.github/workflows/production-vercel-haqq-website.yml b/.github/workflows/production-vercel-haqq-website.yml index 3a593c035..75fcbf020 100644 --- a/.github/workflows/production-vercel-haqq-website.yml +++ b/.github/workflows/production-vercel-haqq-website.yml @@ -9,7 +9,7 @@ on: jobs: Production: runs-on: - - ubuntu + - frontend - self-hosted env: VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} diff --git a/.github/workflows/production-vercel-islamic-website.yml b/.github/workflows/production-vercel-islamic-website.yml index 2b90000c4..68634211a 100644 --- a/.github/workflows/production-vercel-islamic-website.yml +++ b/.github/workflows/production-vercel-islamic-website.yml @@ -9,7 +9,7 @@ on: jobs: Production: runs-on: - - ubuntu + - frontend - self-hosted env: VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} diff --git a/.github/workflows/production-vercel-shell.yml b/.github/workflows/production-vercel-shell.yml index a20281832..06c8db5fc 100644 --- a/.github/workflows/production-vercel-shell.yml +++ b/.github/workflows/production-vercel-shell.yml @@ -9,7 +9,7 @@ on: jobs: Production: runs-on: - - ubuntu + - frontend - self-hosted env: VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} diff --git a/.github/workflows/production-vercel-storybook.yml b/.github/workflows/production-vercel-storybook.yml index 09c0c84ec..a6ef6c554 100644 --- a/.github/workflows/production-vercel-storybook.yml +++ b/.github/workflows/production-vercel-storybook.yml @@ -9,7 +9,7 @@ on: jobs: Production: runs-on: - - ubuntu + - frontend - self-hosted env: VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} diff --git a/.github/workflows/production-vercel-vesting.yml b/.github/workflows/production-vercel-vesting.yml index 274748f52..1f82d08c1 100644 --- a/.github/workflows/production-vercel-vesting.yml +++ b/.github/workflows/production-vercel-vesting.yml @@ -9,7 +9,7 @@ on: jobs: Production: runs-on: - - ubuntu + - frontend - self-hosted env: VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} From d1753aa16da4a7a2dbc82afb88052e0707144c21 Mon Sep 17 00:00:00 2001 From: Oleg Shilov Date: Mon, 15 Apr 2024 16:17:51 +0700 Subject: [PATCH 4/8] fix: remove Analytics component from render --- apps/haqq-website/app/layout.tsx | 1 - apps/islamic-website/app/[locale]/layout.tsx | 1 - apps/shell/src/app/layout.tsx | 1 - 3 files changed, 3 deletions(-) diff --git a/apps/haqq-website/app/layout.tsx b/apps/haqq-website/app/layout.tsx index dfda790fc..1c0af567b 100644 --- a/apps/haqq-website/app/layout.tsx +++ b/apps/haqq-website/app/layout.tsx @@ -84,7 +84,6 @@ export default function RootLayout({ children }: PropsWithChildren) { `, }} /> - )} diff --git a/apps/islamic-website/app/[locale]/layout.tsx b/apps/islamic-website/app/[locale]/layout.tsx index 35d8d9dd4..51a856fb3 100644 --- a/apps/islamic-website/app/[locale]/layout.tsx +++ b/apps/islamic-website/app/[locale]/layout.tsx @@ -194,7 +194,6 @@ export default async function LocaleLayout({ /> - )} diff --git a/apps/shell/src/app/layout.tsx b/apps/shell/src/app/layout.tsx index 3fb5237c6..05733784d 100644 --- a/apps/shell/src/app/layout.tsx +++ b/apps/shell/src/app/layout.tsx @@ -61,7 +61,6 @@ export default function RootLayout({ children }: PropsWithChildren) { - From fe0df1d21bd0fa45ad73f2864762378caf6084b5 Mon Sep 17 00:00:00 2001 From: Jihad Hadj Husein Date: Tue, 16 Apr 2024 15:24:02 +0300 Subject: [PATCH 5/8] fix(islamic-website): add missing dexs cards --- .../src/assets/images/coin-logos/dym.svg | 3 ++ .../src/assets/images/coin-logos/evmos.svg | 4 ++ .../src/assets/images/coin-logos/strd.svg | 4 ++ .../src/assets/images/coin-logos/tia.svg | 52 +++++++++++++++++++ .../src/assets/images/coin-logos/usdc.axl.svg | 20 +++++++ .../src/assets/images/coin-logos/wbtc.svg | 16 ++++++ .../src/lib/dex-pair/dex-pair.tsx | 17 +++++- .../src/lib/markets-page/markets-page.tsx | 28 ++++++++++ 8 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 libs/islamic-website/markets-page/src/assets/images/coin-logos/dym.svg create mode 100644 libs/islamic-website/markets-page/src/assets/images/coin-logos/evmos.svg create mode 100644 libs/islamic-website/markets-page/src/assets/images/coin-logos/strd.svg create mode 100644 libs/islamic-website/markets-page/src/assets/images/coin-logos/tia.svg create mode 100644 libs/islamic-website/markets-page/src/assets/images/coin-logos/usdc.axl.svg create mode 100644 libs/islamic-website/markets-page/src/assets/images/coin-logos/wbtc.svg diff --git a/libs/islamic-website/markets-page/src/assets/images/coin-logos/dym.svg b/libs/islamic-website/markets-page/src/assets/images/coin-logos/dym.svg new file mode 100644 index 000000000..847e7b592 --- /dev/null +++ b/libs/islamic-website/markets-page/src/assets/images/coin-logos/dym.svg @@ -0,0 +1,3 @@ + + + diff --git a/libs/islamic-website/markets-page/src/assets/images/coin-logos/evmos.svg b/libs/islamic-website/markets-page/src/assets/images/coin-logos/evmos.svg new file mode 100644 index 000000000..71fb14937 --- /dev/null +++ b/libs/islamic-website/markets-page/src/assets/images/coin-logos/evmos.svg @@ -0,0 +1,4 @@ + + + + diff --git a/libs/islamic-website/markets-page/src/assets/images/coin-logos/strd.svg b/libs/islamic-website/markets-page/src/assets/images/coin-logos/strd.svg new file mode 100644 index 000000000..68d1e1802 --- /dev/null +++ b/libs/islamic-website/markets-page/src/assets/images/coin-logos/strd.svg @@ -0,0 +1,4 @@ + + + + diff --git a/libs/islamic-website/markets-page/src/assets/images/coin-logos/tia.svg b/libs/islamic-website/markets-page/src/assets/images/coin-logos/tia.svg new file mode 100644 index 000000000..362ba9172 --- /dev/null +++ b/libs/islamic-website/markets-page/src/assets/images/coin-logos/tia.svg @@ -0,0 +1,52 @@ + + + + + + + + + diff --git a/libs/islamic-website/markets-page/src/assets/images/coin-logos/usdc.axl.svg b/libs/islamic-website/markets-page/src/assets/images/coin-logos/usdc.axl.svg new file mode 100644 index 000000000..79b7086cd --- /dev/null +++ b/libs/islamic-website/markets-page/src/assets/images/coin-logos/usdc.axl.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/libs/islamic-website/markets-page/src/assets/images/coin-logos/wbtc.svg b/libs/islamic-website/markets-page/src/assets/images/coin-logos/wbtc.svg new file mode 100644 index 000000000..1cb74e362 --- /dev/null +++ b/libs/islamic-website/markets-page/src/assets/images/coin-logos/wbtc.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/libs/islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx b/libs/islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx index b9ff2f752..98d5bc9b3 100644 --- a/libs/islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx +++ b/libs/islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx @@ -3,12 +3,18 @@ import Image, { StaticImageData } from 'next/image'; import atomLogo from '../../assets/images/coin-logos/atom.svg'; import btcLogo from '../../assets/images/coin-logos/btc.svg'; import daiLogo from '../../assets/images/coin-logos/dai.svg'; +import dymLogo from '../../assets/images/coin-logos/dym.svg'; import ethLogo from '../../assets/images/coin-logos/eth.svg'; +import evmosLogo from '../../assets/images/coin-logos/evmos.svg'; import injLogo from '../../assets/images/coin-logos/inj.svg'; import islmLogo from '../../assets/images/coin-logos/islm.svg'; import osmoLogo from '../../assets/images/coin-logos/osmo.svg'; +import strdLogo from '../../assets/images/coin-logos/strd.svg'; +import tiaLogo from '../../assets/images/coin-logos/tia.svg'; +import usdcAxlLogo from '../../assets/images/coin-logos/usdc.axl.svg'; import usdcLogo from '../../assets/images/coin-logos/usdc.svg'; import usdtLogo from '../../assets/images/coin-logos/usdt.svg'; +import wbtcLogo from '../../assets/images/coin-logos/wbtc.svg'; const coinLogos: Record = { islm: islmLogo, @@ -17,9 +23,16 @@ const coinLogos: Record = { usdt: usdtLogo, usdc: usdcLogo, dai: daiLogo, - wbtc: btcLogo, + axlwbtc: btcLogo, inj: injLogo, osmo: osmoLogo, + evmos: evmosLogo, + usdcaxl: usdcAxlLogo, + wbtc: wbtcLogo, + tia: tiaLogo, + strd: strdLogo, + eth: ethLogo, + dym: dymLogo, }; export function DEXPair({ pair }: { pair: [string, string] }) { @@ -54,7 +67,7 @@ function DEXPairCoinImage({ {`${symbol} diff --git a/libs/islamic-website/markets-page/src/lib/markets-page/markets-page.tsx b/libs/islamic-website/markets-page/src/lib/markets-page/markets-page.tsx index ca67dc235..d60b6271d 100644 --- a/libs/islamic-website/markets-page/src/lib/markets-page/markets-page.tsx +++ b/libs/islamic-website/markets-page/src/lib/markets-page/markets-page.tsx @@ -57,6 +57,10 @@ const dexData: Array<{ pair: ['USDC', 'ISLM'], href: 'https://app.osmosis.zone/?to=ISLM&from=USDC', }, + { + pair: ['ETH', 'ISLM'], + href: 'https://app.osmosis.zone/?to=ISLM&from=ETH', + }, { pair: ['ATOM', 'ISLM'], href: 'https://app.osmosis.zone/?to=ISLM&from=ATOM', @@ -69,6 +73,30 @@ const dexData: Array<{ pair: ['INJ', 'ISLM'], href: 'https://app.osmosis.zone/?to=ISLM&from=INJ', }, + { + pair: ['EVMOS', 'ISLM'], + href: 'https://app.osmosis.zone/?to=ISLM&from=EVMOS', + }, + { + pair: ['USDCaxl', 'ISLM'], + href: 'https://app.osmosis.zone/?to=ISLM&from=USDC.axl', + }, + { + pair: ['WBTC', 'ISLM'], + href: 'https://app.osmosis.zone/?to=ISLM&from=WBTC', + }, + { + pair: ['TIA', 'ISLM'], + href: 'https://app.osmosis.zone/?to=ISLM&from=TIA', + }, + { + pair: ['STRD', 'ISLM'], + href: 'https://app.osmosis.zone/?to=ISLM&from=STRD', + }, + { + pair: ['DYM', 'ISLM'], + href: 'https://app.osmosis.zone/?to=ISLM&from=DYM', + }, ], }, ]; From ff4adcbb3f09c650ecd7f80ea0d9dbbf41cd5cb0 Mon Sep 17 00:00:00 2001 From: Jihad Hadj Husein Date: Tue, 16 Apr 2024 18:13:16 +0300 Subject: [PATCH 6/8] chore(islamic-website): use correct logo, remove unused logo asset --- .../markets-page/src/assets/images/coin-logos/btc.svg | 1 - .../islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 libs/islamic-website/markets-page/src/assets/images/coin-logos/btc.svg diff --git a/libs/islamic-website/markets-page/src/assets/images/coin-logos/btc.svg b/libs/islamic-website/markets-page/src/assets/images/coin-logos/btc.svg deleted file mode 100644 index 0084bd2f0..000000000 --- a/libs/islamic-website/markets-page/src/assets/images/coin-logos/btc.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/libs/islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx b/libs/islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx index 98d5bc9b3..460efd778 100644 --- a/libs/islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx +++ b/libs/islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx @@ -1,7 +1,6 @@ import clsx from 'clsx'; import Image, { StaticImageData } from 'next/image'; import atomLogo from '../../assets/images/coin-logos/atom.svg'; -import btcLogo from '../../assets/images/coin-logos/btc.svg'; import daiLogo from '../../assets/images/coin-logos/dai.svg'; import dymLogo from '../../assets/images/coin-logos/dym.svg'; import ethLogo from '../../assets/images/coin-logos/eth.svg'; @@ -23,7 +22,7 @@ const coinLogos: Record = { usdt: usdtLogo, usdc: usdcLogo, dai: daiLogo, - axlwbtc: btcLogo, + axlwbtc: wbtcLogo, inj: injLogo, osmo: osmoLogo, evmos: evmosLogo, From b936a3c9e382bcd156b988336c71d8d2f4695106 Mon Sep 17 00:00:00 2001 From: Jihad Hadj Husein Date: Tue, 16 Apr 2024 19:32:02 +0300 Subject: [PATCH 7/8] fix(islamic-website): add usdc.axl & wbtc.axl pairs --- .../src/assets/images/coin-logos/wbtc.axl.svg | 24 +++++++++++++++++++ .../src/lib/dex-pair/dex-pair.tsx | 7 +++--- .../src/lib/markets-page/markets-page.tsx | 6 ++++- 3 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 libs/islamic-website/markets-page/src/assets/images/coin-logos/wbtc.axl.svg diff --git a/libs/islamic-website/markets-page/src/assets/images/coin-logos/wbtc.axl.svg b/libs/islamic-website/markets-page/src/assets/images/coin-logos/wbtc.axl.svg new file mode 100644 index 000000000..8ddf0276c --- /dev/null +++ b/libs/islamic-website/markets-page/src/assets/images/coin-logos/wbtc.axl.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libs/islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx b/libs/islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx index 460efd778..3ab330656 100644 --- a/libs/islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx +++ b/libs/islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx @@ -13,6 +13,7 @@ import tiaLogo from '../../assets/images/coin-logos/tia.svg'; import usdcAxlLogo from '../../assets/images/coin-logos/usdc.axl.svg'; import usdcLogo from '../../assets/images/coin-logos/usdc.svg'; import usdtLogo from '../../assets/images/coin-logos/usdt.svg'; +import wbtcAxlLogo from '../../assets/images/coin-logos/wbtc.axl.svg'; import wbtcLogo from '../../assets/images/coin-logos/wbtc.svg'; const coinLogos: Record = { @@ -22,7 +23,6 @@ const coinLogos: Record = { usdt: usdtLogo, usdc: usdcLogo, dai: daiLogo, - axlwbtc: wbtcLogo, inj: injLogo, osmo: osmoLogo, evmos: evmosLogo, @@ -32,17 +32,18 @@ const coinLogos: Record = { strd: strdLogo, eth: ethLogo, dym: dymLogo, + wbtcaxl: wbtcAxlLogo, }; export function DEXPair({ pair }: { pair: [string, string] }) { return (
diff --git a/libs/islamic-website/markets-page/src/lib/markets-page/markets-page.tsx b/libs/islamic-website/markets-page/src/lib/markets-page/markets-page.tsx index d60b6271d..d0596e521 100644 --- a/libs/islamic-website/markets-page/src/lib/markets-page/markets-page.tsx +++ b/libs/islamic-website/markets-page/src/lib/markets-page/markets-page.tsx @@ -78,9 +78,13 @@ const dexData: Array<{ href: 'https://app.osmosis.zone/?to=ISLM&from=EVMOS', }, { - pair: ['USDCaxl', 'ISLM'], + pair: ['USDC.axl', 'ISLM'], href: 'https://app.osmosis.zone/?to=ISLM&from=USDC.axl', }, + { + pair: ['WBTC.axl', 'ISLM'], + href: 'https://app.osmosis.zone/?to=ISLM&from=WBTC.axl', + }, { pair: ['WBTC', 'ISLM'], href: 'https://app.osmosis.zone/?to=ISLM&from=WBTC', From 7552a6217f57e02583541379458f296b986498fc Mon Sep 17 00:00:00 2001 From: Jihad Hadj Husein Date: Wed, 17 Apr 2024 12:20:47 +0300 Subject: [PATCH 8/8] fix(islamic-website): correct dex pair styles, update dym logo asset --- .../src/assets/images/coin-logos/dym.svg | 12 ++++++++++-- .../markets-page/src/lib/dex-pair/dex-pair.tsx | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libs/islamic-website/markets-page/src/assets/images/coin-logos/dym.svg b/libs/islamic-website/markets-page/src/assets/images/coin-logos/dym.svg index 847e7b592..187b715be 100644 --- a/libs/islamic-website/markets-page/src/assets/images/coin-logos/dym.svg +++ b/libs/islamic-website/markets-page/src/assets/images/coin-logos/dym.svg @@ -1,3 +1,11 @@ - - + + + + + + + + + + diff --git a/libs/islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx b/libs/islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx index 3ab330656..bb5fb1867 100644 --- a/libs/islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx +++ b/libs/islamic-website/markets-page/src/lib/dex-pair/dex-pair.tsx @@ -60,14 +60,14 @@ function DEXPairCoinImage({ return (
{`${symbol}