chore: icon tidy up

packages/app/src/config/networks.ts

@@ -1,15 +1,15 @@
 // Copyright 2024 @polkadot-cloud/polkadot-staking-dashboard authors & contributors
 // SPDX-License-Identifier: GPL-3.0-only
 
-import KusamaIconSVG from 'assets/svg/kusamaIcon.svg?react'
-import KusamaInlineSVG from 'assets/svg/kusamaInline.svg?react'
-import PolkadotIconSVG from 'assets/svg/polkadotIcon.svg?react'
-import PolkadotInlineSVG from 'assets/svg/polkadotInline.svg?react'
+import KusamaIconSVG from 'assets/svg/chains/kusamaIcon.svg?react'
+import KusamaInlineSVG from 'assets/svg/chains/kusamaInline.svg?react'
+import PolkadotIconSVG from 'assets/svg/chains/polkadotIcon.svg?react'
+import PolkadotInlineSVG from 'assets/svg/chains/polkadotInline.svg?react'
+import WestendIconSVG from 'assets/svg/chains/westendIcon.svg?react'
+import WestendInlineSVG from 'assets/svg/chains/westendInline.svg?react'
 import PolkadotTokenSVG from 'assets/svg/token/dot.svg?react'
 import KusamaTokenSVG from 'assets/svg/token/ksm.svg?react'
 import WestendTokenSVG from 'assets/svg/token/wnd.svg?react'
-import WestendIconSVG from 'assets/svg/westendIcon.svg?react'
-import WestendInlineSVG from 'assets/svg/westendInline.svg?react'
 import BigNumber from 'bignumber.js'
 import type { Networks, SystemChain } from 'common-types'
 

packages/app/src/library/MainFooter/index.tsx

@@ -6,7 +6,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { useEffectIgnoreInitial } from '@w3ux/hooks'
 import { Odometer } from '@w3ux/react-odometer'
 import { capitalizeFirstLetter } from '@w3ux/utils'
-import CloudIconSVG from 'assets/svg/cloudIcon.svg?react'
+import CloudIconSVG from 'assets/svg/icons/cloud.svg?react'
 import BigNumber from 'bignumber.js'
 import { MaxPageWidth } from 'consts'
 import { useNetwork } from 'contexts/Network'

packages/app/src/library/Modal/Close.tsx

@@ -1,7 +1,7 @@
 // Copyright 2024 @polkadot-cloud/polkadot-staking-dashboard authors & contributors
 // SPDX-License-Identifier: GPL-3.0-only
 
-import CrossSVG from 'assets/svg/cross.svg?react'
+import CrossSVG from 'assets/svg/icons/cross.svg?react'
 import { useOverlay } from 'ui-overlay'
 import { CloseWrapper } from './Wrappers'
 

packages/app/src/library/Modal/Title.tsx

@@ -4,7 +4,7 @@
 import type { IconProp } from '@fortawesome/fontawesome-svg-core'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import type { AnyJson } from '@w3ux/types'
-import CrossSVG from 'assets/svg/cross.svg?react'
+import CrossSVG from 'assets/svg/icons/cross.svg?react'
 import { useHelp } from 'contexts/Help'
 import type { FunctionComponent, SVGProps } from 'react'
 import type { CSSProperties } from 'styled-components'

packages/app/src/library/SideMenu/index.tsx

@@ -5,15 +5,15 @@ import { faCompressAlt, faExpandAlt } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { useOnResize, useOutsideAlerter } from '@w3ux/hooks'
 import { capitalizeFirstLetter } from '@w3ux/utils'
-import BookSVG from 'assets/svg/book.svg?react'
-import CogOutlineSVG from 'assets/svg/cogOutline.svg?react'
-import DiscordSVG from 'assets/svg/discord.svg?react'
-import EnvelopeSVG from 'assets/svg/envelope.svg?react'
-import LanguageSVG from 'assets/svg/language.svg?react'
-import LogoSVG from 'assets/svg/logo.svg?react'
-import LogoGithubSVG from 'assets/svg/logoGithub.svg?react'
-import MoonOutlineSVG from 'assets/svg/moonOutline.svg?react'
-import SunnyOutlineSVG from 'assets/svg/sunnyOutline.svg?react'
+import DiscordSVG from 'assets/svg/brands/discord.svg?react'
+import LogoGithubSVG from 'assets/svg/brands/github.svg?react'
+import BookSVG from 'assets/svg/icons/book.svg?react'
+import CogOutlineSVG from 'assets/svg/icons/cogOutline.svg?react'
+import EnvelopeSVG from 'assets/svg/icons/envelope.svg?react'
+import LanguageSVG from 'assets/svg/icons/language.svg?react'
+import LogoSVG from 'assets/svg/icons/logo.svg?react'
+import MoonOutlineSVG from 'assets/svg/icons/moonOutline.svg?react'
+import SunnyOutlineSVG from 'assets/svg/icons/sunnyOutline.svg?react'
 import { PageWidthMediumThreshold, SideMenuMaximisedWidth } from 'consts'
 import { useApi } from 'contexts/Api'
 import { useHelp } from 'contexts/Help'

packages/app/src/overlay/modals/ChooseLanguage/index.tsx

@@ -1,7 +1,7 @@
 // Copyright 2024 @polkadot-cloud/polkadot-staking-dashboard authors & contributors
 // SPDX-License-Identifier: GPL-3.0-only
 
-import LanguageSVG from 'assets/svg/language.svg?react'
+import LanguageSVG from 'assets/svg/icons/language.svg?react'
 import { Title } from 'library/Modal/Title'
 import { changeLanguage, locales } from 'locales'
 import { useTranslation } from 'react-i18next'

packages/app/src/overlay/modals/DiscordSupport/index.tsx

@@ -3,7 +3,7 @@
 
 import { faExternalLinkAlt } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import DiscordOutlineSvg from 'assets/svg/discordOutline.svg?react'
+import DiscordOutlineSvg from 'assets/svg/brands/discordOutline.svg?react'
 import { DiscordSupportUrl } from 'consts'
 import { Title } from 'library/Modal/Title'
 import { useTranslation } from 'react-i18next'

packages/app/src/overlay/modals/MailSupport/index.tsx

@@ -1,7 +1,7 @@
 // Copyright 2024 @polkadot-cloud/polkadot-staking-dashboard authors & contributors
 // SPDX-License-Identifier: GPL-3.0-only
 
-import MailSVG from 'assets/svg/mail.svg?react'
+import MailSVG from 'assets/svg/icons/mail.svg?react'
 import { MailSupportAddress } from 'consts'
 import { Title } from 'library/Modal/Title'
 import { useTranslation } from 'react-i18next'

packages/app/src/overlay/modals/Networks/Wrapper.ts

@@ -111,26 +111,6 @@ export const NetworkButton = styled.button<{ $connected: boolean }>`
   }
 `
 
-export const BraveWarning = styled.div`
-  border: 1px solid var(--border-primary-color);
-  display: flex;
-  border-radius: 0.75rem;
-  padding: 1rem;
-
-  .brave-text {
-    color: var(--text-color-primary);
-    width: 90%;
-    padding-left: 1rem;
-    font-size: 1.2rem;
-    align-self: center;
-
-    .learn-more {
-      color: var(--text-color-secondary);
-      text-decoration: underline var(--border-primary-color);
-    }
-  }
-`
-
 export const ConnectionsWrapper = styled.div`
   display: flex;
   flex-flow: row wrap;

packages/app/src/overlay/modals/Networks/index.tsx

@@ -4,7 +4,6 @@
 import { faChevronRight, faGlobe } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { capitalizeFirstLetter } from '@w3ux/utils'
-import BraveIconSVG from 'assets/svg/braveLogo.svg?react'
 import type { NetworkId } from 'common-types'
 import { NetworkList } from 'config/networks'
 import { useApi } from 'contexts/Api'
@@ -13,13 +12,12 @@ import { usePrompt } from 'contexts/Prompt'
 import { useUi } from 'contexts/UI'
 import { Title } from 'library/Modal/Title'
 import { useEffect } from 'react'
-import { Trans, useTranslation } from 'react-i18next'
+import { useTranslation } from 'react-i18next'
 import { ButtonTertiary } from 'ui-buttons'
 import { ModalPadding } from 'ui-core/overlay'
 import { useOverlay } from 'ui-overlay'
 import { ProvidersPrompt } from './ProvidersPrompt'
 import {
-  BraveWarning,
   ConnectionButton,
   ConnectionsWrapper,
   ContentWrapper,
@@ -127,18 +125,6 @@ export const Networks = () => {
               </div>
             </div>
           </ConnectionsWrapper>
-
-          {isBraveBrowser ? (
-            <BraveWarning>
-              <BraveIconSVG />
-              <div className="brave-text">
-                <Trans
-                  defaults={t('braveText')}
-                  components={{ b: <b />, i: <i /> }}
-                />
-              </div>
-            </BraveWarning>
-          ) : null}
         </ContentWrapper>
       </ModalPadding>
     </>

packages/assets/package.json

@@ -8,6 +8,7 @@
     "reset": "yarn run clear &&  rm -rf node_modules yarn.lock && yarn"
   },
   "exports": {
-    "./svg/*": "./src/svg/*"
+    "./svg/*": "./src/svg/*",
+    "./tsx/*": "./src/tsx/*"
   }
 }

packages/locales/src/resources/cn/modals.json

@@ -34,7 +34,6 @@
     "bondMore": "质押更多",
     "bondingWithdraw": "质押还将提取您的未申领收益",
     "bouncer": " 守护人",
-    "braveText": "<b> 致Brave的用户</b> ! 由于最近的更新 (<i>Brave 版本 1.36</i>), 使用轻型客户端时可能会出现问题(例如不能连接).",
     "cancel": "取消",
     "changeNomination": "一旦提交,您的提名将被移除,从下一个Era开始就不会被提名",
     "changePoolRoles": "更改池角色",

packages/locales/src/resources/en/modals.json

@@ -37,7 +37,6 @@
     "bondMore": "Bond more",
     "bondingWithdraw": "Bonding will also withdraw your outstanding rewards of",
     "bouncer": "Bouncer",
-    "braveText": "<b>To Brave users!</b> Due to a recent update (<i>Brave version 1.36</i>), there may appear issues while using light clients (e.g. not connected).",
     "cancel": "Cancel",
     "changeNomination": "Once submitted, your nominations will be removed from your dashboard immediately, and will not be nominated from the start of the next era.",
     "changePoolRoles": "Change Pool Roles",