Skip to content
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.

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

chore: rename root app to evm app #978

Merged
merged 3 commits into from
Jul 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/apps-evm-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
defaults:
run:
# change this if your nextjs app does not live at the root of the repo
working-directory: ./apps/_root
working-directory: ./apps/evm

# https://playwright.dev/docs/ci#sharding
env:
Expand Down
7 changes: 0 additions & 7 deletions apps/_root/README.md

This file was deleted.

6 changes: 0 additions & 6 deletions apps/_root/next-env.d.ts

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 3 additions & 0 deletions apps/evm/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# EVM

EVM application
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import { z } from 'zod'
const queryParamsSchema = z.object({
id: z
.string()
.refine((val) => val.includes(':'), {
.refine((val) => val.includes('%3A'), {
message: 'PoolId not in the right format',
})
.transform((val) => {
const [chainId, poolId] = val.split(':')
const [chainId, poolId] = val.split('%3A')
return [+chainId, poolId] as [SushiSwapV2ChainId, string]
})
.refine(([chainId]) => isSushiSwapV2ChainId(chainId), {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions apps/_root/lib/api.ts → apps/evm/lib/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export async function getUser(args: { id?: string; chainIds?: ChainId[] }) {
}

export const getGraphPool = async (id: string) => {
if (!id.includes(':')) throw Error('Invalid pair id')
if (!id.includes('%3A')) throw Error('Invalid pair id')
// Migrating to new format, graph-client uses the deprecated one
const split = id.split(':')
const sdk = (await import('@sushiswap/graph-client').then((m) => m.getBuiltGraphSDK))()
Expand All @@ -174,7 +174,7 @@ export const getGraphPool = async (id: string) => {
}

export const getGraphPools = async (ids: string[]) => {
if (!ids.every((id) => id.includes(':'))) throw Error('Invalid pair ids')
if (!ids.every((id) => id.includes('%3A'))) throw Error('Invalid pair ids')

// Migrating to new format, graph-client uses the deprecated one
const addresses = ids.map((id) => id.split(':')[1])
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const useTokensFromPool = (pool: Pool) => {
? Native.onChain(_token1.chainId)
: _token1,
new Token({
address: pool.id.includes(':') ? pool.id.split(':')[1] : pool.id,
address: pool.id.includes() ? pool.id.split(':')[1] : pool.id,
name: 'SLP Token',
decimals: 18,
symbol: 'SLP',
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion apps/_root/package.json → apps/evm/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "root",
"name": "evm",
"version": "0.0.0",
"private": true,
"scripts": {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const AddSectionReviewModalTrident: FC<AddSectionReviewModalTridentProps>
const { approved } = useApproved(APPROVE_TAG_ADD_TRIDENT)
const liquidityToken = useMemo(() => {
return new Token({
address: poolAddress.includes(':') ? poolAddress.split(':')[1] : poolAddress,
address: poolAddress.includes('%3A') ? poolAddress.split('%3A')[1] : poolAddress,
name: 'SLP Token',
decimals: 18,
symbol: 'SLP',
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const PoolPageV3 = () => {
const queryParamsSchema = z.object({
id: z
.string()
.refine((val) => val.includes(':'), {
.refine((val) => val.includes('%3A'), {
message: 'TokenId not in the right format',
})
.transform((val) => {
Expand Down
Loading
Loading