Merge pull request #433 from galacticcouncil/gc-apps

Static dollar asset id, fix undefined hook on init
galacticcouncil · Jun 16, 2023 · 2f3756c · 2f3756c
2 parents 20c6140 + 1ee1d48
commit 2f3756c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.env.development b/.env.development
@@ -2,5 +2,6 @@ VITE_PROVIDER_URL=wss://rococo-basilisk-rpc.hydration.dev
 VITE_DOMAIN_URL=https://testnet-app.basilisk.cloud
 VITE_INDEXER_URL=https://basilisk-rococo-explorer.play.hydration.cloud/graphql
 VITE_USD_PEGGED_ASSET_NAME=USDT
+VITE_USD_PEGGED_ASSET_ID=19
 VITE_FF_XCM_ENABLED=true
 VITE_ENV=rococo
diff --git a/.env.production b/.env.production
@@ -2,5 +2,6 @@ VITE_PROVIDER_URL=wss://rpc.basilisk.cloud
 VITE_DOMAIN_URL=https://app.basilisk.cloud
 VITE_INDEXER_URL=https://basilisk-explorer.play.hydration.cloud/graphql
 VITE_USD_PEGGED_ASSET_NAME=USDT
+VITE_USD_PEGGED_ASSET_ID=14
 VITE_FF_XCM_ENABLED=true
 VITE_ENV=production
diff --git a/.env.rococo b/.env.rococo
@@ -2,5 +2,6 @@ VITE_PROVIDER_URL=wss://rococo-basilisk-rpc.hydration.dev
 VITE_DOMAIN_URL=https://rococo-app.basilisk.cloud
 VITE_INDEXER_URL=https://basilisk-rococo-explorer.play.hydration.cloud/graphql
 VITE_USD_PEGGED_ASSET_NAME=USDT
+VITE_USD_PEGGED_ASSET_ID=19
 VITE_FF_XCM_ENABLED=false
 VITE_ENV=rococo
diff --git a/src/sections/trade/TradePage.tsx b/src/sections/trade/TradePage.tsx
@@ -6,7 +6,6 @@ import type { TxInfo } from "@galacticcouncil/apps"
 import * as React from "react"
 import * as Apps from "@galacticcouncil/apps"
 import { createComponent, EventName } from "@lit-labs/react"
-import { useUsdPeggedAsset } from "api/asset"
 import { useAccountStore, useStore } from "state/store"
 import { z } from "zod"
 import { MakeGenerics, useSearch } from "@tanstack/react-location"
@@ -47,7 +46,7 @@ export function TradePage() {
 
   const ref = React.useRef<Apps.TradeApp>(null)
   const rawSearch = useSearch<SearchGenerics>()
-  const usd = useUsdPeggedAsset()
+  const usdAssetId = import.meta.env.VITE_USD_PEGGED_ASSET_ID
   const search = TradeAppSearch.safeParse(rawSearch)
 
   const handleSubmit = async (e: CustomEvent<TxInfo>) => {
@@ -95,7 +94,7 @@ export function TradePage() {
           accountProvider={account?.provider}
           accountAddress={account?.address}
           apiAddress={rpcUrl}
-          stableCoinAssetId={usd.data?.id}
+          stableCoinAssetId={usdAssetId}
           assetIn={search.success ? search.data.assetIn : undefined}
           assetOut={search.success ? search.data.assetOut : undefined}
           pools={PoolType.XYK}