diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b7c1df191..8980b23fa 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -130,7 +130,7 @@ jobs: ENV_NAME: "production" UPDATE_COVERAGE: false REACT_APP_ENABLE_CURATION_LISTS: true - REACT_APP_SELLER_CURATION_LIST: "2,4,5,6,7,8,9,11,12,13,14,16,27,129,171,172,180,181,182,183,184,190,191,195,196" + REACT_APP_SELLER_CURATION_LIST: "2,4,5,6,7,8,9,11,12,13,14,16,27,129,171,172,180,181,182,183,184,190,191,195,196,197,202,207" REACT_APP_CREATE_PROFILE_CONFIGURATION: "LENS" REACT_APP_IPFS_GATEWAY: "https://bosonprotocol.infura-ipfs.io/ipfs" REACT_APP_IPFS_IMAGE_GATEWAY: "https://gray-permanent-fly-490.mypinata.cloud/ipfs" diff --git a/package-lock.json b/package-lock.json index 0b7a817a0..231b1db48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9050,9 +9050,9 @@ } }, "node_modules/cborg": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/cborg/-/cborg-1.10.0.tgz", - "integrity": "sha512-/eM0JCaL99HDHxjySNQJLaolZFVdl6VA0/hEKIoiQPcQzE5LrG5QHdml0HaBt31brgB9dNe1zMr3f8IVrpotRQ==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/cborg/-/cborg-1.10.1.tgz", + "integrity": "sha512-et6Qm8MOUY2kCWa5GKk2MlBVoPjHv0hQBmlzI/Z7+5V3VJCeIkGehIB3vWknNsm2kOkAIs6wEKJFJo8luWQQ/w==", "bin": { "cborg": "cli.js" } @@ -34925,9 +34925,9 @@ "version": "2.4.0" }, "cborg": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/cborg/-/cborg-1.10.0.tgz", - "integrity": "sha512-/eM0JCaL99HDHxjySNQJLaolZFVdl6VA0/hEKIoiQPcQzE5LrG5QHdml0HaBt31brgB9dNe1zMr3f8IVrpotRQ==" + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/cborg/-/cborg-1.10.1.tgz", + "integrity": "sha512-et6Qm8MOUY2kCWa5GKk2MlBVoPjHv0hQBmlzI/Z7+5V3VJCeIkGehIB3vWknNsm2kOkAIs6wEKJFJo8luWQQ/w==" }, "ccount": { "version": "2.0.1" diff --git a/src/assets/fonts/neuropolitical_rg.ttf b/src/assets/fonts/neuropolitical_rg.ttf new file mode 100644 index 000000000..26bbb63ce Binary files /dev/null and b/src/assets/fonts/neuropolitical_rg.ttf differ diff --git a/src/components/detail/DetailWidget/TokenGated.tsx b/src/components/detail/DetailWidget/TokenGated.tsx index 4356f18a1..7743b2740 100644 --- a/src/components/detail/DetailWidget/TokenGated.tsx +++ b/src/components/detail/DetailWidget/TokenGated.tsx @@ -7,6 +7,7 @@ import { CONFIG } from "../../../lib/config"; import { colors } from "../../../lib/styles/colors"; import { Offer } from "../../../lib/types/offer"; import { IPrice } from "../../../lib/utils/convertPrice"; +import { sanitizeUrl } from "../../../lib/utils/url"; import { useCoreSDK } from "../../../lib/utils/useCoreSdk"; import { useConvertedPrice } from "../../price/useConvertedPrice"; import Grid from "../../ui/Grid"; @@ -176,8 +177,9 @@ const TokenGated = ({ {openseaLinkToOriginalMainnetCollection} diff --git a/src/components/disputeResolver/ManageDisputes/DisputesTable.tsx b/src/components/disputeResolver/ManageDisputes/DisputesTable.tsx index 47e65ca5c..2cb50805e 100644 --- a/src/components/disputeResolver/ManageDisputes/DisputesTable.tsx +++ b/src/components/disputeResolver/ManageDisputes/DisputesTable.tsx @@ -14,6 +14,7 @@ import copyToClipboard from "../../../lib/utils/copyToClipboard"; import { getDateTimestamp } from "../../../lib/utils/getDateTimestamp"; import { Disputes } from "../../../lib/utils/hooks/useExchanges"; import { useKeepQueryParamsNavigate } from "../../../lib/utils/hooks/useKeepQueryParamsNavigate"; +import { sanitizeUrl } from "../../../lib/utils/url"; import { useModal } from "../../modal/useModal"; import Price from "../../price"; import PaginationPages from "../../seller/common/PaginationPages"; @@ -175,7 +176,7 @@ export default function DisputesTable({ disputes }: Props) { whiteSpace: "pre" }} onClick={() => { - copyToClipboard(emailAddress).then(() => { + copyToClipboard(sanitizeUrl(emailAddress)).then(() => { toast(() => "Seller e-mail has been copied to clipboard"); }); }} diff --git a/src/components/footer/Footer.tsx b/src/components/footer/Footer.tsx index 11d07d825..5bd17af97 100644 --- a/src/components/footer/Footer.tsx +++ b/src/components/footer/Footer.tsx @@ -5,6 +5,7 @@ import logo from "../../../src/assets/logo-white.svg"; import { BosonRoutes } from "../../lib/routing/routes"; import { breakpoint } from "../../lib/styles/breakpoint"; import { useBreakpoints } from "../../lib/utils/hooks/useBreakpoints"; +import { sanitizeUrl } from "../../lib/utils/url"; import SocialLogo, { SocialLogoValues } from "../../pages/custom-store/SocialLogo"; @@ -112,9 +113,9 @@ function Socials() { return socialMediaLinks.map(({ url, value }) => { return ( @@ -241,9 +242,10 @@ export default function FooterComponent() { return ( {footerLink.label} diff --git a/src/components/toasts/SuccessTransactionToast.tsx b/src/components/toasts/SuccessTransactionToast.tsx index dd202f73a..981b372bb 100644 --- a/src/components/toasts/SuccessTransactionToast.tsx +++ b/src/components/toasts/SuccessTransactionToast.tsx @@ -1,6 +1,7 @@ import { Toast } from "react-hot-toast"; import { colors } from "../../lib/styles/colors"; +import { sanitizeUrl } from "../../lib/utils/url"; import Grid from "../ui/Grid"; import Typography from "../ui/Typography"; import SuccessToast from "./common/SuccessToast"; @@ -33,7 +34,7 @@ export default function SuccessTransactionToast({ View details ) : url ? ( - + View details ) : null} diff --git a/src/lib/styles/GlobalStyle.tsx b/src/lib/styles/GlobalStyle.tsx index 36752c3fc..b009e74ea 100644 --- a/src/lib/styles/GlobalStyle.tsx +++ b/src/lib/styles/GlobalStyle.tsx @@ -1,5 +1,7 @@ import { createGlobalStyle } from "styled-components"; +import barlowRegular from "../../assets/fonts/Barlow-Regular.ttf"; +import neuropolitical_rg from "../../assets/fonts/neuropolitical_rg.ttf"; import { breakpoint } from "../../lib/styles/breakpoint"; import { colors } from "../../lib/styles/colors"; @@ -19,7 +21,12 @@ const GlobalStyle = createGlobalStyle<{ }>` @font-face { font-family: barlow; - src: url(src/assets/fonts/Barlow-Regular.ttf); + src: url(${barlowRegular}); + font-weight: normal; + } + @font-face { + font-family: neuropolitical_rg; + src: url(${neuropolitical_rg}); font-weight: normal; } * { diff --git a/src/lib/types/externals.d.ts b/src/lib/types/externals.d.ts index 7c5b8894e..ec5f4ff93 100644 --- a/src/lib/types/externals.d.ts +++ b/src/lib/types/externals.d.ts @@ -1,3 +1,5 @@ declare module "@metamask/jazzicon"; declare module "pretty"; + +declare module "*.ttf"; diff --git a/src/pages/custom-store/store-fields.ts b/src/pages/custom-store/store-fields.ts index dd9a16a37..51066127c 100644 --- a/src/pages/custom-store/store-fields.ts +++ b/src/pages/custom-store/store-fields.ts @@ -190,6 +190,10 @@ export const formModel = { { label: "Barlow", value: "barlow" // defined in src/lib/styles/GlobalStyle.tsx + }, + { + label: "Neuropolitical", + value: "neuropolitical_rg" // defined in src/lib/styles/GlobalStyle.tsx } ] }, diff --git a/src/pages/profile/seller/SellerSocial.tsx b/src/pages/profile/seller/SellerSocial.tsx index eab5eb813..706e45e02 100644 --- a/src/pages/profile/seller/SellerSocial.tsx +++ b/src/pages/profile/seller/SellerSocial.tsx @@ -7,6 +7,7 @@ import { Profile, ProfileFieldsFragment } from "../../../lib/utils/hooks/lens/graphql/generated"; +import { sanitizeUrl } from "../../../lib/utils/url"; import { preAppendHttps } from "../../../lib/validation/regex/url"; import { DetailShareWrapper, @@ -26,7 +27,12 @@ function RenderSocial({ icon: Icon }: RenderSocialProps) { return ( - + {Icon ? Icon : } ); @@ -60,7 +66,7 @@ export default function SellerSocial({ {/* TODO: Removed as we don't have discord in lens profile */} {/* */} {lensUrl !== false && ( - } href={lensUrl} /> + } href={sanitizeUrl(lensUrl)} /> )}