chore: merge branch 'mvfw-2023' into 'main'

.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"

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 = ({
               </LockInfoDesc>
               <LockInfoDesc>
                 <a
-                  href={openseaLinkToOriginalMainnetCollection}
+                  href={sanitizeUrl(openseaLinkToOriginalMainnetCollection)}
                   target="_blank"
+                  rel="noopener noreferrer"
                 >
                   {openseaLinkToOriginalMainnetCollection}
                 </a>

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");
                     });
                   }}

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 (
           <a
-            href={url}
+            href={sanitizeUrl(url)}
             target="_blank"
-            rel="noopener"
+            rel="noopener noreferrer"
             key={`social_nav_${value}_${url}`}
           >
             <SocialLogo logo={value} />
@@ -241,9 +242,10 @@ export default function FooterComponent() {
                   return (
                     <a
                       key={`${footerLink.label}-${footerLink.value}-${index}`}
-                      href={footerLink.value}
+                      href={sanitizeUrl(footerLink.value)}
                       target="_blank"
                       style={{ textAlign: "center" }}
+                      rel="noopener noreferrer"
                     >
                       {footerLink.label}
                     </a>

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
           </Typography>
         ) : url ? (
-          <a href={url} target="_blank">
+          <a href={sanitizeUrl(url)} target="_blank" rel="noopener noreferrer">
             <Typography color={colors.secondary}>View details</Typography>
           </a>
         ) : null}

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;
   }
   * {

src/lib/types/externals.d.ts

@@ -1,3 +1,5 @@
 declare module "@metamask/jazzicon";
 
 declare module "pretty";
+
+declare module "*.ttf";

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
         }
       ]
     },

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 (
-    <SocialIcon href={href} $isDisabled={disabled} target="_blank">
+    <SocialIcon
+      href={href}
+      $isDisabled={disabled}
+      target="_blank"
+      rel="noopener noreferrer"
+    >
       {Icon ? Icon : <Globe size={24} />}
     </SocialIcon>
   );
@@ -60,7 +66,7 @@ export default function SellerSocial({
       {/* TODO: Removed as we don't have discord in lens profile */}
       {/* <RenderSocial icon={DiscordLogo} href={""} /> */}
       {lensUrl !== false && (
-        <RenderSocial icon={<Globe size={24} />} href={lensUrl} />
+        <RenderSocial icon={<Globe size={24} />} href={sanitizeUrl(lensUrl)} />
       )}
       <DetailShareWrapper>
         <DetailShare />