Skip to content
Open
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@uniswap/analytics-events": "2.43.0",
"@uniswap/client-embeddedwallet": "0.0.16",
"@uniswap/sdk-core": "7.9.0",
"@uniswap/universal-router-sdk": "4.19.5",
"@hkdex-tmp/universal_router_sdk": "1.0.3",
"@uniswap/v3-sdk": "3.25.2",
"@uniswap/v4-sdk": "1.21.2",
"@universe/api": "workspace:^",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CommandType } from '@uniswap/universal-router-sdk'
import { CommandType } from '@hkdex-tmp/universal_router_sdk'
import { FeeAmount as FeeAmountV3 } from '@uniswap/v3-sdk'
import { BigNumberSchema } from 'src/app/features/dappRequests/types/EthersTypes'
import { z } from 'zod'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CommandParser, UniversalRouterCall } from '@uniswap/universal-router-sdk'
import { CommandParser, UniversalRouterCall } from '@hkdex-tmp/universal_router_sdk'
import { V4BaseActionsParser, V4RouterCall } from '@uniswap/v4-sdk'
import { EthSendTransactionRPCActions } from 'src/app/features/dappRequests/types/DappRequestTypes'
import { parseCalldata as parseNfPMCalldata } from 'src/app/features/dappRequests/types/NonfungiblePositionManager'
Expand Down
4 changes: 2 additions & 2 deletions apps/extension/wxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export default defineConfig({
'@uniswap/v3-sdk',
'@uniswap/v4-sdk',
'@uniswap/router-sdk',
'@uniswap/universal-router-sdk',
'@hkdex-tmp/universal_router_sdk',
'@uniswap/uniswapx-sdk',
'@uniswap/permit2-sdk',
'jsbi',
Expand Down Expand Up @@ -286,7 +286,7 @@ export default defineConfig({
'@uniswap/v3-sdk',
'@uniswap/v4-sdk',
'@uniswap/router-sdk',
'@uniswap/universal-router-sdk',
'@hkdex-tmp/universal_router_sdk',
'@uniswap/uniswapx-sdk',
'@uniswap/permit2-sdk',
'jsbi',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ exports[`PrivateKeySpeedBumpModal renders correctly 1`] = `
disabled={false}
focusVisibleStyle={
{
"backgroundColor": "#E500A5",
"backgroundColor": "#3d7fff",
}
}
forwardedRef={[Function]}
Expand All @@ -462,7 +462,7 @@ exports[`PrivateKeySpeedBumpModal renders correctly 1`] = `
{
"alignItems": "center",
"alignSelf": "stretch",
"backgroundColor": "#FF37C7",
"backgroundColor": "#4177e2",
"borderBottomColor": "transparent",
"borderBottomLeftRadius": 16,
"borderBottomRightRadius": 16,
Expand Down Expand Up @@ -504,7 +504,7 @@ exports[`PrivateKeySpeedBumpModal renders correctly 1`] = `
{
"alignItems": "center",
"alignSelf": "stretch",
"backgroundColor": "#FF37C7",
"backgroundColor": "#4177e2",
"borderBottomColor": "transparent",
"borderBottomLeftRadius": 16,
"borderBottomRightRadius": 16,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ exports[`FavoriteHeaderRow when editing renders without error 1`] = `
maxFontSizeMultiplier={1.2}
style={
{
"color": "#FF37C7",
"color": "#4177e2",
"fontFamily": "Basel Grotesk",
"fontSize": 17,
"fontWeight": "500",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ exports[`renders selection circle 1`] = `
style={
{
"alignItems": "center",
"borderBottomColor": "#FF37C7",
"borderBottomColor": "#4177e2",
"borderBottomLeftRadius": 999999,
"borderBottomRightRadius": 999999,
"borderBottomWidth": 1,
"borderLeftColor": "#FF37C7",
"borderLeftColor": "#4177e2",
"borderLeftWidth": 1,
"borderRightColor": "#FF37C7",
"borderRightColor": "#4177e2",
"borderRightWidth": 1,
"borderStyle": "solid",
"borderTopColor": "#FF37C7",
"borderTopColor": "#4177e2",
"borderTopLeftRadius": 999999,
"borderTopRightRadius": 999999,
"borderTopWidth": 1,
Expand All @@ -28,7 +28,7 @@ exports[`renders selection circle 1`] = `
<View
style={
{
"backgroundColor": "#FF37C7",
"backgroundColor": "#4177e2",
"borderBottomLeftRadius": 999999,
"borderBottomRightRadius": 999999,
"borderTopLeftRadius": 999999,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ exports[`GenericImportForm renders a placeholder when there is no value 1`] = `
maxFontSizeMultiplier={1.2}
style={
{
"color": "#FF37C7",
"color": "#4177e2",
"fontFamily": "Basel Grotesk",
"fontSize": 15,
"fontWeight": "500",
Expand Down Expand Up @@ -269,7 +269,7 @@ exports[`GenericImportForm renders a placeholder when there is no value 1`] = `
"borderWidth": 0,
},
{
"color": "#FF37C7",
"color": "#4177e2",
"height": 16,
"width": 16,
},
Expand All @@ -284,7 +284,7 @@ exports[`GenericImportForm renders a placeholder when there is no value 1`] = `
vbWidth={16}
>
<RNSVGGroup
color="#FF37C7"
color="#4177e2"
fill={
{
"type": 2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ exports[`renders collection preview card 1`] = `
"borderWidth": 0,
},
{
"color": "#FF37C7",
"color": "#4177e2",
"height": 16,
"width": 16,
},
Expand All @@ -221,7 +221,7 @@ exports[`renders collection preview card 1`] = `
vbWidth={16}
>
<RNSVGGroup
color="#FF37C7"
color="#4177e2"
fill={null}
propList={
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ exports[`BackupScreen renders backup options when none are completed 1`] = `
"borderWidth": 0,
},
{
"color": "#FF37C7",
"color": "#4177e2",
"height": 16,
"width": 16,
},
Expand All @@ -386,7 +386,7 @@ exports[`BackupScreen renders backup options when none are completed 1`] = `
vbWidth={16}
>
<RNSVGGroup
color="#FF37C7"
color="#4177e2"
fill={null}
propList={
[
Expand Down Expand Up @@ -500,7 +500,7 @@ exports[`BackupScreen renders backup options when none are completed 1`] = `
maxFontSizeMultiplier={1.2}
style={
{
"color": "#FF37C7",
"color": "#4177e2",
"fontFamily": "Basel Grotesk",
"fontSize": 15,
"fontWeight": "500",
Expand Down Expand Up @@ -667,7 +667,7 @@ exports[`BackupScreen renders backup options when none are completed 1`] = `
"borderWidth": 0,
},
{
"color": "#FF37C7",
"color": "#4177e2",
"height": 12,
"width": 12,
},
Expand All @@ -682,7 +682,7 @@ exports[`BackupScreen renders backup options when none are completed 1`] = `
vbWidth={19}
>
<RNSVGGroup
color="#FF37C7"
color="#4177e2"
fill={null}
propList={
[
Expand Down Expand Up @@ -1322,7 +1322,7 @@ exports[`BackupScreen renders backup options when some are completed 1`] = `
"borderWidth": 0,
},
{
"color": "#FF37C7",
"color": "#4177e2",
"height": 16,
"width": 16,
},
Expand All @@ -1337,7 +1337,7 @@ exports[`BackupScreen renders backup options when some are completed 1`] = `
vbWidth={16}
>
<RNSVGGroup
color="#FF37C7"
color="#4177e2"
fill={null}
propList={
[
Expand Down Expand Up @@ -1451,7 +1451,7 @@ exports[`BackupScreen renders backup options when some are completed 1`] = `
maxFontSizeMultiplier={1.2}
style={
{
"color": "#FF37C7",
"color": "#4177e2",
"fontFamily": "Basel Grotesk",
"fontSize": 15,
"fontWeight": "500",
Expand Down Expand Up @@ -1618,7 +1618,7 @@ exports[`BackupScreen renders backup options when some are completed 1`] = `
"borderWidth": 0,
},
{
"color": "#FF37C7",
"color": "#4177e2",
"height": 12,
"width": 12,
},
Expand All @@ -1633,7 +1633,7 @@ exports[`BackupScreen renders backup options when some are completed 1`] = `
vbWidth={19}
>
<RNSVGGroup
color="#FF37C7"
color="#4177e2"
fill={null}
propList={
[
Expand Down
5 changes: 3 additions & 2 deletions apps/web/.env
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ REACT_APP_STATSIG_API_KEY="statsig_api_key"
REACT_APP_STATSIG_PROXY_URL="https://interface.gateway.uniswap.org/v1/statsig-proxy"
REACT_APP_TEMP_API_URL="https://temp.gateway.uniswap.org/v1"
REACT_APP_UNISWAP_BASE_API_URL="https://interface.gateway.uniswap.org"
REACT_APP_UNISWAP_GATEWAY_DNS="https://interface.gateway.uniswap.org/v2"
REACT_APP_UNISWAP_GATEWAY_DNS=https://zy95c64c3c.execute-api.ap-southeast-1.amazonaws.com/prod/v2
REACT_APP_WALLET_CONNECT_PROJECT_ID="c6c9bacd35afa3eb9e6cccf6d8464395"
REACT_APP_TRADING_API_KEY="TRADING_API_KEY"
REACT_APP_TRADING_API_KEY=
REACT_APP_IS_UNISWAP_INTERFACE=true
REACT_APP_TRADING_API_TEST_ENV=true
4 changes: 2 additions & 2 deletions apps/web/functions/components/metaTagInjector.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('metaTagInjectionMiddleware', () => {
'<meta name="description" content="Swap crypto on Ethereum, Base, Arbitrum, Polygon, Unichain and more. The DeFi platform trusted by millions."',
)
expect(responseText).toContain(
'<meta property="og:image" content="http://localhost:3000/images/1200x630_Rich_Link_Preview_Image.png"',
'<meta property="og:image" content="http://localhost:3000/images/hashkey-logo.png"',
)
expect(responseText).toContain('<meta property="og:image:width" content="1200"')
expect(responseText).toContain('<meta property="og:image:height" content="630"')
Expand All @@ -62,7 +62,7 @@ describe('metaTagInjectionMiddleware', () => {
expect(responseText).toContain('<meta property="twitter:card" content="summary_large_image"')
expect(responseText).toContain('<meta property="twitter:title" content="Uniswap Interface"')
expect(responseText).toContain(
'<meta property="twitter:image" content="http://localhost:3000/images/1200x630_Rich_Link_Preview_Image.png"',
'<meta property="twitter:image" content="http://localhost:3000/images/hashkey-logo.png"',
)
expect(responseText).toContain('<meta property="twitter:image:alt" content="Uniswap Interface"')
expect(responseText).toContain('<meta property="og:url" content="http://localhost:3000/"')
Expand Down
4 changes: 2 additions & 2 deletions apps/web/functions/components/metaTagInjector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ export async function metaTagInjectionMiddleware(c: Context, next: Next): Promis

data = exploreMeta
} else {
const imageUri = requestURL.origin + '/images/1200x630_Rich_Link_Preview_Image.png'
const imageUri = requestURL.origin + '/images/hashkey-logo.png'
data = {
title: 'Uniswap Interface',
title: 'HSKSwap',
image: imageUri,
url: c.req.url,
description:
Expand Down
4 changes: 2 additions & 2 deletions apps/web/functions/default.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ test.each(defaultUrls)('should inject metadata for valid collections', async (de
`<meta name="description" content="Swap crypto on Ethereum, Base, Arbitrum, Polygon, Unichain and more. The DeFi platform trusted by millions."`,
)
expect(body).toContain(
`<meta property="og:image" content="http://localhost:3000/images/1200x630_Rich_Link_Preview_Image.png"`,
`<meta property="og:image" content="http://localhost:3000/images/hashkey-logo.png"`,
)
expect(body).toContain(`<meta property="og:image:width" content="1200"`)
expect(body).toContain(`<meta property="og:image:height" content="630"`)
Expand All @@ -19,7 +19,7 @@ test.each(defaultUrls)('should inject metadata for valid collections', async (de
expect(body).toContain(`<meta property="twitter:card" content="summary_large_image"`)
expect(body).toContain(`<meta property="twitter:title" content="Uniswap Interface"`)
expect(body).toContain(
`<meta property="twitter:image" content="http://localhost:3000/images/1200x630_Rich_Link_Preview_Image.png"`,
`<meta property="twitter:image" content="http://localhost:3000/images/hashkey-logo.png"`,
)
expect(body).toContain(`<meta property="twitter:image:alt" content="Uniswap Interface"`)
})
17 changes: 12 additions & 5 deletions apps/web/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@
<head>
<meta charset="utf-8" />

<title>Uniswap Interface</title>
<title>HSKSwap | Trade Crypto on DeFi's Leading Exchange</title>

<!-- Vite uses / for public assets instead of %PUBLIC_URL% -->
<link rel="icon" type="image/svg+xml" href="/icons/hskswap-icon.svg" />
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
<link rel="alternate icon" type="image/png" href="/favicon.png" />
<link rel="shortcut icon" type="image/png" href="/favicon.png" />
<link rel="apple-touch-icon" sizes="192x192" href="/images/192x192_App_Icon.png" />
<link rel="apple-touch-icon" sizes="512x512" href="/images/512x512_App_Icon.png" />
<link rel="apple-touch-icon" sizes="192x192" href="/icons/hskswap-icon.svg" />
<link rel="apple-touch-icon" sizes="512x512" href="/icons/hskswap-icon.svg" />
<link rel="manifest" href="/manifest.json" />

<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<meta name="theme-color" content="#fff" />
Expand All @@ -18,13 +22,16 @@

<link rel="preconnect" href="https://interface.gateway.uniswap.org/" crossorigin/>
<link rel="preconnect" href="https://mainnet.infura.io/" crossorigin/>
<link rel="preconnect" href="https://fonts.googleapis.com" crossorigin/>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin/>

<link rel="preload" href="/fonts/Basel-Grotesk-Book.woff2" as="font" type="font/woff2" crossorigin />
<link rel="preload" href="/fonts/Basel-Grotesk-Medium.woff2" as="font" type="font/woff2" crossorigin />
<link href="https://fonts.googleapis.com/css2?family=Aleo:wght@400;500;600;700&display=swap" rel="stylesheet" />

<style>
* {
font-family: 'Basel', sans-serif;
font-family: 'Aleo', sans-serif;
box-sizing: border-box;
}

Expand Down Expand Up @@ -53,7 +60,7 @@

@supports (font-variation-settings: normal) {
* {
font-family: 'Basel', sans-serif;
font-family: 'Aleo', sans-serif;
}
}

Expand Down
4 changes: 3 additions & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@
"@popperjs/core": "2.11.8",
"@reach/dialog": "0.10.5",
"@reach/portal": "0.10.5",
"@reown/appkit": "^1.7.8",
"@reown/appkit-adapter-wagmi": "^1.0.0",
"@reduxjs/toolkit": "1.9.3",
"@rive-app/canvas": "2.19.0",
"@rive-app/react-canvas": "4.13.0",
Expand Down Expand Up @@ -201,7 +203,7 @@
"@uniswap/sdk-core": "7.9.0",
"@uniswap/token-lists": "1.0.0-beta.33",
"@uniswap/uniswapx-sdk": "3.0.0-beta.7",
"@uniswap/universal-router-sdk": "4.19.5",
"@hkdex-tmp/universal_router_sdk": "1.0.3",
"@uniswap/v2-core": "1.0.1",
"@uniswap/v2-sdk": "4.15.2",
"@uniswap/v3-core": "1.0.1",
Expand Down
4 changes: 4 additions & 0 deletions apps/web/public/csp.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@
"https://mainnet.era.zksync.io/",
"https://8mr3mthjba.execute-api.us-east-2.amazonaws.com",
"https://mainnet.unichain.org/",
"https://testnet.hsk.xyz",
"https://mainnet.hsk.xyz",
"https://*.hsk.xyz",
"https://api.web3modal.org",
"https://api.statsig.com",
"https://featuregates.org",
Expand All @@ -115,6 +118,7 @@
"https://assetsconfigcdn.org",
"https://prodregistryv2.org",
"https://cloudflare-dns.com",
"https://zy95c64c3c.execute-api.ap-southeast-1.amazonaws.com",
"https://beyondwickedmapping.org",
"wss://*.uniswap.org",
"wss://relay.walletconnect.com",
Expand Down
Binary file modified apps/web/public/favicon.ico
Binary file not shown.
Binary file modified apps/web/public/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/web/public/icons/hskswap-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading