diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index dc0e49199..97d3a8a5a 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -23,7 +23,7 @@ jobs: with: name: preview separator: P - advanced-tools-branch: feature/include-scroll-mantle-xlayer + advanced-tools-branch: advanced-tools environment: Cloudflare-Preview public-url: "/${{ needs.branch-sha.outputs.value }}" wac-url-template: "https://allez-xyz--usds-*.modal.run" diff --git a/apps/connect-v1/src/components/atoms/BuiltBy.tsx b/apps/connect-v1/src/components/atoms/BuiltBy.tsx new file mode 100644 index 000000000..55ee2848f --- /dev/null +++ b/apps/connect-v1/src/components/atoms/BuiltBy.tsx @@ -0,0 +1,45 @@ +import { styled } from "@mui/material"; +import { FONT_SIZE } from "../../theme/portal"; +import { Link } from "./Link"; + +const Container = styled("div")(() => ({ + display: "flex", + alignItems: "center", + gap: 12, + fontSize: FONT_SIZE.S, + whiteSpace: "nowrap", +})); + +export const BuiltBy = ({ logoWidth = 28 }: { logoWidth?: number }) => ( + + Built by + + + + + + + + + + +); diff --git a/apps/connect-v1/src/components/atoms/Container.tsx b/apps/connect-v1/src/components/atoms/Container.tsx index be8ff8428..89412cf86 100644 --- a/apps/connect-v1/src/components/atoms/Container.tsx +++ b/apps/connect-v1/src/components/atoms/Container.tsx @@ -11,6 +11,7 @@ const InnerWrapper = styled("div")(({ theme }) => ({ maxWidth: 1440, margin: "auto", padding: `${theme.spacing(3)} `, + rowGap: theme.spacing(3), })); export const Wrapper = memo(({ children }: PropsWithChildren) => { diff --git a/apps/connect-v1/src/components/atoms/Footer.tsx b/apps/connect-v1/src/components/atoms/Footer.tsx index 259ec48a4..d4df1d14c 100644 --- a/apps/connect-v1/src/components/atoms/Footer.tsx +++ b/apps/connect-v1/src/components/atoms/Footer.tsx @@ -2,27 +2,46 @@ import { styled } from "@mui/material"; import { ENV } from "@env"; import { Link } from "./Link"; +import { BuiltBy } from "./BuiltBy"; +import { SocialMedia } from "./SocialMedia"; -const LinkContainer = styled("footer")(({ theme }) => ({ +const Container = styled("footer")(() => ({ + display: "flex", + flexDirection: "row", + justifyContent: "space-between", + alignItems: "center", + gap: 16, +})); + +const LinkContainer = styled("div")(({ theme }) => ({ display: "flex", flexDirection: "column", alignItems: "flex-start", gap: theme.spacing(1), + [theme.breakpoints.down("sm")]: { + maxWidth: 52, + }, })); export const Footer = () => { return ( - - {[ - { - label: "Privacy Policy", - href: `${ENV.PUBLIC_URL}/#/privacy-policy/`, - }, - ].map(({ label, href }) => ( - - {label} - - ))} - + + + + + {[ + { + label: "Privacy Policy", + href: `${ENV.PUBLIC_URL}/#/privacy-policy/`, + }, + ].map(({ label, href }) => ( + + {label} + + ))} + + + + ); }; diff --git a/apps/connect-v1/src/components/atoms/SocialMedia.tsx b/apps/connect-v1/src/components/atoms/SocialMedia.tsx new file mode 100644 index 000000000..fe3a7a696 --- /dev/null +++ b/apps/connect-v1/src/components/atoms/SocialMedia.tsx @@ -0,0 +1,59 @@ +import { styled, Tooltip } from "@mui/material"; +import { FONT_SIZE } from "../../theme/portal"; +import { Link } from "./Link"; + +const Container = styled("div")(() => ({ + display: "flex", + alignItems: "center", + justifyContent: "end", + width: 90, + gap: 16, +})); + +export const SocialMedia = () => ( + + Join our community on X! + } + arrow + > + + + + + + + + Chat with us on Discord! + } + arrow + > + + + + + + + +); diff --git a/apps/connect-v1/src/env/common.ts b/apps/connect-v1/src/env/common.ts index af6f37a9f..cbb4ee359 100644 --- a/apps/connect-v1/src/env/common.ts +++ b/apps/connect-v1/src/env/common.ts @@ -6,7 +6,7 @@ const rpcs = (chains: string[], template: (chain: string) => string) => .map((chain: string) => ({ [chain]: template(chain) })) .reduce((acc, cur) => ({ ...acc, ...cur }), {}); const asRpcHost = (chain: string) => - `https://and76cjzpa.execute-api.us-east-2.amazonaws.com/${chain.toLowerCase()}/`; + `http://rpc.portalbridge.com/${chain.toLowerCase()}/`; export const chains = [ "wormchain", "osmosis", diff --git a/apps/connect/package-lock.json b/apps/connect/package-lock.json index 2be55667a..a7cd82edc 100644 --- a/apps/connect/package-lock.json +++ b/apps/connect/package-lock.json @@ -1,12 +1,12 @@ { "name": "@xlabs/portal-bridge-ui", - "version": "0.2.19", + "version": "0.2.20", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@xlabs/portal-bridge-ui", - "version": "0.2.19", + "version": "0.2.20", "dependencies": { "@aptos-labs/ts-sdk": "^1.33.1", "@emotion/react": "^11.11.1", diff --git a/apps/connect/package.json b/apps/connect/package.json index 41f4e504c..cbff19c6a 100644 --- a/apps/connect/package.json +++ b/apps/connect/package.json @@ -1,7 +1,7 @@ { "name": "@xlabs/portal-bridge-ui", "private": true, - "version": "0.2.19", + "version": "0.2.20", "type": "module", "scripts": { "dev:usdc-bridge": "vite --config ./vite.usdc-bridge.config.ts", diff --git a/apps/connect/public/data/banners.json b/apps/connect/public/data/banners.json index dfc44ed8e..c537b805f 100644 --- a/apps/connect/public/data/banners.json +++ b/apps/connect/public/data/banners.json @@ -1,9 +1,9 @@ [ { "id": "string", - "background": "linear-gradient(90deg, rgba(6,132,249,1) 30%, rgba(0,64,124,1) 71%, rgba(8,8,44,1) 100%)", + "background": "linear-gradient(90deg, rgba(8,8,44,0) 0%, rgba(0,64,124,0.9948573179271709) 20%, rgba(6,132,249,1) 50%, rgba(0,64,124,1) 80%, rgba(8,8,44,1) 100%)", "content": { - "text": "Claim Your Rewards! The W staking rewards are now available for claiming." + "text": "Claim your rewards! W staking rewards can now be claimed." }, "button": { "href": "https://w.wormhole.com/", @@ -15,7 +15,7 @@ }, { "id": "string1", - "background": "linear-gradient(90deg, rgba(6,132,249,1) 30%, rgba(0,64,124,1) 71%, rgba(8,8,44,1) 100%)", + "background": "linear-gradient(90deg, rgba(8,8,44,0) 0%, rgba(0,64,124,0.9948573179271709) 20%, rgba(6,132,249,1) 50%, rgba(0,64,124,1) 80%, rgba(8,8,44,1) 100%)", "content": { "text": "Get Ready for the Next Phase of W Staking. Stay tuned for updates on the start of the next staking period." }, diff --git a/apps/connect/src/components/atoms/Bar.tsx b/apps/connect/src/components/atoms/Bar.tsx index 41a2d00ea..326fcf35d 100644 --- a/apps/connect/src/components/atoms/Bar.tsx +++ b/apps/connect/src/components/atoms/Bar.tsx @@ -14,7 +14,7 @@ const Container = styled("div")( alignItems: "center", justifyContent: "center", width: "100%", - height: "56px", + height: 40, [theme.breakpoints.down("md")]: { height: "auto", flexDirection: "column", diff --git a/apps/connect/src/components/atoms/BuiltBy.tsx b/apps/connect/src/components/atoms/BuiltBy.tsx index f02644412..55ee2848f 100644 --- a/apps/connect/src/components/atoms/BuiltBy.tsx +++ b/apps/connect/src/components/atoms/BuiltBy.tsx @@ -1,30 +1,45 @@ +import { styled } from "@mui/material"; +import { FONT_SIZE } from "../../theme/portal"; import { Link } from "./Link"; -export const BuiltBy = () => ( - - - - - - - +const Container = styled("div")(() => ({ + display: "flex", + alignItems: "center", + gap: 12, + fontSize: FONT_SIZE.S, + whiteSpace: "nowrap", +})); + +export const BuiltBy = ({ logoWidth = 28 }: { logoWidth?: number }) => ( + + Built by + + + + + + + + + + ); diff --git a/apps/connect/src/components/atoms/Container.tsx b/apps/connect/src/components/atoms/Container.tsx index be8ff8428..89412cf86 100644 --- a/apps/connect/src/components/atoms/Container.tsx +++ b/apps/connect/src/components/atoms/Container.tsx @@ -11,6 +11,7 @@ const InnerWrapper = styled("div")(({ theme }) => ({ maxWidth: 1440, margin: "auto", padding: `${theme.spacing(3)} `, + rowGap: theme.spacing(3), })); export const Wrapper = memo(({ children }: PropsWithChildren) => { diff --git a/apps/connect/src/components/atoms/Footer.tsx b/apps/connect/src/components/atoms/Footer.tsx index fcc206408..d4df1d14c 100644 --- a/apps/connect/src/components/atoms/Footer.tsx +++ b/apps/connect/src/components/atoms/Footer.tsx @@ -3,12 +3,14 @@ import { styled } from "@mui/material"; import { ENV } from "@env"; import { Link } from "./Link"; import { BuiltBy } from "./BuiltBy"; +import { SocialMedia } from "./SocialMedia"; const Container = styled("footer")(() => ({ display: "flex", flexDirection: "row", justifyContent: "space-between", - alignItems: "flex-end", + alignItems: "center", + gap: 16, })); const LinkContainer = styled("div")(({ theme }) => ({ @@ -16,11 +18,16 @@ const LinkContainer = styled("div")(({ theme }) => ({ flexDirection: "column", alignItems: "flex-start", gap: theme.spacing(1), + [theme.breakpoints.down("sm")]: { + maxWidth: 52, + }, })); export const Footer = () => { return ( + + {[ { @@ -33,7 +40,8 @@ export const Footer = () => { ))} - + + ); }; diff --git a/apps/connect/src/components/atoms/NewsBarButton.tsx b/apps/connect/src/components/atoms/NewsBarButton.tsx index 18150aeb7..d7771ac88 100644 --- a/apps/connect/src/components/atoms/NewsBarButton.tsx +++ b/apps/connect/src/components/atoms/NewsBarButton.tsx @@ -19,7 +19,7 @@ const Link = styled(MuiLink)<{ backgroundColor: string }>( fontSize: FONT_SIZE.XS, letterSpacing: "0.08em", fontWeight: 600, - minHeight: "32px", + minHeight: 28, minWidth: "fit-content", fontFamily: "Poppins", wordWrap: "break-word", diff --git a/apps/connect/src/components/atoms/SocialMedia.tsx b/apps/connect/src/components/atoms/SocialMedia.tsx new file mode 100644 index 000000000..fe3a7a696 --- /dev/null +++ b/apps/connect/src/components/atoms/SocialMedia.tsx @@ -0,0 +1,59 @@ +import { styled, Tooltip } from "@mui/material"; +import { FONT_SIZE } from "../../theme/portal"; +import { Link } from "./Link"; + +const Container = styled("div")(() => ({ + display: "flex", + alignItems: "center", + justifyContent: "end", + width: 90, + gap: 16, +})); + +export const SocialMedia = () => ( + + Join our community on X! + } + arrow + > + + + + + + + + Chat with us on Discord! + } + arrow + > + + + + + + + +); diff --git a/apps/connect/src/env/common.ts b/apps/connect/src/env/common.ts index b723ecaad..b800d258f 100644 --- a/apps/connect/src/env/common.ts +++ b/apps/connect/src/env/common.ts @@ -6,7 +6,7 @@ const rpcs = (chains: string[], template: (chain: string) => string) => .map((chain: string) => ({ [chain]: template(chain) })) .reduce((acc, cur) => ({ ...acc, ...cur }), {}); const asRpcHost = (chain: string) => - `https://and76cjzpa.execute-api.us-east-2.amazonaws.com/${chain.toLowerCase()}/`; + `http://rpc.portalbridge.com/${chain.toLowerCase()}/`; export const chains = [ "Wormchain", "Osmosis", @@ -34,7 +34,7 @@ export const MAINNET_RPCS = { ...rpcs(chains, asRpcHost), Klaytn: "https://public-en.node.kaia.io/", Solana: "https://wormhole.rpcpool.com/", - Aptos: "https://and76cjzpa.execute-api.us-east-2.amazonaws.com/aptos/v1", + Aptos: "http://rpc.portalbridge.com/aptos/v1", }; export const PUBLIC_URL = envVars.VITE_PUBLIC_URL || ""; diff --git a/apps/connect/src/env/token-bridge.mainnet.ts b/apps/connect/src/env/token-bridge.mainnet.ts index 917e012ea..fdef00855 100644 --- a/apps/connect/src/env/token-bridge.mainnet.ts +++ b/apps/connect/src/env/token-bridge.mainnet.ts @@ -820,6 +820,19 @@ export const ENV: Env = { }, }, tokensConfig: { + TRUMP: { + key: "TRUMP", + symbol: "TRUMP", + displayName: "Official Trump", + nativeChain: "Solana", + tokenId: { + chain: "Solana", + address: "6p6xgHyF7AeE6TZkSmFsko444wqoP15icUSqi2jfGiPN", + }, + icon: "https://assets.coingecko.com/coins/images/53746/large/trump.png?1737171561", + coinGeckoId: "official-trump", + decimals: 6, + }, stBTC: { key: "stBTC", symbol: "stBTC", diff --git a/apps/rewards-dashboard/src/components/Footer.tsx b/apps/rewards-dashboard/src/components/Footer.tsx index 94b29228c..7993ceabb 100644 --- a/apps/rewards-dashboard/src/components/Footer.tsx +++ b/apps/rewards-dashboard/src/components/Footer.tsx @@ -3,28 +3,55 @@ import { NavItem } from "../quarks/NavItem"; export const Footer = () => { return ( -