diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 64bf0ca..784851e 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -46,7 +46,7 @@ jobs: VITE_APP_NETWORK: local VITE_NETWORK_TYPE: testnet VITE_RPC_URL_1337: http://127.0.0.1:8545 - VITE_RPC_URL_80002: https://rpc-amoy.polygon.technology/ + VITE_RPC_URL_80002: https://polygon-amoy.drpc.org VITE_RPC_URL_137: https://rpc.ankr.com/polygon # Analytics disabled in E2E — no events sent to GA4/GTM during test runs VITE_GTM_CONTAINER_ID: '' diff --git a/public/fonts/GilroyBold/font.woff b/public/fonts/GilroyBold/font.woff deleted file mode 100755 index 9f27086..0000000 Binary files a/public/fonts/GilroyBold/font.woff and /dev/null differ diff --git a/public/fonts/GilroyBold/font.woff2 b/public/fonts/GilroyBold/font.woff2 deleted file mode 100755 index fb9e334..0000000 Binary files a/public/fonts/GilroyBold/font.woff2 and /dev/null differ diff --git a/public/fonts/GilroyExtraBold/font.woff b/public/fonts/GilroyExtraBold/font.woff deleted file mode 100755 index 81208a8..0000000 Binary files a/public/fonts/GilroyExtraBold/font.woff and /dev/null differ diff --git a/public/fonts/GilroyExtraBold/font.woff2 b/public/fonts/GilroyExtraBold/font.woff2 deleted file mode 100755 index 3a59a2a..0000000 Binary files a/public/fonts/GilroyExtraBold/font.woff2 and /dev/null differ diff --git a/public/fonts/GilroyLight/font.woff b/public/fonts/GilroyLight/font.woff deleted file mode 100755 index 31e561e..0000000 Binary files a/public/fonts/GilroyLight/font.woff and /dev/null differ diff --git a/public/fonts/GilroyLight/font.woff2 b/public/fonts/GilroyLight/font.woff2 deleted file mode 100755 index d349da6..0000000 Binary files a/public/fonts/GilroyLight/font.woff2 and /dev/null differ diff --git a/public/fonts/GilroyMedium/font.woff b/public/fonts/GilroyMedium/font.woff deleted file mode 100755 index 1e343fa..0000000 Binary files a/public/fonts/GilroyMedium/font.woff and /dev/null differ diff --git a/public/fonts/GilroyMedium/font.woff2 b/public/fonts/GilroyMedium/font.woff2 deleted file mode 100755 index 358bbf7..0000000 Binary files a/public/fonts/GilroyMedium/font.woff2 and /dev/null differ diff --git a/public/fonts/Urbanist/OFL.txt b/public/fonts/Urbanist/OFL.txt new file mode 100644 index 0000000..d96caaf --- /dev/null +++ b/public/fonts/Urbanist/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2021 The Urbanist Project Authors (https://github.com/coreyhu/Urbanist) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/public/fonts/Urbanist/Urbanist-Italic-Variable.woff2 b/public/fonts/Urbanist/Urbanist-Italic-Variable.woff2 new file mode 100644 index 0000000..e386e53 Binary files /dev/null and b/public/fonts/Urbanist/Urbanist-Italic-Variable.woff2 differ diff --git a/public/fonts/Urbanist/Urbanist-Variable.woff2 b/public/fonts/Urbanist/Urbanist-Variable.woff2 new file mode 100644 index 0000000..ff566ad Binary files /dev/null and b/public/fonts/Urbanist/Urbanist-Variable.woff2 differ diff --git a/src/components/about/CapabilityCard/CapabilityCard.tsx b/src/components/about/CapabilityCard/CapabilityCard.tsx index 817f532..f56979f 100644 --- a/src/components/about/CapabilityCard/CapabilityCard.tsx +++ b/src/components/about/CapabilityCard/CapabilityCard.tsx @@ -33,7 +33,7 @@ const CapabilityCard = ({ cap, isDarkMode }: CapabilityCardProps) => ( {cap.tags.map(tag => ( (

(

How TrustVC Powers Multiple Ecosystems diff --git a/src/components/common/AddressBookOverlay/AddressBookOverlay.tsx b/src/components/common/AddressBookOverlay/AddressBookOverlay.tsx index 7dd12db..238aeca 100644 --- a/src/components/common/AddressBookOverlay/AddressBookOverlay.tsx +++ b/src/components/common/AddressBookOverlay/AddressBookOverlay.tsx @@ -73,7 +73,7 @@ const AddressBookOverlay: React.FC = ({ {/* Header */}
Address Book @@ -102,7 +102,7 @@ const AddressBookOverlay: React.FC = ({
Address Book @@ -241,7 +241,7 @@ const AddressBookOverlay: React.FC = ({ {/* Wallet Name */}
= ({
{copiedAddress === entry.address ? ( = ({ border: '1px solid rgba(169, 178, 187, 0.33)', }} > - + Dismiss diff --git a/src/components/common/Button/Button.tsx b/src/components/common/Button/Button.tsx index 428a1ec..82bfd9c 100644 --- a/src/components/common/Button/Button.tsx +++ b/src/components/common/Button/Button.tsx @@ -19,7 +19,7 @@ const buttonSizeStyles = { // Base styles for all button components const baseButtonStyles = - 'flex flex-col justify-center items-center gap-2.5 box-border transition-colors duration-200 ease-out cursor-pointer font-gilroy font-bold text-center align-middle' + 'flex flex-col justify-center items-center gap-2.5 box-border transition-colors duration-200 ease-out cursor-pointer font-urbanist font-bold text-center align-middle' // Button type styles const getButtonTypeStyles = (btnType: 'solid' | 'transparent') => @@ -174,7 +174,7 @@ export const TextButton: FunctionComponent = ({ onClick={onClick} disabled={disabled} className={clsx( - 'bg-transparent border-none p-0 cursor-pointer font-gilroy font-bold', + 'bg-transparent border-none p-0 cursor-pointer font-urbanist font-bold', 'text-primary-50', `${disabled ? 'cursor-not-allowed opacity-50' : ''}`, className diff --git a/src/components/common/FormAlert/FormAlert.tsx b/src/components/common/FormAlert/FormAlert.tsx index 229e59b..e777752 100644 --- a/src/components/common/FormAlert/FormAlert.tsx +++ b/src/components/common/FormAlert/FormAlert.tsx @@ -13,7 +13,7 @@ const FormAlert = ({ isDarkMode, error, success }: FormAlertProps) => { role={error ? 'alert' : 'status'} aria-live={error ? 'assertive' : 'polite'} aria-atomic="true" - className={`form-alert w-full px-4 py-3 rounded-lg text-sm font-medium font-gilroy flex items-start gap-2 ${ + className={`form-alert w-full px-4 py-3 rounded-lg text-sm font-medium font-urbanist flex items-start gap-2 ${ error ? 'form-alert-error' : isDarkMode diff --git a/src/components/common/Icons/Icons.tsx b/src/components/common/Icons/Icons.tsx index 845455e..d69a113 100644 --- a/src/components/common/Icons/Icons.tsx +++ b/src/components/common/Icons/Icons.tsx @@ -223,7 +223,7 @@ export const FileIcon = ({ fill="white" fontSize="9" fontWeight="700" - fontFamily="Gilroy, sans-serif" + fontFamily="Urbanist, sans-serif" > {ext} diff --git a/src/components/common/Navbar/Navbar.tsx b/src/components/common/Navbar/Navbar.tsx index 0e47a95..dafc516 100644 --- a/src/components/common/Navbar/Navbar.tsx +++ b/src/components/common/Navbar/Navbar.tsx @@ -109,7 +109,7 @@ const Navbar = ({ isDarkMode, setIsDarkMode: _setIsDarkMode }: NavbarProps) => { }} >
{ }} >
{ }} >
{ to="/contact" className="contact-button w-full min-h-[48px] px-2 py-2 rounded-full overflow-hidden flex items-center justify-center" > -
+
Contact Us
@@ -274,7 +274,7 @@ const Navbar = ({ isDarkMode, setIsDarkMode: _setIsDarkMode }: NavbarProps) => {
{ { {/* Ecosystem and Gallery temporarily removed - restore from git */} { /> { setIsMobileMenuOpen(false)} - className="contact-button w-full px-6 py-3 rounded-full text-white text-lg font-bold font-['Gilroy'] block text-center mt-2" + className="contact-button w-full px-6 py-3 rounded-full text-white text-lg font-bold font-urbanist block text-center mt-2" > Contact Us diff --git a/src/components/common/PartnerCard/index.tsx b/src/components/common/PartnerCard/index.tsx index e3291c9..50f9928 100644 --- a/src/components/common/PartnerCard/index.tsx +++ b/src/components/common/PartnerCard/index.tsx @@ -84,7 +84,7 @@ const PartnerCard = ({ partner, isDarkMode }: PartnerCardProps) => { {/* Company name */}

diff --git a/src/components/common/Recaptcha/Recaptcha.tsx b/src/components/common/Recaptcha/Recaptcha.tsx index 69d0840..fc2e05c 100644 --- a/src/components/common/Recaptcha/Recaptcha.tsx +++ b/src/components/common/Recaptcha/Recaptcha.tsx @@ -8,7 +8,14 @@ declare global { * reCAPTCHA v2 global helper (loaded from https://www.google.com/recaptcha/api.js) */ ready: (cb: () => void) => void - render: (container: HTMLElement, params: { sitekey: string }) => number + render: ( + container: HTMLElement, + params: { + sitekey: string + callback?: (token: string) => void + 'expired-callback'?: () => void + } + ) => number getResponse: (widgetId?: number) => string reset: (widgetId?: number) => void } @@ -25,13 +32,15 @@ interface RecaptchaProps { siteKey: string className?: string onChange?: (token: string) => void + onExpire?: () => void } export const Recaptcha = forwardRef( - function Recaptcha({ siteKey, className, onChange }, ref) { + function Recaptcha({ siteKey, className, onChange, onExpire }, ref) { const { containerRef, getToken, reset } = useRecaptcha({ siteKey, onChange, + onExpire, }) useImperativeHandle( diff --git a/src/components/common/Tag/Tag.tsx b/src/components/common/Tag/Tag.tsx index 8f432f4..fe4afbe 100644 --- a/src/components/common/Tag/Tag.tsx +++ b/src/components/common/Tag/Tag.tsx @@ -51,7 +51,7 @@ export const TagBorderedLg: FunctionComponent = ({ }) => { return ( {children} diff --git a/src/components/common/TextAreaField/TextAreaField.tsx b/src/components/common/TextAreaField/TextAreaField.tsx index c04857b..0c9e104 100644 --- a/src/components/common/TextAreaField/TextAreaField.tsx +++ b/src/components/common/TextAreaField/TextAreaField.tsx @@ -46,7 +46,7 @@ const TextAreaField = ({ rows={rows} aria-invalid={!!error} aria-describedby={error ? `${id}-error` : undefined} - className={`w-full px-3 py-2 rounded-lg border text-sm font-medium font-gilroy outline-none transition-colors resize-none ${ + className={`w-full px-3 py-2 rounded-lg border text-sm font-medium font-urbanist outline-none transition-colors resize-none ${ isDarkMode ? `bg-transparent border-white/10 text-neutral-60 placeholder:text-neutral-30 focus:border-primary-60 ${error ? 'border-red-500 focus:border-red-500' : ''}` : `bg-white/70 border-black/10 text-neutral-10 placeholder:text-neutral-30 focus:border-primary-60 ${error ? 'border-red-500 focus:border-red-500' : ''}` diff --git a/src/components/common/TextField/TextField.tsx b/src/components/common/TextField/TextField.tsx index af33add..8ba9513 100644 --- a/src/components/common/TextField/TextField.tsx +++ b/src/components/common/TextField/TextField.tsx @@ -46,7 +46,7 @@ const TextField = ({ required={required} aria-invalid={!!error} aria-describedby={error ? `${id}-error` : undefined} - className={`w-full h-10 px-3 rounded-lg border text-sm font-medium font-gilroy outline-none transition-colors ${ + className={`w-full h-10 px-3 rounded-lg border text-sm font-medium font-urbanist outline-none transition-colors ${ isDarkMode ? `bg-transparent border-white/10 text-neutral-60 placeholder:text-neutral-30 focus:border-primary-60 ${error ? 'border-red-500 focus:border-red-500' : ''}` : `bg-white/70 border-black/10 text-neutral-10 placeholder:text-neutral-30 focus:border-primary-60 ${error ? 'border-red-500 focus:border-red-500' : ''}` diff --git a/src/components/home/PartnersSection/index.tsx b/src/components/home/PartnersSection/index.tsx index 59a3df0..3ba99ae 100644 --- a/src/components/home/PartnersSection/index.tsx +++ b/src/components/home/PartnersSection/index.tsx @@ -17,7 +17,7 @@ const PartnersSection = ({ isDarkMode }: PartnersSectionProps) => {

{ @@ -1084,7 +1084,7 @@ const Settings = ({ isDarkMode }: SettingsProps) => { fill="white" /> - + Save @@ -1131,7 +1131,7 @@ const Settings = ({ isDarkMode }: SettingsProps) => { {/* Name */}