Merge pull request #1361 from galacticcouncil/master

master=>rococo
galacticcouncil · Jun 5, 2024 · 5374cba · 5374cba
2 parents 8aeb032 + 894a871
commit 5374cba
Show file tree

Hide file tree

Showing 202 changed files with 1,611 additions and 1,105 deletions.
diff --git a/.env.development b/.env.development
@@ -6,7 +6,7 @@ VITE_GRAFANA_URL=https://grafana-api.play.hydration.cloud/api/ds/query
 VITE_GRAFANA_DSN=11
 VITE_ENV=development
 VITE_TRSRY_ADDR=7L53bUTBopuwFt3mKUfmkzgGLayYa1Yvn1hAg9v5UMrQzTfh
-VITE_WC_PROJECT_ID=c47a5369367ec2dad6b49c478eb772f9
+VITE_WC_PROJECT_ID=265a3fea03b46c14a46a201fbd6c552e
 VITE_HDX_CAIP_ID=polkadot:afdc188f45c71dacbaa0b62e16a91f72
 VITE_STABLECOIN_ASSET_ID=10
 VITE_FF_SETTINGS_ENABLED=true
@@ -17,4 +17,6 @@ VITE_EVM_CHAIN_ID=222222
 VITE_EVM_PROVIDER_URL=https://rpc.nice.hydration.cloud
 VITE_EVM_EXPLORER_URL=https://explorer.nice.hydration.cloud
 VITE_EVM_NATIVE_ASSET_ID=20
+VITE_MIGRATION_TRIGGER_DOMAIN="deploy-preview-1334--testnet-hydra-app.netlify.app"
+VITE_MIGRATION_TARGET_DOMAIN="testnet-app.hydradx.io"
 
diff --git a/.env.production b/.env.production
@@ -1,12 +1,12 @@
 VITE_PROVIDER_URL=wss://rpc.hydradx.cloud
-VITE_DOMAIN_URL=https://app.hydradx.io
+VITE_DOMAIN_URL=https://app.hydration.net
 VITE_INDEXER_URL=https://explorer.hydradx.cloud/graphql
 VITE_SQUID_URL=https://hydra-data-squid.play.hydration.cloud/graphql
 VITE_GRAFANA_URL=https://grafana.hydradx.cloud/api/ds/query
 VITE_GRAFANA_DSN=10
 VITE_ENV=production
 VITE_TRSRY_ADDR=7L53bUTBopuwFt3mKUfmkzgGLayYa1Yvn1hAg9v5UMrQzTfh
-VITE_WC_PROJECT_ID=c47a5369367ec2dad6b49c478eb772f9
+VITE_WC_PROJECT_ID=265a3fea03b46c14a46a201fbd6c552e
 VITE_HDX_CAIP_ID=polkadot:afdc188f45c71dacbaa0b62e16a91f72
 VITE_STABLECOIN_ASSET_ID=10
 VITE_FF_SETTINGS_ENABLED=false
@@ -16,4 +16,6 @@ VITE_REFERENDUM_DATA_URL=https://hydradx.subsquare.io/api/democracy/referendums
 VITE_EVM_CHAIN_ID=222222
 VITE_EVM_PROVIDER_URL=https://rpc.hydradx.cloud
 VITE_EVM_EXPLORER_URL=https://explorer.evm.hydration.cloud
-VITE_EVM_NATIVE_ASSET_ID=20
+VITE_EVM_NATIVE_ASSET_ID=20
+VITE_MIGRATION_TRIGGER_DOMAIN="app.hydradx.io"
+VITE_MIGRATION_TARGET_DOMAIN="app.hydration.net"
diff --git a/.env.rococo b/.env.rococo
@@ -6,7 +6,7 @@ VITE_GRAFANA_URL=https://grafana-api.play.hydration.cloud/api/ds/query
 VITE_GRAFANA_DSN=11
 VITE_ENV=rococo
 VITE_TRSRY_ADDR=7L53bUTBopuwFt3mKUfmkzgGLayYa1Yvn1hAg9v5UMrQzTfh
-VITE_WC_PROJECT_ID=c47a5369367ec2dad6b49c478eb772f9
+VITE_WC_PROJECT_ID=265a3fea03b46c14a46a201fbd6c552e
 VITE_HDX_CAIP_ID=polkadot:afdc188f45c71dacbaa0b62e16a91f72
 VITE_STABLECOIN_ASSET_ID=10
 VITE_FF_SETTINGS_ENABLED=false
@@ -17,3 +17,5 @@ VITE_EVM_CHAIN_ID=
 VITE_EVM_PROVIDER_URL=
 VITE_EVM_EXPLORER_URL=
 VITE_EVM_NATIVE_ASSET_ID=20
+VITE_MIGRATION_TRIGGER_DOMAIN=""
+VITE_MIGRATION_TARGET_DOMAIN=""
diff --git a/index.html b/index.html
@@ -1,26 +1,26 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>HydraDX Omnipool - An Ocean of Liquidity</title>
+    <title>Hydration  - An Ocean of Liquidity</title>
     <link rel="icon" href="/favicon.ico" />
-    <link rel="canonical" href="https://app.hydradx.io" />
+    <link rel="canonical" href="https://app.hydration.net" />
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
 
-    <meta name="title" content="HydraDX Omnipool - An Ocean of Liquidity" />
-    <meta name="description" content="HydraDX is a next-gen DeFi protocol which is designed to bring an ocean of liquidity to Polkadot. Our tool for the job the HydraDX Omnipool - an innovative Automated Market Maker (AMM) which unlocks unparalleled efficiencies by combining all assets in a single trading pool." />
+    <meta name="title" content="Hydration - An Ocean of Liquidity" />
+    <meta name="description" content="Hydration is a next-gen DeFi protocol which is designed to bring an ocean of liquidity to Polkadot. Our tool for the job the Hydration - an innovative Automated Market Maker (AMM) which unlocks unparalleled efficiencies by combining all assets in a single trading pool." />
 
-    <meta property="og:title" content="HydraDX Omnipool - An Ocean of Liquidity" />
-    <meta property="og:description" content="HydraDX is a next-gen DeFi protocol which is designed to bring an ocean of liquidity to Polkadot. Our tool for the job the HydraDX Omnipool - an innovative Automated Market Maker (AMM) which unlocks unparalleled efficiencies by combining all assets in a single trading pool." />
-    <meta property="og:image" content="https://app.hydradx.io/images/meta-image.jpg" />
-    <meta property="og:url" content="https://app.hydradx.io" />
+    <meta property="og:title" content="Hydration - An Ocean of Liquidity" />
+    <meta property="og:description" content="Hydration is a next-gen DeFi protocol which is designed to bring an ocean of liquidity to Polkadot. Our tool for the job the Hydration - an innovative Automated Market Maker (AMM) which unlocks unparalleled efficiencies by combining all assets in a single trading pool." />
+    <meta property="og:image" content="https://app.hydration.net/images/meta-image.jpg" />
+    <meta property="og:url" content="https://app.hydration.net" />
     <meta property="og:type" content="website" />
 
     <meta property="twitter:card" content="summary_large_image" />
-    <meta property="twitter:url" content="https://app.hydradx.io" />
-    <meta property="twitter:title" content="HydraDX Omnipool - An Ocean of Liquidity" />
-    <meta property="twitter:description" content="HydraDX is a next-gen DeFi protocol which is designed to bring an ocean of liquidity to Polkadot. Our tool for the job the HydraDX Omnipool - an innovative Automated Market Maker (AMM) which unlocks unparalleled efficiencies by combining all assets in a single trading pool." />
+    <meta property="twitter:url" content="https://app.hydration.net" />
+    <meta property="twitter:title" content="Hydration - An Ocean of Liquidity" />
+    <meta property="twitter:description" content="Hydration is a next-gen DeFi protocol which is designed to bring an ocean of liquidity to Polkadot. Our tool for the job the Hydration - an innovative Automated Market Maker (AMM) which unlocks unparalleled efficiencies by combining all assets in a single trading pool." />
   </head>
   <body>
     <div id="root"></div>

diff --git a/index.template.html b/index.template.html
@@ -3,7 +3,7 @@
   <head>
     <title><%= title %></title>
     <link rel="icon" href="/favicon.ico" />
-    <link rel="canonical" href="https://app.hydradx.io" />
+    <link rel="canonical" href="https://app.hydration.net" />
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
@@ -14,11 +14,11 @@
     <meta property="og:title" content="<%= title %>" />
     <meta property="og:description" content="<%= description %>" />
     <meta property="og:image" content="<%= image %>" />
-    <meta property="og:url" content="https://app.hydradx.io" />
+    <meta property="og:url" content="https://app.hydration.net" />
     <meta property="og:type" content="website" />
 
     <meta property="twitter:card" content="summary_large_image" />
-    <meta property="twitter:url" content="https://app.hydradx.io" />
+    <meta property="twitter:url" content="https://app.hydration.net" />
     <meta property="twitter:title" content="<%= title %>" />
     <meta property="twitter:description" content="<%= description %>" />
     <meta property="twitter:image" content="<%= image %>" />

diff --git a/netlify.toml b/netlify.toml
@@ -1,4 +1,24 @@
 [[redirects]]
     from = "/*"
     to = "/index.html"
-    status = 200
+    status = 200
+
+[[plugins]]
+    package = "@netlify/plugin-lighthouse"
+
+    [[plugins.inputs.audits]]
+        path = "trade/swap"
+    [[plugins.inputs.audits]]
+        path = "trade/yield-dca"
+    [[plugins.inputs.audits]]
+        path = "trade/dca"
+    [[plugins.inputs.audits]]
+        path = "trade/bonds"
+    [[plugins.inputs.audits]]
+       path = "liquidity/all-pools"
+    [[plugins.inputs.audits]]
+       path = "lwallet/assets"
+
+
+
+
diff --git a/package.json b/package.json
@@ -31,18 +31,18 @@
     "@emotion/styled": "^11.10.4",
     "@ethersproject/address": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",
-    "@galacticcouncil/apps": "^3.8.2",
+    "@galacticcouncil/apps": "^3.9.1",
     "@galacticcouncil/math-lbp": "^1.0.0",
     "@galacticcouncil/math-liquidity-mining": "^1.0.0",
     "@galacticcouncil/math-omnipool": "^1.0.0",
     "@galacticcouncil/math-stableswap": "^1.0.0",
     "@galacticcouncil/math-staking": "^1.0.0",
     "@galacticcouncil/math-xyk": "^1.0.0",
     "@galacticcouncil/sdk": "^3.0.0",
-    "@galacticcouncil/ui": "^3.1.18",
-    "@galacticcouncil/xcm-cfg": "^2.1.1",
-    "@galacticcouncil/xcm-core": "^1.0.0",
-    "@galacticcouncil/xcm-sdk": "^3.0.4",
+    "@galacticcouncil/ui": "^3.2.2",
+    "@galacticcouncil/xcm-cfg": "^2.5.0",
+    "@galacticcouncil/xcm-core": "^1.4.0",
+    "@galacticcouncil/xcm-sdk": "^3.3.0",
     "@hookform/resolvers": "^3.3.4",
     "@lit-labs/react": "^1.1.0",
     "@polkadot/api": "10.9.1",
@@ -168,6 +168,7 @@
     "prop-types": "^15.8.1",
     "storybook": "^8.1.1",
     "ts-node": "^10.9.1",
+    "unplugin-fonts": "^1.1.1",
     "vite": "4.4.6",
     "vite-plugin-svgr": "^4.2.0",
     "vite-tsconfig-paths": "^4.2.1",

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/src/App.tsx b/src/App.tsx
@@ -7,6 +7,8 @@ import { AppProviders } from "components/AppProviders/AppProviders"
 import { useEffect } from "react"
 import { routes } from "./routes"
 
+import "unfonts.css"
+
 const history = createBrowserHistory()
 const location = new ReactLocation({ history })
 

diff --git a/src/assets/fonts/ChakraPetch/ChakraPetch.ttf b/src/assets/fonts/ChakraPetch/ChakraPetch.ttf
diff --git a/src/assets/fonts/ChakraPetch/ChakraPetchBold.ttf b/src/assets/fonts/ChakraPetch/ChakraPetchBold.ttf
diff --git a/src/assets/fonts/ChakraPetch/ChakraPetchSemiBold.ttf b/src/assets/fonts/ChakraPetch/ChakraPetchSemiBold.ttf
diff --git a/src/assets/fonts/FontOver/FontOver.ttf b/src/assets/fonts/FontOver/FontOver.ttf
diff --git a/src/assets/fonts/Geist/Geist-Medium.ttf b/src/assets/fonts/Geist/Geist-Medium.ttf
diff --git a/src/assets/fonts/Geist/Geist-Regular.ttf b/src/assets/fonts/Geist/Geist-Regular.ttf
diff --git a/src/assets/fonts/Geist/Geist-SemiBold.ttf b/src/assets/fonts/Geist/Geist-SemiBold.ttf
diff --git a/src/assets/fonts/GeistMono/GeistMono-Regular.otf b/src/assets/fonts/GeistMono/GeistMono-Regular.otf
diff --git a/src/assets/fonts/GeistMono/GeistMono-SemiBold.otf b/src/assets/fonts/GeistMono/GeistMono-SemiBold.otf
diff --git a/src/assets/fonts/SatoshiVariable/SatoshiVariable.ttf b/src/assets/fonts/SatoshiVariable/SatoshiVariable.ttf
diff --git a/src/assets/icons/AccumulatedAsset.svg b/src/assets/icons/AccumulatedAsset.svg
diff --git a/src/assets/icons/AssetsIcon.svg b/src/assets/icons/AssetsIcon.svg
diff --git a/src/assets/icons/Dollar2Icon.svg b/src/assets/icons/Dollar2Icon.svg
diff --git a/src/assets/icons/FarmDetailsIcon.svg b/src/assets/icons/FarmDetailsIcon.svg