From 0219fc71ea17c2b10be613d0ed7f485f068aeb65 Mon Sep 17 00:00:00 2001
From: webdev403 <web.dev8231@gmail.com>
Date: Tue, 1 Apr 2025 00:12:00 -0700
Subject: [PATCH 1/2] Fix: Deploy without orderly.network

---
 src/App.tsx | 316 ++++++++++++++++++++++++++--------------------------
 1 file changed, 158 insertions(+), 158 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index b75865ce3..7b7dafc04 100755
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -173,164 +173,164 @@ const App: React.FC = () => {
         queryClient={queryClient}
       >
         <QueryClientProvider client={queryClient}>
-          <OrderlyConfigProvider brokerId='quick_perps' networkId='mainnet'>
-            <Route component={GoogleAnalyticsReporter} />
-            <Provider store={store}>
-              <Providers>
-                <TermsWrapper>
-                  <Updaters />
-                  <Popups />
-                  <Switch>
-                    <Route exact path='/'>
-                      <PageLayout>
-                        <LandingPage />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/swap/:version?'>
-                      <PageLayout>
-                        <SwapPage />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/bridge'>
-                      <PageLayout>
-                        <BridgePage />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/leader-board'>
-                      <PageLayout>
-                        <ContestPage />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/pools/:version?'>
-                      <PageLayout>
-                        <PoolsPage />
-                      </PageLayout>
-                    </Route>
-                    <Route exact strict path='/pool/:tokenId'>
-                      <PageLayout>
-                        <PositionPage></PositionPage>
-                      </PageLayout>
-                    </Route>
-                    <Route exact strict path='/falkor'>
-                      <PageLayout>
-                        <PerpsPage />
-                      </PageLayout>
-                    </Route>
-                    <Route
-                      exact
-                      path='/add/:currencyIdA?/:currencyIdB?/:version?'
-                    >
-                      <PageLayout>
-                        <PoolsPage></PoolsPage>
-                      </PageLayout>
-                    </Route>
-                    <Route
-                      exact
-                      path='/increase/:currencyIdA?/:currencyIdB?/:tokenId'
-                    >
-                      <PageLayout>
-                        <IncreaseLiquidityV3Page></IncreaseLiquidityV3Page>
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/remove/:tokenId'>
-                      <PageLayout>
-                        <RemoveLiquidityV3Page></RemoveLiquidityV3Page>
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/migrate'>
-                      <PageLayout>
-                        <MigrateV2LiquidityPage />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/migrate/:currencyIdA/:currencyIdB'>
-                      <PageLayout>
-                        <MigrateV2DetailsPage />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/farm/:version?'>
-                      <PageLayout>
-                        <FarmPage />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/dragons'>
-                      <PageLayout>
-                        <DragonPage />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/convert'>
-                      <PageLayout>
-                        <ConvertQUICKPage />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/bonds'>
-                      <PageLayout>
-                        <BondsPage />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/newsletter'>
-                      <PageLayout>
-                        <NewsletterPage />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/tos'>
-                      <PageLayout>
-                        <TOSPage />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/gamehub'>
-                      <RedirectExternal
-                        to={`${process.env.REACT_APP_GAMEHUB_URL}`}
-                        target={'_top'}
-                      ></RedirectExternal>
-                    </Route>
-                    <Route exact path='/analytics/:version?'>
-                      <PageLayout>
-                        <AnalyticsHeader />
-                        <AnalyticsOverview />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/analytics/:version/tokens'>
-                      <PageLayout>
-                        <AnalyticsHeader />
-                        <AnalyticsTokens />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/analytics/:version/pairs'>
-                      <PageLayout>
-                        <AnalyticsHeader />
-                        <AnalyticsPairs />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/analytics/:version/token/:id'>
-                      <PageLayout>
-                        <AnalyticsTokenDetails />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/analytics/:version/pair/:id'>
-                      <PageLayout>
-                        <AnalyticsPairDetails />
-                      </PageLayout>
-                    </Route>
-                    <Route exact path='/calculator/0.01-eth-to-usd'>
-                      <PageLayout>
-                        <CalculatorPage />
-                      </PageLayout>
-                    </Route>
-                    <Route path='/forbidden'>
-                      <PageLayout>
-                        <ForbiddenPage />
-                      </PageLayout>
-                    </Route>
-                    <Route path='*'>
-                      <PageLayout>
-                        <NotFound404Page />
-                      </PageLayout>
-                    </Route>
-                  </Switch>
-                </TermsWrapper>
-              </Providers>
-            </Provider>
-          </OrderlyConfigProvider>
+          {/* <OrderlyConfigProvider brokerId='quick_perps' networkId='mainnet'> */}
+          <Route component={GoogleAnalyticsReporter} />
+          <Provider store={store}>
+            <Providers>
+              <TermsWrapper>
+                <Updaters />
+                <Popups />
+                <Switch>
+                  <Route exact path='/'>
+                    <PageLayout>
+                      <LandingPage />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/swap/:version?'>
+                    <PageLayout>
+                      <SwapPage />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/bridge'>
+                    <PageLayout>
+                      <BridgePage />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/leader-board'>
+                    <PageLayout>
+                      <ContestPage />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/pools/:version?'>
+                    <PageLayout>
+                      <PoolsPage />
+                    </PageLayout>
+                  </Route>
+                  <Route exact strict path='/pool/:tokenId'>
+                    <PageLayout>
+                      <PositionPage></PositionPage>
+                    </PageLayout>
+                  </Route>
+                  <Route exact strict path='/falkor'>
+                    <PageLayout>
+                      <PerpsPage />
+                    </PageLayout>
+                  </Route>
+                  <Route
+                    exact
+                    path='/add/:currencyIdA?/:currencyIdB?/:version?'
+                  >
+                    <PageLayout>
+                      <PoolsPage></PoolsPage>
+                    </PageLayout>
+                  </Route>
+                  <Route
+                    exact
+                    path='/increase/:currencyIdA?/:currencyIdB?/:tokenId'
+                  >
+                    <PageLayout>
+                      <IncreaseLiquidityV3Page></IncreaseLiquidityV3Page>
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/remove/:tokenId'>
+                    <PageLayout>
+                      <RemoveLiquidityV3Page></RemoveLiquidityV3Page>
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/migrate'>
+                    <PageLayout>
+                      <MigrateV2LiquidityPage />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/migrate/:currencyIdA/:currencyIdB'>
+                    <PageLayout>
+                      <MigrateV2DetailsPage />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/farm/:version?'>
+                    <PageLayout>
+                      <FarmPage />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/dragons'>
+                    <PageLayout>
+                      <DragonPage />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/convert'>
+                    <PageLayout>
+                      <ConvertQUICKPage />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/bonds'>
+                    <PageLayout>
+                      <BondsPage />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/newsletter'>
+                    <PageLayout>
+                      <NewsletterPage />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/tos'>
+                    <PageLayout>
+                      <TOSPage />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/gamehub'>
+                    <RedirectExternal
+                      to={`${process.env.REACT_APP_GAMEHUB_URL}`}
+                      target={'_top'}
+                    ></RedirectExternal>
+                  </Route>
+                  <Route exact path='/analytics/:version?'>
+                    <PageLayout>
+                      <AnalyticsHeader />
+                      <AnalyticsOverview />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/analytics/:version/tokens'>
+                    <PageLayout>
+                      <AnalyticsHeader />
+                      <AnalyticsTokens />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/analytics/:version/pairs'>
+                    <PageLayout>
+                      <AnalyticsHeader />
+                      <AnalyticsPairs />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/analytics/:version/token/:id'>
+                    <PageLayout>
+                      <AnalyticsTokenDetails />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/analytics/:version/pair/:id'>
+                    <PageLayout>
+                      <AnalyticsPairDetails />
+                    </PageLayout>
+                  </Route>
+                  <Route exact path='/calculator/0.01-eth-to-usd'>
+                    <PageLayout>
+                      <CalculatorPage />
+                    </PageLayout>
+                  </Route>
+                  <Route path='/forbidden'>
+                    <PageLayout>
+                      <ForbiddenPage />
+                    </PageLayout>
+                  </Route>
+                  <Route path='*'>
+                    <PageLayout>
+                      <NotFound404Page />
+                    </PageLayout>
+                  </Route>
+                </Switch>
+              </TermsWrapper>
+            </Providers>
+          </Provider>
+          {/* </OrderlyConfigProvider> */}
         </QueryClientProvider>
       </SoulZapApiClient.Provider>
     </ArcxAnalyticsProvider>

From cc7ea7630da5e9c71cad03fcda40b74fc404d846 Mon Sep 17 00:00:00 2001
From: webdev403 <web.dev8231@gmail.com>
Date: Wed, 2 Apr 2025 07:16:36 -0700
Subject: [PATCH 2/2] Fix: Remove all instances of ASTAR

---
 .env                                          |  1 -
 src/constants/index.ts                        |  1 -
 src/hooks/v3/useBestV3Trade.ts                |  1 -
 src/hooks/v3/useGammaData.ts                  |  2 --
 .../containers/SelectFeeTier/index.tsx        | 22 -------------------
 5 files changed, 27 deletions(-)

diff --git a/.env b/.env
index 923c75d58..783f765c1 100644
--- a/.env
+++ b/.env
@@ -12,7 +12,6 @@ REACT_APP_POLYGON_ZKEVM_URL="https://tokens.coingecko.com/polygon-zkevm/all.json
 REACT_APP_COINGECKO_MANTA_URL="https://tokens.coingecko.com/manta-pacific/all.json"
 REACT_APP_COINGECKO_IMMUTABLE_URL="https://tokens.coingecko.com/immutable/all.json"
 REACT_APP_COINGECKO_DOGE_URL="https://tokens.coingecko.com/dogechain/all.json"
-REACT_APP_COINGECKO_ASTAR_URL="https://tokens.coingecko.com/astar/all.json"
 REACT_APP_COINGECKO_KAVA_URL="https://tokens.coingecko.com/kava/all.json"
 REACT_APP_COINGECKO_SONEIUM_URL="https://tokens.coingecko.com/soneium/all.json"
 REACT_APP_COINGECKO_ETHEREUM_URL="https://tokens.coingecko.com/ethereum/all.json"
diff --git a/src/constants/index.ts b/src/constants/index.ts
index 802264df0..b25bfe568 100644
--- a/src/constants/index.ts
+++ b/src/constants/index.ts
@@ -363,7 +363,6 @@ export const SUPPORTED_CHAINIDS = [
   ChainId.DOGECHAIN,
   ChainId.ETHEREUM,
   ChainId.IMX,
-  ChainId.ASTARZKEVM,
   ChainId.ZKATANA,
   ChainId.TIMX,
   ChainId.ZKTESTNET,
diff --git a/src/hooks/v3/useBestV3Trade.ts b/src/hooks/v3/useBestV3Trade.ts
index 51be7623c..047ce88f5 100644
--- a/src/hooks/v3/useBestV3Trade.ts
+++ b/src/hooks/v3/useBestV3Trade.ts
@@ -21,7 +21,6 @@ export enum V3TradeState {
 
 const QUOTE_GAS_OVERRIDES: { [chainId: number]: number } = {
   [ChainId.ZKEVM]: 20_000_000,
-  [ChainId.ASTARZKEVM]: 100_000_000,
   [ChainId.MANTA]: 20_000_000,
 };
 
diff --git a/src/hooks/v3/useGammaData.ts b/src/hooks/v3/useGammaData.ts
index f3a9bcce1..a68fbb6bb 100644
--- a/src/hooks/v3/useGammaData.ts
+++ b/src/hooks/v3/useGammaData.ts
@@ -16,8 +16,6 @@ const gammaChainName = (chainId?: ChainId) => {
       return 'manta';
     case ChainId.IMX:
       return 'immutable-zkevm';
-    case ChainId.ASTARZKEVM:
-      return 'astar-zkevm';
     default:
       return 'polygon';
   }
diff --git a/src/pages/PoolsPage/v3/SupplyLiquidityV3/containers/SelectFeeTier/index.tsx b/src/pages/PoolsPage/v3/SupplyLiquidityV3/containers/SelectFeeTier/index.tsx
index 0da185533..14af22119 100644
--- a/src/pages/PoolsPage/v3/SupplyLiquidityV3/containers/SelectFeeTier/index.tsx
+++ b/src/pages/PoolsPage/v3/SupplyLiquidityV3/containers/SelectFeeTier/index.tsx
@@ -166,28 +166,6 @@ const SelectFeeTier: React.FC<SelectFeeTierProps> = ({ mintInfo }) => {
         description: t('bestForExoticPair'),
       },
     ],
-    [ChainId.ASTARZKEVM]: [
-      {
-        id: 'uni-0.01',
-        text: '0.01%',
-        description: t('availableForStablePair'),
-      },
-      {
-        id: 'uni-0.05',
-        text: '0.05%',
-        description: t('highlyLiquidPair'),
-      },
-      {
-        id: 'uni-0.3',
-        text: '0.3%',
-        description: t('bestForMostPair'),
-      },
-      {
-        id: 'uni-1',
-        text: '1%',
-        description: t('bestForExoticPair'),
-      },
-    ],
     [ChainId.MINATO]: [
       {
         id: 'uni-0.01',