Merge pull request #516 from layerx-labs/vhc-remove-cdn-usage

refactor: dont use cdn

Author: vhcsilva

components/avatar-or-identicon.tsx

@@ -9,8 +9,6 @@ import {truncateAddress} from "helpers/truncate-address";
 import {User} from "interfaces/api";
 import {SizeOptions} from "interfaces/utils";
 
-import {baseApiImgUrl} from "../services/api";
-
 export interface AvatarOrIdenticonProps {
   user: User | { address: string; handle?: string; avatar?: string; };
   size?: SizeOptions | number;
@@ -50,7 +48,7 @@ export default function AvatarOrIdenticon({
         <Avatar 
           userLogin={handle} 
           size={size} 
-          src={`${baseApiImgUrl}/${publicRuntimeConfig?.urls?.ipfs}/${avatar}?width=100&height=100`}
+          src={`${publicRuntimeConfig?.urls?.ipfs}/${avatar}?width=100&height=100`}
           className="border-primary" 
         />
       </If>

components/bounties/select-network.tsx

@@ -23,8 +23,6 @@ import useReactQuery from "x-hooks/use-react-query";
 import {useSettings} from "x-hooks/use-settings";
 import useSupportedChain from "x-hooks/use-supported-chain";
 
-import {baseApiImgUrl} from "../../services/api";
-
 interface SelectNetworkProps {
   isCurrentDefault?: boolean;
   onlyProfileFilters?: boolean;
@@ -70,7 +68,7 @@ export default function SelectNetwork({
       value: network,
       preIcon: (
         <NetworkLogo
-          src={`${baseApiImgUrl}/${settings?.urls?.ipfs}/${network?.logoIcon}`}
+          src={`${settings?.urls?.ipfs}/${network?.logoIcon}`}
           alt={`${network?.name} logo`}
           isBepro={network?.name.toLowerCase() === 'bepro'}
           size="sm"

components/bounty/create-bounty/create-bounty-network-dropdown.tsx

@@ -10,8 +10,6 @@ import {Network} from "interfaces/network";
 
 import {useSettings} from "x-hooks/use-settings";
 
-import {baseApiImgUrl} from "../../../services/api";
-
 interface SelectNetworkDropdownProps {
   value?: Network;
   onSelect: (network: Network) => void;
@@ -51,7 +49,7 @@ export default function CreateBountyNetworkDropdown({
       label: network?.name,
       preIcon: (
         <img
-          src={`${baseApiImgUrl}/${settings?.urls?.ipfs}/${network?.logoIcon}?width=16&height=16`}
+          src={`${settings?.urls?.ipfs}/${network?.logoIcon}?width=16&height=16`}
           alt={`${network?.name} logo`}
           width={16}
           height={16}

components/chain-icon.tsx

@@ -4,7 +4,6 @@ import getConfig from "next/config";
 
 import QuestionMarkIcon from "assets/icons/question-mark-icon";
 
-import {baseApiImgUrl} from "../services/api";
 import If from "./If";
 import ResponsiveWrapper from "./responsive-wrapper";
 
@@ -32,7 +31,7 @@ export default function ChainIcon({
   const chainIcon = src && ipfsUrl ? 
     <img 
       className={`rounded-circle ${className}`} 
-      src={`${baseApiImgUrl}/${ipfsUrl}/${src}?width=${size}&height=${size}${imgFormat ? `&format=${imgFormat}` : ""}`} 
+      src={`${ipfsUrl}/${src}?width=${size}&height=${size}${imgFormat ? `&format=${imgFormat}` : ""}`} 
       height={size} 
       width={size} 
     /> :

components/common/marketplace-with-network-logo/marketplace-with-network-logo.view.tsx

@@ -3,8 +3,6 @@ import getConfig from "next/config";
 import ChainIcon from "components/chain-icon";
 import NetworkLogo from "components/network-logo";
 
-import {baseApiImgUrl} from "../../../services/api";
-
 const {publicRuntimeConfig} = getConfig();
 interface MarketplaceWithNetworkLogoProps {
   networkLogo: string;
@@ -17,7 +15,7 @@ export default function MarketplaceWithNetworkLogo ({
   return(
     <div className="position-relative">
       <NetworkLogo
-        src={`${baseApiImgUrl}/${publicRuntimeConfig?.urls?.ipfs}/${marketplaceLogo}`}
+        src={`${publicRuntimeConfig?.urls?.ipfs}/${marketplaceLogo}`}
         shape="square"
         size="lg"
         noBg

components/lists/filters/marketplace/controller.tsx

@@ -14,8 +14,6 @@ import {SelectOption} from "types/utils";
 import useBreakPoint from "x-hooks/use-breakpoint";
 import useQueryFilter from "x-hooks/use-query-filter";
 
-import {baseApiImgUrl} from "../../../../services/api";
-
 const { publicRuntimeConfig } = getConfig();
 export default function MarketplaceFilter({
   marketplaces,
@@ -36,7 +34,7 @@ export default function MarketplaceFilter({
     value: marketplace?.name,
     label: marketplace?.name,
     preIcon: <NetworkLogo
-              src={`${baseApiImgUrl}/${publicRuntimeConfig?.urls?.ipfs}/${marketplace?.logoIcon}`}
+              src={`${publicRuntimeConfig?.urls?.ipfs}/${marketplace?.logoIcon}`}
               alt={`${marketplace?.name} logo`}
               size="sm"
               noBg

components/lists/marketplaces/marketplace-list-item/marketplace-list-item.view.tsx

@@ -11,8 +11,6 @@ import {formatNumberToNScale} from "helpers/formatNumber";
 
 import {useSettings} from "x-hooks/use-settings";
 
-import {baseApiImgUrl} from "../../../../services/api";
-
 type MarketplaceListItemProps = {
   marketplace: GroupedMarketplace
 };
@@ -79,7 +77,7 @@ export function MarketplaceListItem({
       <ResponsiveListItem
         icon={
           <NetworkLogo 
-            src={`${baseApiImgUrl}/${settings?.urls?.ipfs}/${marketplace?.logoIcon}?format=svg`}
+            src={`${settings?.urls?.ipfs}/${marketplace?.logoIcon}?format=svg`}
             shape="square"
             size="lg"
             noBg 

components/lists/nfts/nfts-list-item/nfts-list-item.controller.tsx

@@ -4,8 +4,6 @@ import { IssueData } from "interfaces/issue-data";
 
 import {useSettings} from "x-hooks/use-settings";
 
-import {baseApiImgUrl} from "../../../../services/api";
-
 interface NftsListItemProps {
   nft: IssueData
 }
@@ -17,7 +15,7 @@ export default function NftsListItem ({
 
   const transactionHash = nft?.payments?.at(0)?.transactionHash;
   const imageUrl = 
-    nft?.nftImage ? `${baseApiImgUrl}/${settings?.urls?.ipfs}/${nft?.nftImage}` : null;
+    nft?.nftImage ? `${settings?.urls?.ipfs}/${nft?.nftImage}` : null;
   const transactionUrl = `${nft?.network?.chain?.blockScanner}/${transactionHash}`;
   const taskUrl = `/${nft?.network?.name?.toLowerCase()}/task/${nft?.id}`;
 

components/navigation/navbar/controller.tsx

@@ -9,7 +9,6 @@ import useMarketplace from "x-hooks/use-marketplace";
 import {useSettings} from "x-hooks/use-settings";
 import useSupportedChain from "x-hooks/use-supported-chain";
 
-import {baseApiImgUrl} from "../../../services/api";
 import {userPointsOfUser} from "../../../x-hooks/use-points-of-user";
 
 export default function NavBar() {
@@ -21,7 +20,7 @@ export default function NavBar() {
   const { active: activeMarketplace, getURLWithNetwork } = useMarketplace();
 
   const isOnNetwork = pathname?.includes("[network]");
-  const logoPath = baseApiImgUrl.concat("/", settings?.urls?.ipfs);
+  const logoPath = settings?.urls?.ipfs;
   const logos = {
     fullLogo: activeMarketplace?.fullLogo && `${logoPath}/${activeMarketplace.fullLogo}`,
     logoIcon: activeMarketplace?.logoIcon && `${logoPath}/${activeMarketplace.logoIcon}`

components/network/settings/logo-and-colors/controller.tsx

@@ -16,16 +16,14 @@ import {useUserStore} from "x-hooks/stores/user/user.store";
 import useNetworkTheme from "x-hooks/use-network-theme";
 import useReactQueryMutation from "x-hooks/use-react-query-mutation";
 
-import {baseApiImgUrl} from "../../../../services/api";
-
 
 const { publicRuntimeConfig } = getConfig();
 
 const MAX_LOGOS_SIZE_LIMIT_IN_MB = 1;
 
 const getDefaultIconValue = (hash: string) => ({
   value: {
-    preview: `${baseApiImgUrl}/${publicRuntimeConfig?.urls?.ipfs}/${hash}`,
+    preview: `${publicRuntimeConfig?.urls?.ipfs}/${hash}`,
     raw: null,
   },
   validated: null,