Merge pull request #476 from xai-foundation/fix/ssa/remove-duplicate-icons

Remove duplicate icon exports

Author: CryptITAustria

apps/sentry-client-desktop/src/components/AssignKeysSentryNotRunning.tsx

@@ -1,5 +1,5 @@
 import {useOperatorRuntime} from "@/hooks/useOperatorRuntime";
-import {WarningIcon} from "@sentry/ui/dist/src/rebrand/icons/IconsComponents";
+import {WarningIcon} from "@sentry/ui/dist/src/rebrand/icons";
 import {PrimaryButton} from "@sentry/ui";
 
 export function AssignKeysSentryNotRunning() {

apps/sentry-client-desktop/src/features/drawer/ActionsRequiredPromptHandler.tsx

@@ -6,7 +6,7 @@ import {chainStateAtom} from "@/hooks/useChainDataWithCallback";
 import {useStorage} from "@/features/storage";
 import BaseCallout from "@sentry/ui/dist/src/rebrand/callout/BaseCallout";
 import {PrimaryButton} from "@sentry/ui";
-import {WarningIcon} from "@sentry/ui/src/rebrand/icons/IconsComponents";
+import {WarningIcon} from "@sentry/ui/src/rebrand/icons";
 
 export function ActionsRequiredPromptHandler() {
 	const setDrawerState = useSetAtom(drawerStateAtom);

apps/sentry-client-desktop/src/features/drawer/WhitelistDrawer.tsx

@@ -6,7 +6,7 @@ import {useEffect, useState} from "react";
 import {useStorage} from "@/features/storage";
 import {useOperatorRuntime} from "@/hooks/useOperatorRuntime";
 import {useOperator} from "@/features/operator";
-import {HelpIcon, WarningIcon} from "@sentry/ui/dist/src/rebrand/icons/IconsComponents";
+import {HelpIcon, WarningIcon} from "@sentry/ui/dist/src/rebrand/icons";
 import MainCheckbox from "@sentry/ui/dist/src/rebrand/checkboxes/MainCheckbox";
 import BaseCallout from "@sentry/ui/dist/src/rebrand/callout/BaseCallout";
 import {AiOutlineClose} from "react-icons/ai";

apps/sentry-client-desktop/src/features/home/modals/ImportSentryAlertModal.tsx

@@ -1,6 +1,6 @@
 import {AiOutlineClose} from "react-icons/ai";
 import {Dispatch, SetStateAction} from "react";
-import {WarningIcon} from "@sentry/ui/dist/src/rebrand/icons/IconsComponents";
+import {WarningIcon} from "@sentry/ui/dist/src/rebrand/icons";
 import {PrimaryButton} from "@sentry/ui";
 import {TextButton} from "@sentry/ui/dist/src/rebrand/buttons/TextButton";
 

apps/sentry-client-desktop/src/features/home/modals/ImportSentryDrawer.tsx

@@ -5,7 +5,7 @@ import {ChangeEvent} from "react";
 import {BiLoaderAlt} from "react-icons/bi";
 import {ImportSentryAlertModal} from "@/features/home/modals/ImportSentryAlertModal";
 import {verifyPrivateKey} from "@sentry/core";
-import {WarningIcon} from "@sentry/ui/dist/src/rebrand/icons/IconsComponents";
+import {WarningIcon} from "@sentry/ui/dist/src/rebrand/icons";
 
 import React, { useState } from "react";
 import { CiSearch } from "react-icons/ci";

apps/sentry-client-desktop/src/features/home/modals/RemoveWalletModal.tsx

@@ -2,8 +2,7 @@ import {useStorage} from "@/features/storage";
 import {useState} from "react";
 import {FaCircleCheck} from "react-icons/fa6";
 import {WalletAssignedMap} from "@/features/keys/Keys";
-import {WarningIcon} from "@sentry/ui/dist/src/rebrand/icons/IconsComponents";
-import {CloseIcon} from "@sentry/ui/dist/src/rebrand/icons/CloseIcon";
+import {CloseIcon, WarningIcon} from "@sentry/ui/dist/src/rebrand/icons";
 import {PrimaryButton} from "@sentry/ui";
 
 interface ImportSentryAlertModalProps {

apps/sentry-client-desktop/src/features/home/modals/actions-required/ActionsRequiredBuyDrawer.tsx

@@ -2,7 +2,7 @@ import {AiOutlineClose} from "react-icons/ai";
 import {IoMdCloseCircle} from "react-icons/io";
 import {useSetAtom} from "jotai";
 import {drawerStateAtom, DrawerView} from "../../../drawer/DrawerManager";
-import { WarningIcon } from "@sentry/ui/src/rebrand/icons/IconsComponents";
+import { WarningIcon } from "@sentry/ui/src/rebrand/icons";
 import { PrimaryButton } from "@sentry/ui";
 
 export function ActionsRequiredBuyDrawer() {

apps/sentry-client-desktop/src/features/home/modals/actions-required/ActionsRequiredNotAccruingDrawer.tsx

@@ -13,7 +13,7 @@ import {accruingStateAtom} from "@/hooks/useAccruingInfo";
 import {chainStateAtom} from "@/hooks/useChainDataWithCallback";
 import {useStorage} from "@/features/storage";
 import {AllowedWalletsCard} from "@/features/home/modals/actions-required/AllowedWalletsCard";
-import { WarningIcon } from "@sentry/ui/src/rebrand/icons/IconsComponents";
+import { WarningIcon } from "@sentry/ui/src/rebrand/icons";
 
 export function ActionsRequiredNotAccruingDrawer() {
 	const setDrawerState = useSetAtom(drawerStateAtom);

apps/sentry-client-desktop/src/features/home/modals/view-keys/ViewKeysFlow.tsx

@@ -9,7 +9,7 @@ import {drawerStateAtom} from "@/features/drawer/DrawerManager";
 import {useOperator} from "@/features/operator";
 import { PrimaryButton } from "@sentry/ui";
 import BaseCallout from "@sentry/ui/src/rebrand/callout/BaseCallout";
-import { WarningIcon } from "@sentry/ui/src/rebrand/icons/IconsComponents";
+import { WarningIcon } from "@sentry/ui/src/rebrand/icons";
 import { getAddress } from "ethers";
 import { config } from "@sentry/core";
 

apps/sentry-client-desktop/src/features/keys/KeysTableBody.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 import { BulkOwnerOrPool } from "@sentry/core";
-import { CopyIcon, DefaultPollIcon, KeyIcon, Wallet, WarningIcon } from "@sentry/ui/dist/src/rebrand/icons/IconsComponents";
+import { CopyIcon, DefaultPollIcon, KeyIcon, Wallet, WarningIcon } from "@sentry/ui/dist/src/rebrand/icons";
 import { AiFillCheckCircle } from "react-icons/ai";
 import { HiOutlineDotsVertical } from "react-icons/hi";
 import CustomTooltip from "@sentry/ui/dist/src/rebrand/tooltip/Tooltip";

apps/sentry-client-desktop/src/features/keys/NoKeys.tsx

@@ -1,6 +1,6 @@
 import {useSetAtom} from "jotai";
 import {drawerStateAtom, DrawerView} from "../drawer/DrawerManager";
-import { WarningIcon } from "@sentry/ui/src/rebrand/icons/IconsComponents";
+import { WarningIcon } from "@sentry/ui/src/rebrand/icons";
 import { PrimaryButton } from "@sentry/ui";
 
 export function NoKeys() {

apps/sentry-client-desktop/src/features/keys/modals/buy-keys/BuyKeysOrderTotal.tsx

@@ -6,7 +6,7 @@ import {Dispatch, SetStateAction, useState} from "react";
 import {ethers} from "ethers";
 // import {Tooltip} from "@sentry/ui";
 import {getPromoCode} from "@sentry/core";
-import { PlusIcon, WarningIcon } from "@sentry/ui/src/rebrand/icons/IconsComponents";
+import { PlusIcon, WarningIcon } from "@sentry/ui/src/rebrand/icons";
 import { PrimaryButton } from "@sentry/ui";
 import BaseCallout from "@sentry/ui/src/rebrand/callout/BaseCallout";
 

apps/web-connect/src/features/checkout/components/ActionSection.tsx

@@ -1,7 +1,7 @@
 import { useCallback, useState } from 'react';
 import { PrimaryButton } from "@sentry/ui";
 import BaseCallout from "@sentry/ui/src/rebrand/callout/BaseCallout";
-import { WarningIcon } from "@sentry/ui/src/rebrand/icons/IconsComponents";
+import { WarningIcon } from "@sentry/ui/src/rebrand/icons";
 import { mapWeb3Error } from "@/utils/errors";
 import { useWebBuyKeysContext } from '../contexts/useWebBuyKeysContext';
 import CrossmintModal from './crossmint/CrossmintModal';

apps/web-connect/src/features/checkout/components/ChooseQuantityRow.tsx

@@ -1,4 +1,4 @@
-import { WarningIcon } from "@sentry/ui/src/rebrand/icons/IconsComponents";
+import { WarningIcon } from "@sentry/ui/src/rebrand/icons";
 import { Tooltip, XaiNumberInput, InfoPointRed, RedSentryIcon } from "@sentry/ui";
 import { useWebBuyKeysContext } from '../contexts/useWebBuyKeysContext';
 import BaseCallout from "@sentry/ui/src/rebrand/callout/BaseCallout";

apps/web-connect/src/features/checkout/components/PromoCodeRow.tsx

@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
 import { AiFillInfoCircle } from "react-icons/ai";
 import { PrimaryButton } from "@sentry/ui";
 import BaseCallout from "@sentry/ui/src/rebrand/callout/BaseCallout";
-import { WarningIcon } from "@sentry/ui/src/rebrand/icons/IconsComponents";
+import { WarningIcon } from "@sentry/ui/src/rebrand/icons";
 import { formatWeiToEther } from "@sentry/core";
 import { useWebBuyKeysContext } from '../contexts/useWebBuyKeysContext';
 

apps/web-connect/src/features/footer/ReactCookieConsent.tsx

@@ -1,4 +1,4 @@
-import { WarningIcon } from "@sentry/ui/src/rebrand/icons/IconsComponents";
+import { WarningIcon } from "@sentry/ui/src/rebrand/icons";
 import CookieConsent from "react-cookie-consent";
 
 export function ReactCookieConsent({ }) {

packages/ui/src/rebrand/icons/IconsComponents.tsx

@@ -1,12 +1,3 @@
-export const WarningIcon = ({ width = 24, height = 24, className, fill = "#ffc53d" }: { width?: number, height?: number, fill?: string, className?: string }) => {
-
-  return (
-    <svg style={{ width: width, height: height }} className={className} xmlns="http://www.w3.org/2000/svg" width="27.789" height="24" viewBox="0 0 27.789 24">
-      <path id="warning_FILL1_wght400_GRAD0_opsz24_4_" data-name="warning_FILL1_wght400_GRAD0_opsz24 (4)" d="M40-856l13.895-24,13.895,24Zm13.895-3.789a1.222,1.222,0,0,0,.9-.363,1.222,1.222,0,0,0,.363-.9,1.222,1.222,0,0,0-.363-.9,1.222,1.222,0,0,0-.9-.363,1.222,1.222,0,0,0-.9.363,1.222,1.222,0,0,0-.363.9,1.222,1.222,0,0,0,.363.9A1.222,1.222,0,0,0,53.895-859.789Zm-1.263-3.789h2.526v-6.316H52.632Z" transform="translate(-40 880)" fill={fill}/>
-    </svg>
-  )
-};
-
 export const XaiLogoFooter = ({ width = 122, height = 97, svgClassName, wrapperClassName = "fill-white", logoClassName }: { width?: number, height?: number, fill?: string, wrapperClassName?: string, logoClassName?: string, svgClassName?: string }) => {
 
   return (
@@ -41,9 +32,6 @@ export const XaiLogoFooter = ({ width = 122, height = 97, svgClassName, wrapperC
   )
 };
 
-
-
-
 export function InfoPointRed({
   width = 16,
   height = 16,
@@ -205,21 +193,6 @@ l799 -1385 -1076 -3 c-592 -1 -1078 0 -1080 2 -3 2 167 301 376 664 210 363
   );
 };
 
-export const DropdownArrow = ({width = 10, height = 3, className = ""}) => {
-    return <svg
-        width={width} height={height} className={className}
-        fill="#fff"
-        xmlns="http://www.w3.org/2000/svg"
-                viewBox="0 0 4.8117635 3.2432653" version="1.1" id="svg1" >
-        <defs id="defs1"/>
-        <g  id="layer1"
-           transform="translate(-0.23995138,-1.0242006)"><path  d="M 2.6458332,2.6458333 V -2.3262066 8.1888758" id="path1"/>
-            <g id="g2" transform="translate(-4.1599448,-4.385214)"><rect id="rect2" width="1.2605684" height="3.478761" x="9.7083769" y="-2.1346393" ry="0.13058987" transform="rotate(45)"/>
-                <rect  id="rect2-2" width="1.2605684"
-                      height="3.478761" x="0.083553314" y="7.4901848" ry="0.13058987"
-                      transform="matrix(-0.70710678,0.70710678,0.70710678,0.70710678,0,0)"/></g></g></svg>
-}
-
 export const HelpIcon = ({ width = 20, height = 20, fill = "#D0CFCF" }) => {
     return <svg xmlns="http://www.w3.org/2000/svg" width={width} height={height}
                 viewBox="0 0 14 14">

packages/ui/src/rebrand/icons/index.ts

@@ -1,6 +1,8 @@
 export * from './BackArrow'
 export * from './CloseIcon'
+export * from './DropArrowIcon'
 export * from './ExternalLinkIcon'
 export * from './IconsComponents'
 export * from './SortArrowDown'
-export * from './SortArrowUp'
+export * from './SortArrowUp'
+export * from './WarningIcon'