Skip to content

Commit cbb1019

Browse files
begonaalvarezdcpl121
begonaalvarezd
and
cpl121
authored
chore: rename testnet to shimmer testnet, add new iota testnet network & add iota testnet evm (#8385)
* chore: rebrand testnet to shimmer testnet * feat: add new iota testnet network (missing final values) * feat: update explorer urls * feat: add iota evm testnet (missing final values) * chore: add comment * chore: rvert token supply & add new one for iota tetsnet * feat: fix comments from PR * chore: add comment * chore: add testnet & evm testnet values * fix: asset icons * fix: asset icons * style: polish css * fix: ledger icon with iota testnet * fix: improve searchAlgorithm in the balance finder popup * fix: add correct vByteCost --------- Co-authored-by: cpl121 <cpeon@boxfish.studio>
1 parent 0065135 commit cbb1019

29 files changed

+233
-71
lines changed

‎packages/desktop/components/modals/AccountActionsMenu.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
onClick={onViewAddressHistoryClick}
8585
/>
8686
{/if}
87-
{#if $activeProfile?.network?.id === NetworkId.Shimmer || $activeProfile?.network?.id === NetworkId.Testnet}
87+
{#if $activeProfile?.network?.id === NetworkId.Shimmer || $activeProfile?.network?.id === NetworkId.ShimmerTestnet || $activeProfile?.network?.id === NetworkId.IotaTestnet}
8888
<MenuItem icon={Icon.Transfer} title={localize('actions.withdrawFromL2')} onClick={onWithdrawFromL2Click} />
8989
{/if}
9090
<MenuItem icon={Icon.Customize} title={localize('actions.customizeAcount')} onClick={onCustomiseAccountClick} />

‎packages/desktop/components/popups/BalanceFinderPopup.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
$: searchInCurrentWallet, (shouldInitSearch = true)
6565
$: searchAlgorithm = searchInCurrentWallet
6666
? SearchAlgorithmType.DFS
67-
: network.id === NetworkId.Iota || NetworkId.IotaAlphanet
67+
: network.id === NetworkId.Iota || network.id === NetworkId.IotaAlphanet || network.id === NetworkId.IotaTestnet
6868
? SearchAlgorithmType.IDS
6969
: SearchAlgorithmType.BFS
7070

‎packages/desktop/features/onboarding.features.ts‎

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,45 @@ const onboardingFeaturesForIota: IOnboardingFeaturesForNetwork = {
4343
},
4444
}
4545

46+
const onboardingFeaturesForIotaTestnet: IOnboardingFeaturesForNetwork = {
47+
enabled: false,
48+
hidden: true,
49+
newProfile: {
50+
enabled: true,
51+
softwareProfile: {
52+
enabled: true,
53+
},
54+
ledgerProfile: {
55+
enabled: true,
56+
},
57+
},
58+
restoreProfile: {
59+
enabled: true,
60+
recoveryPhrase: {
61+
enabled: true,
62+
},
63+
strongholdBackup: {
64+
enabled: true,
65+
},
66+
ledgerBackup: {
67+
enabled: true,
68+
},
69+
},
70+
claimRewards: {
71+
enabled: false,
72+
hidden: true,
73+
recoveryPhrase: {
74+
enabled: false,
75+
},
76+
strongholdBackup: {
77+
enabled: false,
78+
},
79+
ledgerBackup: {
80+
enabled: false,
81+
},
82+
},
83+
}
84+
4685
const onboardingFeaturesForIotaAlphanet: IOnboardingFeaturesForNetwork = {
4786
enabled: false,
4887
hidden: true,
@@ -120,7 +159,7 @@ const onboardingFeaturesForShimmer: IOnboardingFeaturesForNetwork = {
120159
},
121160
}
122161

123-
const onboardingFeaturesForTestnet: IOnboardingFeaturesForNetwork = {
162+
const onboardingFeaturesForShimmerTestnet: IOnboardingFeaturesForNetwork = {
124163
enabled: true,
125164
newProfile: {
126165
enabled: true,
@@ -202,9 +241,10 @@ const onboardingFeatures: OnboardingFeatures = {
202241
enabled: true,
203242
},
204243
iota: onboardingFeaturesForIota,
244+
iotaTestnet: onboardingFeaturesForIotaTestnet,
205245
iotaAlphanet: onboardingFeaturesForIotaAlphanet,
206246
shimmer: onboardingFeaturesForShimmer,
207-
testnet: onboardingFeaturesForTestnet,
247+
shimmerTestnet: onboardingFeaturesForShimmerTestnet,
208248
custom: onboardingFeaturesForCustom,
209249
}
210250

‎packages/desktop/views/onboarding/views/network-setup/views/ChooseNetworkView.svelte‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
1919
const NETWORK_ICON: Record<NetworkId, Icon> = {
2020
[NetworkId.Iota]: Icon.Iota,
21-
[NetworkId.Testnet]: Icon.Settings,
22-
[NetworkId.Shimmer]: Icon.Shimmer,
21+
[NetworkId.IotaTestnet]: Icon.Settings,
2322
[NetworkId.IotaAlphanet]: Icon.Settings,
23+
[NetworkId.ShimmerTestnet]: Icon.Settings,
24+
[NetworkId.Shimmer]: Icon.Shimmer,
2425
[NetworkId.Custom]: Icon.Settings,
2526
}
2627
@@ -30,7 +31,8 @@
3031
return 'iota-highlight'
3132
case NetworkId.Shimmer:
3233
return 'shimmer-highlight'
33-
case NetworkId.Testnet:
34+
case NetworkId.ShimmerTestnet:
35+
case NetworkId.IotaTestnet:
3436
case NetworkId.Custom:
3537
case NetworkId.IotaAlphanet:
3638
return 'blue-500'

‎packages/shared/components/AssetIcon.svelte‎

Lines changed: 46 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
import { AnimationRenderer } from '@auxiliary/animation'
33
import { Icon as IconEnum, NETWORK_ICON_SVG } from '@auxiliary/icon'
44
import { getIconColorFromString } from '@core/account'
5-
import { COIN_TYPE, NetworkId } from '@core/network'
5+
import { COIN_TYPE, DEFAULT_BASE_TOKEN, NetworkId } from '@core/network'
66
import { isBright } from '@core/utils'
7-
import { ANIMATED_TOKEN_IDS, getAssetInitials, IPersistedAsset, TokenStandard } from '@core/wallet'
7+
import { ANIMATED_TOKEN_IDS, IPersistedAsset, TokenStandard, getAssetInitials } from '@core/wallet'
88
import { Animation, AssetIconSize, Icon, VerificationBadge } from 'shared/components'
99
1010
export let asset: IPersistedAsset
@@ -22,25 +22,51 @@
2222
$: assetIconColor = isBright(assetIconBackgroundColor) ? 'text-gray-800' : 'text-white'
2323
2424
function updateAssetIcon(): void {
25-
switch (asset.id) {
26-
case String(COIN_TYPE[NetworkId.Iota]):
27-
case String(COIN_TYPE[NetworkId.IotaAlphanet]):
28-
assetIconBackgroundColor = '#6E82A4'
29-
icon = NETWORK_ICON_SVG[NetworkId.Iota]
30-
break
31-
case String(COIN_TYPE[NetworkId.Shimmer]):
32-
case String(COIN_TYPE[NetworkId.Testnet]):
25+
const assetName = asset?.metadata?.name?.toLowerCase() ?? ''
26+
const assetId = asset?.id
27+
if (
28+
[
29+
String(COIN_TYPE[NetworkId.Iota]),
30+
String(COIN_TYPE[NetworkId.IotaTestnet]),
31+
String(COIN_TYPE[NetworkId.IotaAlphanet]),
32+
String(COIN_TYPE[NetworkId.Shimmer]),
33+
String(COIN_TYPE[NetworkId.ShimmerTestnet]),
34+
].includes(assetId)
35+
) {
36+
// if not a production network, use gray icon
37+
if (
38+
[
39+
String(COIN_TYPE[NetworkId.IotaTestnet]),
40+
String(COIN_TYPE[NetworkId.IotaAlphanet]),
41+
String(COIN_TYPE[NetworkId.ShimmerTestnet]),
42+
].includes(assetId)
43+
) {
44+
assetIconBackgroundColor = '#C4D1E8'
45+
} else if (String(DEFAULT_BASE_TOKEN[NetworkId.Iota]?.name?.toLowerCase()) === assetName) {
46+
assetIconBackgroundColor = '#000000'
47+
} else if (String(DEFAULT_BASE_TOKEN[NetworkId.Shimmer]?.name?.toLowerCase()) === assetName) {
3348
assetIconBackgroundColor = '#25DFCA'
49+
}
50+
51+
if (
52+
[
53+
String(DEFAULT_BASE_TOKEN[NetworkId.Iota]?.name?.toLowerCase()),
54+
String(DEFAULT_BASE_TOKEN[NetworkId.IotaTestnet]?.name?.toLowerCase()),
55+
String(DEFAULT_BASE_TOKEN[NetworkId.IotaAlphanet]?.name?.toLowerCase()),
56+
].includes(assetName)
57+
) {
58+
icon = NETWORK_ICON_SVG[NetworkId.Iota]
59+
} else {
3460
icon = NETWORK_ICON_SVG[NetworkId.Shimmer]
35-
break
36-
default:
37-
assetInitials = getAssetInitials(asset)
38-
assetIconBackgroundColor = getIconColorFromString(asset.metadata?.name, {
39-
shades: ['500', '600', '700', '800'],
40-
colorsToExclude: ['gray'],
41-
})
42-
assetLogoUrl = asset.metadata?.standard === TokenStandard.Irc30 ? asset.metadata?.logoUrl ?? '' : ''
43-
icon = null
61+
}
62+
} else {
63+
assetInitials = getAssetInitials(asset)
64+
assetIconBackgroundColor = getIconColorFromString(asset.metadata?.name, {
65+
shades: ['500', '600', '700', '800'],
66+
colorsToExclude: ['gray'],
67+
})
68+
assetLogoUrl = asset.metadata?.standard === TokenStandard.Irc30 ? asset.metadata?.logoUrl ?? '' : ''
69+
icon = null
4470
}
4571
}
4672
@@ -70,7 +96,7 @@
7096
renderer={AnimationRenderer.Canvas}
7197
/>
7298
{:else if icon}
73-
<Icon {icon} width="80%" height="80%" classes="{assetIconColor} text-center" />
99+
<Icon {icon} width="90%" height="90%" classes="{assetIconColor} text-center" />
74100
{:else if assetLogoUrl}
75101
<img src={assetLogoUrl} on:error={handleOnError} alt={assetLogoUrl} class="w-full h-full" />
76102
{:else}

‎packages/shared/components/NetworkIcon.svelte‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,19 @@
1616
backgroundColor: 'bg-black',
1717
iconColor: 'text-white',
1818
},
19-
[NetworkId.Shimmer]: {
20-
backgroundColor: 'bg-shimmer-highlight',
19+
[NetworkId.IotaTestnet]: {
20+
backgroundColor: 'bg-gray-400',
2121
iconColor: 'text-black',
2222
},
23-
[NetworkId.Testnet]: {
23+
[NetworkId.IotaAlphanet]: {
2424
backgroundColor: 'bg-gray-400',
2525
iconColor: 'text-black',
2626
},
27-
[NetworkId.IotaAlphanet]: {
27+
[NetworkId.Shimmer]: {
28+
backgroundColor: 'bg-shimmer-highlight',
29+
iconColor: 'text-black',
30+
},
31+
[NetworkId.ShimmerTestnet]: {
2832
backgroundColor: 'bg-gray-400',
2933
iconColor: 'text-black',
3034
},

‎packages/shared/lib/auxiliary/icon/constants/network-icon-svg.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import { Icon } from '../enums'
44

55
export const NETWORK_ICON_SVG: { [key in string]: Icon } = {
66
[NetworkId.Iota]: Icon.Iota,
7+
[NetworkId.IotaTestnet]: Icon.Iota,
78
[NetworkId.IotaAlphanet]: Icon.Iota,
89
[NetworkId.Shimmer]: Icon.Shimmer,
9-
[NetworkId.Testnet]: Icon.Shimmer,
10+
[NetworkId.ShimmerTestnet]: Icon.Shimmer,
1011
[ChainId.ShimmerEVM]: Icon.ShimmerEvm,
1112
}

‎packages/shared/lib/core/layer-2/enums/destination-network.enum.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export enum DestinationNetwork {
2+
IotaEvmTestnet = 'IOTA EVM Testnet',
23
Shimmer = 'Shimmer',
34
ShimmerEvm = 'ShimmerEVM',
45
ShimmerEvmTestnet = 'ShimmerEVM Testnet',

‎packages/shared/lib/core/ledger/stores/ledger-app-name.store.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ export const ledgerAppName: Readable<LedgerAppName> = derived(
88
[profileNetwork, onboardingProfileNetwork],
99
([$profileNetwork, $onboardingProfileNetwork]) => {
1010
const networkId = $profileNetwork?.id || $onboardingProfileNetwork?.id || NetworkId.Iota
11-
return networkId === NetworkId.Iota || networkId === NetworkId.IotaAlphanet
11+
return networkId === NetworkId.Iota ||
12+
networkId === NetworkId.IotaAlphanet ||
13+
networkId === NetworkId.IotaTestnet
1214
? LedgerAppName.Iota
1315
: LedgerAppName.Shimmer
1416
}

‎packages/shared/lib/core/market/utils/getMarketCoinByNetworkId.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ import { MarketCoinId } from '../enums'
44
export function getMarketCoinIdByNetworkId(networkId: NetworkId): MarketCoinId | undefined {
55
switch (networkId) {
66
case NetworkId.Iota:
7+
case NetworkId.IotaTestnet:
78
case NetworkId.IotaAlphanet:
89
return MarketCoinId.Iota
910
case NetworkId.Shimmer:
10-
case NetworkId.Testnet:
11+
case NetworkId.ShimmerTestnet:
1112
return MarketCoinId.Shimmer
1213
default:
1314
return

0 commit comments

Comments
 (0)