Skip to content

Dev2 #1781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sameepsi merged 6 commits into from
Apr 1, 2025
+165 −165
Merged

Dev2 #1781

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67b2276
Add log to debug for soneium farm
jirokobadev Mar 31, 2025
d5e9022
Merge pull request #1779 from jirokobadev/hotfix/farm-soneium-issue
sameepsi Mar 31, 2025
4582243
remove soneium farm logs
jirokobadev Mar 31, 2025
ca8cf59
Merge pull request #1780 from jirokobadev/hotfix/farm-soneium-issue
sameepsi Mar 31, 2025
0754683
Removed orderly
sameepsi Apr 1, 2025
9754359
Removed orderly
sameepsi Apr 1, 2025
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
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,5 @@ REACT_APP_PASSPORT_CLIENT_ID="C0jTTUsIDawXEzwNndQ0GGiQE63hvdj6"
REACT_APP_PASSPORT_PUBLISHABLE_KEY="pk_imapik-wMbkTLhUd0N9My@3kZ1L"
REACT_APP_QUICK_BURN_AMOUNT_URL="https://script.google.com/macros/s/AKfycbx3J09UZx7ALs-gY4mxiD2CLODs7uCVgcZzMLFdrPKx5u83WFY0e9vvVBJd5U0mWD-12A/exec"
REACT_APP_QUICK_BURN_APY_URL="https://script.google.com/macros/s/AKfycbwaapPTyJ4haGLv7Ml3z3j-ZpmjqGMIfksUA39o-wG56todJ66enyhyC-TLWG4jkhQ_/exec"
REACT_APP_ORDERLY_API_URL="https://api-evm.orderly.org"
REACT_APP_ORDERLY_API_URL="https://api-evm01.orderly.org"
REACT_APP_SOULZAP_API_ENDPOINT="https://soulsolidity-zap-api-902f1d839e8d.herokuapp.com"
314 changes: 156 additions & 158 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,164 +173,162 @@ 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>
<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>
</QueryClientProvider>
</SoulZapApiClient.Provider>
</ArcxAnalyticsProvider>
Expand Down
10 changes: 5 additions & 5 deletions src/components/AssetModal/AssetModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ const AssetModal: React.FC<AssetModalProps> = ({
const currency = useCurrency(token?.address);
const { account } = useAccount();
const [depositTx, setDepositTx] = useState<any>(undefined);
const { data } = useQuery<API.Token[]>(
/**const { data } = useQuery<API.Token[]>(
`/v1/public/token/?chain_id=${chainId}`,
);
);*/

let withdrawalFee = 1;
const withdrawalFee = 1;

if (data) {
/**if (data) {
withdrawalFee = data[0].chain_details[0].withdrawal_fee;
}
}*/

const [aggregatedData] = usePositionStream();
const unsettledPnl = Number(aggregatedData?.aggregated?.unsettledPnL ?? 0);
Expand Down
2 changes: 1 addition & 1 deletion src/config/polygon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"available": false
},
"perpsV2": {
"available": true
"available": false
},
"bos": {
"available": false
Expand Down
2 changes: 1 addition & 1 deletion src/config/zkmainnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"available": true
},
"perps": {
"available": true
"available": false
},
"hydra": {
"available": true
Expand Down
2 changes: 2 additions & 0 deletions src/hooks/v3/useV3Farms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ export const useGetMerklFarms = () => {
}
resFarmData.push(...farmData);
}

if (!resFarmData) return [];
const farmList: any[] = [];
resFarmData.forEach((farmData: any) => {
Expand Down Expand Up @@ -396,6 +397,7 @@ export const useGetMerklFarms = () => {

farmList.push(farm);
});

return farmList;
};
const lastTx = useLastTransactionHash();
Expand Down
Loading