From 51c3c657703a91dab6616f286896b98a558ae657 Mon Sep 17 00:00:00 2001 From: Jean Ribeiro Date: Mon, 20 May 2024 18:08:36 -0300 Subject: [PATCH 1/2] feat: adds Ethereum logos --- packages/shared/package.json | 2 +- .../src/components/avatars/NetworkAvatar.svelte | 4 ++++ .../shared/src/components/avatars/TokenAvatar.svelte | 12 ++++++++++++ .../auxiliary/icon/constants/default-network-icon.ts | 2 ++ .../auxiliary/icon/constants/default-token-icon.ts | 6 ++++++ 5 files changed, 25 insertions(+), 1 deletion(-) diff --git a/packages/shared/package.json b/packages/shared/package.json index 644347ef3c..83b87f55b5 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -5,7 +5,7 @@ "author": "Bloom Labs Ltd ", "license": "PolyForm Strict License 1.0.0", "dependencies": { - "@bloomwalletio/ui": "0.21.0", + "@bloomwalletio/ui": "0.21.1", "@ethereumjs/common": "4.3.0", "@ethereumjs/rlp": "5.0.2", "@ethereumjs/tx": "5.3.0", diff --git a/packages/shared/src/components/avatars/NetworkAvatar.svelte b/packages/shared/src/components/avatars/NetworkAvatar.svelte index 35230168a1..517082ac80 100644 --- a/packages/shared/src/components/avatars/NetworkAvatar.svelte +++ b/packages/shared/src/components/avatars/NetworkAvatar.svelte @@ -18,6 +18,8 @@ [SupportedNetworkId.ShimmerEvm]: 'shimmer-evm-background', [SupportedNetworkId.IotaTestnetEvm]: 'iota-evm-background/90', [SupportedNetworkId.TestnetEvm]: 'shimmer-evm-background/90', + [SupportedNetworkId.Ethereum]: '#627eea', + [SupportedNetworkId.Sepolia]: 'text-secondary', } const AVATAR_TEXT_COLOR: { [id in NetworkId]?: string } = { @@ -29,6 +31,8 @@ [SupportedNetworkId.ShimmerEvm]: 'shimmer-evm', [SupportedNetworkId.IotaTestnetEvm]: '#FFFFFF', [SupportedNetworkId.TestnetEvm]: '#FFFFFF', + [SupportedNetworkId.Ethereum]: '#FFFFFF', + [SupportedNetworkId.Sepolia]: '#FFFFFF', } let anchor: HTMLElement diff --git a/packages/shared/src/components/avatars/TokenAvatar.svelte b/packages/shared/src/components/avatars/TokenAvatar.svelte index e0b5f09d6c..0815412ede 100644 --- a/packages/shared/src/components/avatars/TokenAvatar.svelte +++ b/packages/shared/src/components/avatars/TokenAvatar.svelte @@ -38,6 +38,12 @@ [SupportedNetworkId.TestnetEvm]: { [BASE_TOKEN_ID]: 'text-secondary', }, + [SupportedNetworkId.Ethereum]: { + [BASE_TOKEN_ID]: '#627eea', + }, + [SupportedNetworkId.Sepolia]: { + [BASE_TOKEN_ID]: 'text-secondary', + }, } const AVATAR_TEXT_COLOR: { [networkId: string]: { [tokenId: string]: string } } = { @@ -65,6 +71,12 @@ [SupportedNetworkId.TestnetEvm]: { [BASE_TOKEN_ID]: '#FFFFFF', }, + [SupportedNetworkId.Ethereum]: { + [BASE_TOKEN_ID]: '#FFFFFF', + }, + [SupportedNetworkId.Sepolia]: { + [BASE_TOKEN_ID]: '#FFFFFF', + }, } const IMAGE_SIZES: Record = { diff --git a/packages/shared/src/lib/auxiliary/icon/constants/default-network-icon.ts b/packages/shared/src/lib/auxiliary/icon/constants/default-network-icon.ts index 6faca58ddb..9def162865 100644 --- a/packages/shared/src/lib/auxiliary/icon/constants/default-network-icon.ts +++ b/packages/shared/src/lib/auxiliary/icon/constants/default-network-icon.ts @@ -10,4 +10,6 @@ export const DEFAULT_NETWORK_ICON: { [id in NetworkId]?: IconName } = { [SupportedNetworkId.ShimmerEvm]: IconName.Shimmer, [SupportedNetworkId.IotaTestnetEvm]: IconName.Iota, [SupportedNetworkId.TestnetEvm]: IconName.Shimmer, + [SupportedNetworkId.Ethereum]: IconName.Ethereum, + [SupportedNetworkId.Sepolia]: IconName.Ethereum, } diff --git a/packages/shared/src/lib/auxiliary/icon/constants/default-token-icon.ts b/packages/shared/src/lib/auxiliary/icon/constants/default-token-icon.ts index 8021d9eb27..194e84e39c 100644 --- a/packages/shared/src/lib/auxiliary/icon/constants/default-token-icon.ts +++ b/packages/shared/src/lib/auxiliary/icon/constants/default-token-icon.ts @@ -27,4 +27,10 @@ export const DEFAULT_TOKEN_ICON: { [networkId in NetworkId]?: { [tokenId: string [SupportedNetworkId.TestnetEvm]: { [BASE_TOKEN_ID]: IconName.Shimmer, }, + [SupportedNetworkId.Ethereum]: { + [BASE_TOKEN_ID]: IconName.Ethereum, + }, + [SupportedNetworkId.Sepolia]: { + [BASE_TOKEN_ID]: IconName.Ethereum, + }, } From 3fcf9db7dac8a83517aaef9b7fc4b37cfee58894 Mon Sep 17 00:00:00 2001 From: Mark Nardi Date: Wed, 22 May 2024 09:26:39 +0200 Subject: [PATCH 2/2] yarn lock --- yarn.lock | 39 +++++++-------------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2785adb726..699f2e192f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -348,10 +348,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@bloomwalletio/ui@0.21.0": - version "0.21.0" - resolved "https://npm.pkg.github.com/download/@bloomwalletio/ui/0.21.0/86d45a11b362f98fe3b0088f6b2e9a30aacbdb5d#86d45a11b362f98fe3b0088f6b2e9a30aacbdb5d" - integrity sha512-fVDfsoeRQwTo/no4HRNBqr8Eqh0hh1i/NeVuH5R94MKvDasb/SzmlfOLiZGwoP/jzaA+g+OoBMXNz2NhKTU/tw== +"@bloomwalletio/ui@0.21.1": + version "0.21.1" + resolved "https://npm.pkg.github.com/download/@bloomwalletio/ui/0.21.1/ce60ed69ad083f7ebc27164cc2fa69c8bf1a041f#ce60ed69ad083f7ebc27164cc2fa69c8bf1a041f" + integrity sha512-1//FX06CFUvv2SXUHQGZwQ9Y8FbO/Irj8cYO3cVXNbQHiM93UCtxgb/jYmryaOSHBrhH7OtrzDt+/0Hg88BA1w== dependencies: "@floating-ui/dom" "1.4.3" "@popperjs/core" "2.11.8" @@ -9949,16 +9949,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -10035,14 +10026,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -11410,16 +11394,7 @@ wildcard@^2.0.0: resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67" integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==