Skip to content

Commit 96dffdf

Browse files
begonaalvarezdcpl121marc2332
authored
chore & fix: update code for shimmer app (#7495)
* chore & fix: update code for shimmer app Co-authored-by: cpl121 <[email protected]> Co-authored-by: Marc Espín <[email protected]> * fix: cache invalidation mask --------- Co-authored-by: cpl121 <[email protected]> Co-authored-by: Marc Espín <[email protected]>
1 parent c05d3f9 commit 96dffdf

File tree

9 files changed

+97
-65
lines changed

9 files changed

+97
-65
lines changed

‎.github/workflows/build-and-release-desktop.yml

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
name: Build and Release Desktop
22

33
env:
4-
NETWORK: IOTA
5-
NETWORK_CODE: iota
4+
NETWORK: Shimmer
5+
NETWORK_CODE: shimmer
66

77
on:
88
push:
99
tags:
10-
- desktop-iota-*
10+
- desktop-shimmer-*
1111
workflow_dispatch:
1212
inputs:
1313
debugElectronBuilder:
@@ -39,7 +39,7 @@ jobs:
3939
- id: set_outputs
4040
name: Set outputs for version, release name, and stage
4141
run: |
42-
VERSION=${GITHUB_REF#refs/*/desktop-iota-}
42+
VERSION=${GITHUB_REF#refs/*/desktop-shimmer-}
4343
RELEASE_NAME=$(echo $VERSION | perl -0777 -pe 's/^([0-9]\d*\.[0-9]\d*\.[0-9]\d*)(?:-([a-z]*)-(\d*))?$/$1 \u$2 $3/')
4444
STAGE=$(echo $VERSION | perl -0777 -pe 's/^([0-9]\d*\.[0-9]\d*\.[0-9]\d*)(?:-([a-z]*)-([0-9]\d*(\.[0-9]\d*)*))?$/$2/')
4545
@@ -198,7 +198,7 @@ jobs:
198198
name: firefly-desktop-${{ matrix.os }}
199199
path: |
200200
packages/desktop/out/firefly-*
201-
packages/desktop/out/latest*
201+
packages/desktop/out/shimmer*
202202
203203
release:
204204
runs-on: ubuntu-latest
@@ -307,15 +307,16 @@ jobs:
307307

308308
- name: Upload to S3
309309
run: |
310-
aws s3 cp assets/ s3://firefly-private/firefly/releases/ --recursive --include "*" --exclude "*.sha256" --exclude "*.blockmap" --exclude "*.asc" --acl public-read
310+
aws s3 cp assets/ s3://iotaledger-files/4a1ddea1-10c1-4f1d-83f0-e14903931a46/releases/ --recursive --include "*" --exclude "*.sha256" --exclude "*.blockmap" --exclude "*.asc" --acl public-read
311+
aws s3 cp assets/ s3://iotaledger-files/firefly/releases/ --recursive --include "*" --exclude "*.sha256" --exclude "*.blockmap" --exclude "*.asc" --acl public-read
311312
env:
312313
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
313314
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
314315
AWS_DEFAULT_REGION: eu-central-1
315316

316-
#- name: Invalidate CloudFront cache for auto-update files
317-
#run: aws cloudfront create-invalidation --distribution-id E32G4HRED4PO65 --paths "/latest*"
318-
#env:
319-
#AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
320-
#AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
321-
#AWS_DEFAULT_REGION: eu-central-1
317+
- name: Invalidate CloudFront cache for auto-update files
318+
run: aws cloudfront create-invalidation --distribution-id E32G4HRED4PO65 --paths "/shimmer*"
319+
env:
320+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
321+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
322+
AWS_DEFAULT_REGION: eu-central-1

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<a href=""><img src="header.png"></a>
44
</h1>
55

6-
<h2 align="center">Firefly</h2>
6+
<h2 align="center">Firefly Shimmer</h2>
77

88
<p align="center">
99
<a href="https://discord.iota.org/" style="text-decoration:none;"><img src="https://img.shields.io/badge/Discord-9cf.svg?logo=discord" alt="Discord"></a>

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import { UnlockCondition, UnlockConditionType, OutputType, CommonOutput } from '@iota/sdk/out/types'
1010
import { BalanceSummarySection, Button, FontWeight, Text, TextType } from 'shared/components'
1111
import { TextHintVariant } from 'shared/components/enums'
12+
import features from '@features/features'
1213
1314
interface BalanceBreakdown {
1415
amount: number
@@ -38,7 +39,7 @@
3839
pending: pendingBreakdown,
3940
locked: lockedBreakdown,
4041
storageDeposit: storageDepositBreakdown,
41-
vesting: vestingBreakdown,
42+
...(features.vesting.enabled && { vesting: vestingBreakdown }),
4243
}
4344
}
4445

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

+36-39
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@ import type { IOnboardingFeaturesForNetwork } from '@lib/features/interfaces'
22
import type { OnboardingFeatures } from '@lib/features/types'
33

44
const onboardingFeaturesForIota: IOnboardingFeaturesForNetwork = {
5-
enabled: true,
6-
hidden: false,
5+
enabled: false,
6+
hidden: true,
77
newProfile: {
8-
enabled: true,
8+
enabled: false,
99
softwareProfile: {
10-
enabled: true,
10+
enabled: false,
1111
},
1212
ledgerProfile: {
13-
enabled: true,
13+
enabled: false,
1414
},
1515
},
1616
restoreProfile: {
17-
enabled: true,
17+
enabled: false,
1818
recoveryPhrase: {
19-
enabled: true,
19+
enabled: false,
2020
},
2121
strongholdBackup: {
22-
enabled: true,
22+
enabled: false,
2323
},
2424
ledgerBackup: {
25-
enabled: true,
25+
enabled: false,
2626
},
2727
},
2828
claimRewards: {
2929
enabled: false,
30-
hidden: true,
30+
hidden: false,
3131
recoveryPhrase: {
3232
enabled: false,
3333
},
@@ -40,10 +40,9 @@ const onboardingFeaturesForIota: IOnboardingFeaturesForNetwork = {
4040
},
4141
}
4242

43-
const IS_ALPHANET_ENABLED = process.env.STAGE !== 'prod'
4443
const onboardingFeaturesForIotaAlphanet: IOnboardingFeaturesForNetwork = {
45-
enabled: IS_ALPHANET_ENABLED,
46-
hidden: !IS_ALPHANET_ENABLED,
44+
enabled: false,
45+
hidden: true,
4746
newProfile: {
4847
enabled: true,
4948
softwareProfile: {
@@ -81,79 +80,77 @@ const onboardingFeaturesForIotaAlphanet: IOnboardingFeaturesForNetwork = {
8180
}
8281

8382
const onboardingFeaturesForShimmer: IOnboardingFeaturesForNetwork = {
84-
enabled: false,
85-
hidden: true,
83+
enabled: true,
8684
newProfile: {
87-
enabled: false,
85+
enabled: true,
8886
softwareProfile: {
89-
enabled: false,
87+
enabled: true,
9088
},
9189
ledgerProfile: {
92-
enabled: false,
90+
enabled: true,
9391
},
9492
},
9593
restoreProfile: {
96-
enabled: false,
94+
enabled: true,
9795
recoveryPhrase: {
98-
enabled: false,
96+
enabled: true,
9997
},
10098
strongholdBackup: {
101-
enabled: false,
99+
enabled: true,
102100
},
103101
ledgerBackup: {
104-
enabled: false,
102+
enabled: true,
105103
},
106104
},
107105
claimRewards: {
108-
enabled: false,
106+
enabled: true,
109107
hidden: false,
110108
recoveryPhrase: {
111-
enabled: false,
109+
enabled: true,
112110
},
113111
strongholdBackup: {
114-
enabled: false,
112+
enabled: true,
115113
},
116114
ledgerBackup: {
117-
enabled: false,
115+
enabled: true,
118116
},
119117
},
120118
}
121119

122120
const onboardingFeaturesForTestnet: IOnboardingFeaturesForNetwork = {
123-
enabled: false,
124-
hidden: true,
121+
enabled: true,
125122
newProfile: {
126-
enabled: false,
123+
enabled: true,
127124
softwareProfile: {
128-
enabled: false,
125+
enabled: true,
129126
},
130127
ledgerProfile: {
131-
enabled: false,
128+
enabled: true,
132129
},
133130
},
134131
restoreProfile: {
135-
enabled: false,
132+
enabled: true,
136133
recoveryPhrase: {
137-
enabled: false,
134+
enabled: true,
138135
},
139136
strongholdBackup: {
140-
enabled: false,
137+
enabled: true,
141138
},
142139
ledgerBackup: {
143-
enabled: false,
140+
enabled: true,
144141
},
145142
},
146143
claimRewards: {
147-
enabled: false,
144+
enabled: true,
148145
hidden: false,
149146
recoveryPhrase: {
150-
enabled: false,
147+
enabled: true,
151148
},
152149
strongholdBackup: {
153-
enabled: false,
150+
enabled: true,
154151
},
155152
ledgerBackup: {
156-
enabled: false,
153+
enabled: true,
157154
},
158155
},
159156
}

‎packages/desktop/features/vesting.features.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { IVestingFeatures } from '@lib/features/interfaces'
22

33
const vestingFeatures: IVestingFeatures = {
4-
enabled: true,
4+
enabled: false,
55
}
66

77
export default vestingFeatures

‎packages/desktop/product.js

+19-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
/* eslint-disable */
2-
const PRODUCT_NAME = 'Firefly'
3-
const NETWORK = 'iota'
2+
const PRODUCT_NAME = 'Firefly Shimmer'
3+
const NETWORK = 'shimmer'
44

55
const STAGE = process.env.STAGE || 'alpha'
66
const APP_ID = getAppId()
77
const APP_PROTOCOL = getAppProtocol()
88
const CHANNEL_NAME = getChannelName()
99
const APP_ARTIFACT = getAppArtifact()
10-
const appNameBase = STAGE === 'prod' ? PRODUCT_NAME : `${PRODUCT_NAME} ${STAGE.replace(/^\w/, (c) => c.toUpperCase())}`
10+
const appNameBase =
11+
STAGE === 'prod' ? PRODUCT_NAME : `${PRODUCT_NAME} - ${STAGE.replace(/^\w/, (c) => c.toUpperCase())}`
1112

1213
function getAppArtifact() {
1314
return `firefly-${NETWORK}-desktop-\${version}.\${ext}`
@@ -22,7 +23,7 @@ function getKeychainServiceName(isPackaged) {
2223
if (isPackaged) {
2324
return appNameBase
2425
} else {
25-
return `${PRODUCT_NAME} — Dev`
26+
return `Firefly — Dev`
2627
}
2728
}
2829

@@ -42,25 +43,34 @@ function getAppName(isPackaged = true) {
4243
/**
4344
* If stage = 'prod' -> 'iota'
4445
* If stage = 'alpha' -> 'iota-alpha'
46+
* If network = 'iota' -> 'iota',
47+
* If network = 'shimmer' -> 'firefly'
4548
*/
4649
function getAppProtocol() {
47-
return STAGE === 'prod' ? 'iota' : `iota-${STAGE.toLowerCase()}`
50+
return STAGE === 'prod' ? 'firefly' : `firefly-${STAGE.toLowerCase()}`
4851
}
4952

5053
/**
51-
* If stage = 'prod' -> 'org.iota.firefly'
52-
* If stage = 'alpha' -> 'org.iota.firefly.alpha'
54+
* If stage = 'prod' -> 'org.iota.firefly-shimmer'
55+
* If stage = 'alpha' -> 'org.iota.firefly-shimmer.alpha'
5356
*/
5457
function getAppId() {
55-
const defaultAppId = 'org.iota.firefly'
58+
const defaultAppId = 'org.iota.firefly-shimmer'
5659
if (STAGE === 'prod') {
5760
return defaultAppId
5861
}
5962
return `${defaultAppId}.${STAGE}`
6063
}
6164

6265
function getChannelName() {
63-
return 'latest'
66+
switch (STAGE) {
67+
case 'alpha':
68+
return 'shimmer-alpha'
69+
case 'beta':
70+
return 'shimmer-beta'
71+
default:
72+
return 'shimmer'
73+
}
6474
}
6575

6676
module.exports = {

‎packages/desktop/views/dashboard/Dashboard.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script lang="ts">
22
import { handleDeepLink } from '@auxiliary/deep-link'
33
import { localize } from '@core/i18n'
4-
import { nodeInfo } from '@core/network'
4+
import { nodeInfo, NetworkId } from '@core/network'
55
import {
66
activeProfile,
77
hasStrongholdLocked,
@@ -108,7 +108,7 @@
108108
})
109109
}
110110
111-
if (!$isAwareOfMetricSystemDrop) {
111+
if (!$isAwareOfMetricSystemDrop && $activeProfile?.network?.id === NetworkId.Iota) {
112112
openPopup({
113113
id: PopupId.MetricSystemInfo,
114114
props: {

‎packages/shared/lib/core/network/constants/default-network-metadata.constant.ts

+19
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,25 @@ export const DEFAULT_NETWORK_METADATA: Readonly<{ [key in NetworkId]?: NetworkMe
2323
},
2424
baseToken: DEFAULT_BASE_TOKEN[NetworkId.Shimmer],
2525
},
26+
[NetworkId.Testnet]: <IStardustNetworkMetadata>{
27+
id: NetworkId.Testnet,
28+
name: 'Testnet',
29+
coinType: COIN_TYPE[NetworkId.Testnet],
30+
protocol: {
31+
version: 2,
32+
networkName: 'testnet',
33+
bech32Hrp: 'rms',
34+
minPowScore: 1500,
35+
belowMaxDepth: 15,
36+
rentStructure: {
37+
vByteCost: 100,
38+
vByteFactorData: 1,
39+
vByteFactorKey: 10,
40+
},
41+
tokenSupply: TokenSupply.Testnet,
42+
},
43+
baseToken: DEFAULT_BASE_TOKEN[NetworkId.Testnet],
44+
},
2645
[NetworkId.Iota]: <IStardustNetworkMetadata>{
2746
id: NetworkId.Iota,
2847
name: 'IOTA',

‎packages/shared/locales/en.json

+4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
"title": "Shimmer",
3131
"body": "Staging network for IOTA"
3232
},
33+
"testnet": {
34+
"title": "Testnet",
35+
"body": "Public beta network for Shimmer"
36+
},
3337
"iota": {
3438
"title": "IOTA",
3539
"body": "IOTA Mainnet"

0 commit comments

Comments
 (0)