diff --git a/.env.staging b/.env similarity index 87% rename from .env.staging rename to .env index 1a8a4baec8e..8bfd43b274d 100644 --- a/.env.staging +++ b/.env @@ -12,6 +12,6 @@ REACT_APP_MOONPAY_LINK="https://us-central1-uniswap-mobile.cloudfunctions.net/si REACT_APP_MOONPAY_PUBLISHABLE_KEY="pk_test_DycfESRid31UaSxhI5yWKe1r5E5kKSz" #REACT_APP_SENTRY_DSN="https://a3c62e400b8748b5a8d007150e2f38b7@o1037921.ingest.sentry.io/4504255148851200" #REACT_APP_STATSIG_PROXY_URL="https://api.uniswap.org/v1/statsig-proxy" -REACT_APP_TEMP_API_URL = "https://temp-api.stg.swap.country" # routing-api v1 -REACT_APP_UNISWAP_API_URL = "https://api.stg.swap.country" # routing-api-v2 (Unified Routing API) +REACT_APP_TEMP_API_URL = "https://temp-api.harmony.one" # routing-api v1 +REACT_APP_UNISWAP_API_URL = "https://api.harmony.one" # routing-api-v2 (Unified Routing API) REACT_APP_WALLET_CONNECT_PROJECT_ID="c6c9bacd35afa3eb9e6cccf6d8464395" \ No newline at end of file diff --git a/.gitignore b/.gitignore index c4d21ace212..e6c9c481eb2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ # See https://help.github.com/ignore-files/ for more about ignoring files. -.env # generated contract types /src/types/v3 diff --git a/public/manifest.json b/public/manifest.json index fa6fe93e550..0777b627107 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,10 +1,10 @@ { "background_color": "#fff", "display": "standalone", - "homepage_url": "https://swap.country/", + "homepage_url": "https://swap.harmony.one/", "providedBy": { "name": "Swap", - "url": "https://swap.country/" + "url": "https://swap.harmony.one/" }, "icons": [ { diff --git a/src/components/NavBar/index.tsx b/src/components/NavBar/index.tsx index 15b3b49f97d..60870279f5c 100644 --- a/src/components/NavBar/index.tsx +++ b/src/components/NavBar/index.tsx @@ -8,7 +8,6 @@ import { useIsNftPage } from 'hooks/useIsNftPage' import { useIsPoolsPage } from 'hooks/useIsPoolsPage' import { Box } from 'nft/components/Box' import { Row } from 'nft/components/Flex' -import { UniIcon } from 'nft/components/icons' import { useProfilePageState } from 'nft/hooks' import { ProfilePageStateType } from 'nft/types' import { ReactNode, useCallback } from 'react' @@ -20,7 +19,6 @@ import { Bag } from './Bag' import Blur from './Blur' import { ChainSelector } from './ChainSelector' import { MenuDropdown } from './MenuDropdown' -import { SearchBar } from './SearchBar' import * as styles from './style.css' const Nav = styled.nav` @@ -34,7 +32,7 @@ interface MenuItemProps { href: string id?: NavLinkProps['id'] isActive?: boolean - external? : boolean + external?: boolean children: ReactNode dataTestId?: string } @@ -44,30 +42,22 @@ const MenuItem = ({ href, dataTestId, id, isActive, external, children }: MenuIt className: isActive ? styles.activeMenuItem : styles.menuItem, id, style: { textDecoration: 'none' }, - 'data-testid': dataTestId - }; + 'data-testid': dataTestId, + } if (external) { return ( - + {children} - ); + ) } return ( - + {children} - ); + ) } export const PageTabs = () => { @@ -85,7 +75,7 @@ export const PageTabs = () => { Swap -{/* + {/* Tokens */} {!shouldDisableNFTRoutes && ( @@ -98,11 +88,11 @@ export const PageTabs = () => { Positions - - Pools + + Pools - - Tokens + + Tokens @@ -141,7 +131,7 @@ const Navbar = ({ blur }: { blur: boolean }) => { height="48" data-testid="harmony-logo" className={styles.logo} - src='/logo_fav.png' + src="/logo_fav.png" onClick={() => { navigate({ pathname: '/', diff --git a/src/components/PrivacyPolicy/index.tsx b/src/components/PrivacyPolicy/index.tsx index e97aeb04ce6..e1fa2b90647 100644 --- a/src/components/PrivacyPolicy/index.tsx +++ b/src/components/PrivacyPolicy/index.tsx @@ -124,7 +124,7 @@ function PrivacyPolicy() { - + @@ -137,7 +137,7 @@ function PrivacyPolicy() { - + diff --git a/src/components/SwapCountryToSModal/index.tsx b/src/components/SwapCountryToSModal/index.tsx index bfd985aa998..7b79f41c173 100644 --- a/src/components/SwapCountryToSModal/index.tsx +++ b/src/components/SwapCountryToSModal/index.tsx @@ -21,7 +21,7 @@ export default function SwapCountryToSModal() {