Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add new myriad paseo logo #1956

Merged
merged 1 commit into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/components/ExclusiveContentCreate/CurrencyOption.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export const CurrencyOption: React.FC<CurrencyOptionProps> = ({
if (
balance.networkId === 'myriad' ||
balance.networkId === 'debio' ||
balance.networkId === 'paseo' ||
balance.networkId === 'rococo'
)
return balance;
Expand Down
2 changes: 2 additions & 0 deletions src/components/Login/render/Options/Options.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
MetamaskWalletDisabledIcon,
MyNearWalletIcon,
MyriadOctopusIcon,
MyriadPaseoIcon,
MyriadRococoIcon,
NearNetworkIcon,
PolkadotNetworkIcon,
Expand Down Expand Up @@ -95,6 +96,7 @@ export const Options: React.FC<OptionProps> = props => {
kusama: <KusamaNetworkIcon className={getMobileIconStyles} />,
near: <NearNetworkIcon className={getMobileIconStyles} />,
myriad: <MyriadOctopusIcon className={getMobileIconStyles} />,
paseo: <MyriadPaseoIcon className={getMobileIconStyles} />,
rococo: <MyriadRococoIcon className={getMobileIconStyles} />,
debio: <DebioNetworkIcon className={getMobileIconStyles} />,
}),
Expand Down
2 changes: 2 additions & 0 deletions src/components/ProfileCard/NetworkOption/NetworkOption.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import useBlockchain from 'components/common/Blockchain/use-blockchain.hook';
import {
NearNetworkIcon24,
MyriadOctopusIcon,
MyriadPaseoIcon,
MyriadRococoIcon,
PolkadotNetworkIcon,
KusamaNetworkIcon,
Expand Down Expand Up @@ -50,6 +51,7 @@ export const NetworkOption: React.FC<NetworkOptionProps> = ({
kusama: <KusamaNetworkIcon />,
near: <NearNetworkIcon24 />,
myriad: <MyriadOctopusIcon />,
paseo: <MyriadPaseoIcon />,
rococo: <MyriadRococoIcon />,
debio: <DebioNetworkIcon />,
}),
Expand Down
2 changes: 2 additions & 0 deletions src/components/ProfileCard/ProfileContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import ShowIf from 'components/common/show-if.component';
import {
NearNetworkIcon24,
MyriadOctopusIcon,
MyriadPaseoIcon,
MyriadRococoIcon,
PolkadotNetworkIcon,
KusamaNetworkIcon,
Expand Down Expand Up @@ -53,6 +54,7 @@ export const ProfileContent: React.FC<ProfileCardProps> = props => {
kusama: <KusamaNetworkIcon />,
near: <NearNetworkIcon24 />,
myriad: <MyriadOctopusIcon />,
paseo: <MyriadPaseoIcon />,
rococo: <MyriadRococoIcon />,
debio: <DebioNetworkIcon />,
}),
Expand Down
6 changes: 6 additions & 0 deletions src/components/Tip/Tip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
PolkadotNetworkIcon,
KusamaNetworkIcon,
DebioNetworkIcon,
MyriadPaseoIcon,
MyriadRococoIcon,
} from 'src/components/atoms/Icons';
import ShowIf from 'src/components/common/show-if.component';
Expand Down Expand Up @@ -57,6 +58,10 @@ const networkOptions: MenuOptions<string>[] = [
id: 'near',
title: 'NEAR',
},
{
id: 'paseo',
title: 'Myriad Paseo',
},
{
id: 'rococo',
title: 'Myriad Rococo',
Expand Down Expand Up @@ -93,6 +98,7 @@ export const Tip: React.FC<TipProps> = props => {
kusama: <KusamaNetworkIcon width={'24px'} height={'24px'} />,
near: <NearNetworkIcon24 width={'24px'} height={'24px'} />,
myriad: <MyriadOctopusIcon width={'24px'} height={'24px'} />,
paseo: <MyriadPaseoIcon width={'24px'} height={'24px'} />,
rococo: <MyriadRococoIcon width={'24px'} height={'24px'} />,
debio: <DebioNetworkIcon width={'24px'} height={'24px'} />,
}),
Expand Down
10 changes: 10 additions & 0 deletions src/components/atoms/Icons/Core.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import MyriadFullBlack from 'src/images/Icons/myriad-full-black.svg';
import MyriadGrey from 'src/images/Icons/myriad-grey.svg';
import MyriadFull from 'src/images/Icons/myriad-logo-full.svg';
import MyriadOctopus from 'src/images/Icons/myriad-octopus.svg';
import MyriadPaseo from 'src/images/Icons/myriad-paseo.svg';
import MyriadRococo from 'src/images/Icons/myriad-rococo.svg';
import Notification from 'src/images/Icons/notif-default.svg';
import OfficialBadge from 'src/images/Icons/official-badge.svg';
Expand All @@ -37,6 +38,15 @@ export const MyriadOctopusIcon: React.FC<IconProps> = props => (
/>
);

export const MyriadPaseoIcon: React.FC<IconProps> = props => (
<SvgIcon
component={MyriadPaseo}
viewBox="0 0 30 30"
style={{ width: props.width, height: props.height, fill: 'none' }}
{...props}
/>
);

export const MyriadRococoIcon: React.FC<IconProps> = props => (
<SvgIcon
component={MyriadRococo}
Expand Down
4 changes: 4 additions & 0 deletions src/helpers/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ export const convertToPolkadotAddress = (
): string => {
if (isHex(address)) {
switch (currentWallet.networkId) {
case NetworkIdEnum.MYRIADPASEO: {
return encodeAddress(hexToU8a(address), 42);
}

case NetworkIdEnum.MYRIADROCOCO: {
return encodeAddress(hexToU8a(address), 42);
}
Expand Down
1 change: 1 addition & 0 deletions src/helpers/wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export const formatWalletTitle = (

if (networkId) {
switch (networkId) {
case NetworkIdEnum.MYRIADPASEO:
case NetworkIdEnum.MYRIADROCOCO:
case NetworkIdEnum.MYRIADOCTOPUS:
case NetworkIdEnum.DEBIO:
Expand Down
1 change: 1 addition & 0 deletions src/images/Icons/myriad-paseo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/interfaces/network.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export enum NetworkIdEnum {
POLYGON = 'polygon',
NEAR = 'near',
MYRIADOCTOPUS = 'myriad',
MYRIADPASEO = 'paseo',
MYRIADROCOCO = 'rococo',
KUSAMA = 'kusama',
DEBIO = 'debio',
Expand Down
1 change: 1 addition & 0 deletions src/reducers/config/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ export const fetchFilteredToken: ThunkActionCreator<Actions, RootState> =
or: [
{ networkId: 'myriad' },
{ networkId: 'debio' },
{ networkId: 'paseo' },
{ networkId: 'rococo' },
],
},
Expand Down
Loading