Skip to content

Commit

Permalink
Merge conflicts with main
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmytrotkk
dmytrotkk committed Aug 19, 2024
2 parents 4a92bd4 + 73e5b7c commit 4d0619c
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 2 deletions.
28 changes: 28 additions & 0 deletions config/mainnet.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ export const METAPORT_CONFIG: interfaces.MetaportConfig = {
"adorable-quaint-bellatrix": {},
"honorable-steel-rasalhague": {
hub: "elated-tan-skat"
},
"green-giddy-denebola": {
hub: "elated-tan-skat"
}
}
}
Expand Down Expand Up @@ -239,6 +242,9 @@ export const METAPORT_CONFIG: interfaces.MetaportConfig = {
},
'honorable-steel-rasalhague': {
wrapper: '0xa5274efA35EbeFF47C1510529D9a8812F95F5735'
},
'green-giddy-denebola': {
wrapper: '0xa5274efA35EbeFF47C1510529D9a8812F95F5735'
}
}
}
Expand Down Expand Up @@ -400,6 +406,10 @@ export const METAPORT_CONFIG: interfaces.MetaportConfig = {
mainnet: {
clone: true,
hub: 'elated-tan-skat'
},
"green-giddy-denebola": {
clone: true,
hub: "elated-tan-skat"
}
}
}
Expand Down Expand Up @@ -476,6 +486,24 @@ export const METAPORT_CONFIG: interfaces.MetaportConfig = {
}
},
"green-giddy-denebola": { // nebula connections
eth: {
eth: {
address: '0xaB01BAd2C86e24D371A13eD6367bdCa819589C5D',
chains: {
'elated-tan-skat': {
clone: true
},
mainnet: {
clone: true,
hub: 'elated-tan-skat'
},
"honorable-steel-rasalhague": {
clone: true,
hub: "elated-tan-skat"
}
}
}
},
erc20: {
skl: {
address: "0x7F73B66d4e6e67bCdeaF277b9962addcDabBFC4d",
Expand Down
5 changes: 5 additions & 0 deletions src/core/constants.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ export const BALANCE_UPDATE_INTERVAL_MS = _BALANCE_UPDATE_INTERVAL_SECONDS * 100

export const TRANSAK_STAGING_ENV = import.meta.env.VITE_TRANSAK_STAGING_ENV === 'true'
export const TRANSAK_API_KEY = import.meta.env.VITE_TRANSAK_API_KEY
export const DISABLE_TRANSAK = import.meta.env.VITE_DISABLE_TRANSAK === 'true'

export const DAPP_RADAR_BASE_URL = 'https://dappradar.com/dapp/'

Expand All @@ -80,6 +81,7 @@ export const STATS_API: { [key in types.SkaleNetwork]: string | null } = {
}

export const BASE_METADATA_URL =
<<<<<<< HEAD
'https://raw.githubusercontent.com/skalenetwork/skale-network/master/metadata/'

export const MAX_APPS_DEFAULT = 12
Expand All @@ -100,3 +102,6 @@ export const SKALE_SOCIAL_LINKS = {
swell: 'https://swell.skale.space/',
website: 'https://skale.space/'
}
=======
'https://raw.githubusercontent.com/skalenetwork/skale-network/old-main/metadata/'
>>>>>>> 73e5b7c005a37263b2863abc80d4b67579c32008
20 changes: 19 additions & 1 deletion src/pages/Onramp.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ import TokenBalanceTile from '../components/TokenBalanceTile'
import ConnectWallet from '../components/ConnectWallet'
import Message from '../components/Message'
import { getPaymasterChain } from '../core/paymaster'
import { MAINNET_CHAIN_NAME, TRANSAK_STAGING_ENV, TRANSAK_API_KEY } from '../core/constants'
import {
MAINNET_CHAIN_NAME,
TRANSAK_STAGING_ENV,
TRANSAK_API_KEY,
DISABLE_TRANSAK
} from '../core/constants'
import Tile from '../components/Tile'

const MOUNT_ID = 'transakMount'
Expand All @@ -52,6 +57,19 @@ export default function Onramp(props: { mpc: MetaportCore }) {
const chain = getPaymasterChain(props.mpc.config.skaleNetwork)
const isProd = props.mpc.config.skaleNetwork === MAINNET_CHAIN_NAME && !TRANSAK_STAGING_ENV

if (DISABLE_TRANSAK)
return (
<Container maxWidth="md">
<Tile
value="The SKALE On-ramp is currently unavailable for maintenance."
text="Temporary unavailable"
icon={<ErrorRoundedIcon />}
color="warning"
className={cls(cmn.mtop20)}
/>
</Container>
)

if (!chain)
return (
<Container maxWidth="sm">
Expand Down
2 changes: 1 addition & 1 deletion vercel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"headers": [
{
"key": "Content-Security-Policy",
"value": "default-src 'none'; script-src 'self' 'sha256-SNHZ9YXEiiZqb8C8s0qFvFzqzRfWcWHKYL4BGuapkm4=' 'sha256-B2Yvd5DSiyn3CHdK2XYukRft560++o3GfZ3FkbQ7cig=' https://app.geckoboard.com https://*.zendesk.com https://static.zdassets.com https://vercel.live; style-src 'self' 'unsafe-inline'; img-src 'self' * data:; connect-src 'self' https://ethereum-rpc.publicnode.com https://chain-proxy.wallet.coinbase.com wss://legacy-proxy.skaleserver.com wss://ethereum-holesky.publicnode.com https://legacy-proxy.skaleserver.com https://ethereum-holesky-rpc.publicnode.com https://raw.githubusercontent.com https://github.com https://skalenetwork.github.io wss://relay.walletconnect.com https://explorer-api.walletconnect.com https://cloudflare-eth.com https://ethereum.publicnode.com wss://ethereum.publicnode.com wss://mainnet.skalenodes.com https://mainnet.skalenodes.com https://vercel.live wss://www.walletlink.org https://app.geckoboard.com https://*.zendesk.com https://ekr.zdassets.com https://ekr.zendesk.com https://*.zopim.com https://zendesk-eu.my.sentry.io wss://*.zendesk.com wss://*.zopim.com https://api.coingecko.com https://ethgasstation.info https://*.infura.io https://*.skalenodes.com; font-src 'self'; object-src 'none'; frame-src https://global.transak.com https://global-stg.transak.com https://verify.walletconnect.com https://app.geckoboard.com; base-uri 'self'; form-action 'self'; frame-ancestors 'none'; manifest-src 'self';"
"value": "default-src 'none'; script-src 'self' 'sha256-9kFihJ0ZOM+GgbS9s6zRngAhk2HvawY3s9ThnvanBVU=' https://www.googletagmanager.com 'sha256-SNHZ9YXEiiZqb8C8s0qFvFzqzRfWcWHKYL4BGuapkm4=' 'sha256-B2Yvd5DSiyn3CHdK2XYukRft560++o3GfZ3FkbQ7cig=' https://app.geckoboard.com https://*.zendesk.com https://static.zdassets.com https://vercel.live; style-src 'self' 'unsafe-inline'; img-src 'self' www.googletagmanager.com * data:; connect-src 'self' https://chain-proxy.wallet.coinbase.com www.googletagmanager.com http://eth-node.skalenodes.com https://ethereum-rpc.publicnode.com wss://legacy-proxy.skaleserver.com wss://ethereum-holesky.publicnode.com https://legacy-proxy.skaleserver.com https://ethereum-holesky-rpc.publicnode.com https://raw.githubusercontent.com https://github.com https://skalenetwork.github.io wss://relay.walletconnect.com https://explorer-api.walletconnect.com https://cloudflare-eth.com https://ethereum.publicnode.com wss://ethereum.publicnode.com wss://mainnet.skalenodes.com https://mainnet.skalenodes.com https://vercel.live wss://www.walletlink.org https://app.geckoboard.com https://*.zendesk.com https://ekr.zdassets.com https://ekr.zendesk.com https://*.zopim.com https://zendesk-eu.my.sentry.io wss://*.zendesk.com wss://*.zopim.com https://api.coingecko.com https://ethgasstation.info https://*.infura.io https://*.skalenodes.com; font-src 'self'; object-src 'none'; frame-src https://global.transak.com https://global-stg.transak.com https://verify.walletconnect.com https://app.geckoboard.com; base-uri 'self'; form-action 'self'; frame-ancestors 'none'; manifest-src 'self';"
},
{
"key": "X-Content-Type-Options",
Expand Down

0 comments on commit 4d0619c

Please sign in to comment.