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

release: desktop 2.1.5 #7320

Merged
merged 9 commits into from
Aug 18, 2023
Merged
2 changes: 1 addition & 1 deletion packages/desktop/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "desktop",
"productName": "Firefly Shimmer",
"version": "2.1.4",
"version": "2.1.5",
"description": "Official wallet application of Shimmer",
"main": "public/build/main.js",
"repository": "[email protected]:iotaledger/firefly.git",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
completeOnboardingProcess,
isOnboardingLedgerProfile,
onboardingProfile,
updateOnboardingProfile,
} from '@contexts/onboarding'
import { mobile } from '@core/app'
import { localize } from '@core/i18n'
import { checkOrConnectLedger } from '@core/ledger'
import { ProfileType } from '@core/profile'
import { setStrongholdPassword } from '@core/profile-manager'
import { STRONGHOLD_VERSION } from '@core/stronghold'
import { Animation, Button, Icon, Text, TextHint } from '@ui'
import { TextHintVariant } from 'shared/components/enums'
import { TextType } from '@ui/enums'
Expand All @@ -30,6 +33,9 @@
if ($onboardingProfile?.restoreProfileType === RestoreProfileType.Stronghold) {
await setStrongholdPassword($onboardingProfile.strongholdPassword)
}
const isLedgerProfile = $onboardingProfile?.type === ProfileType.Ledger
const strongholdVersion = isLedgerProfile ? undefined : STRONGHOLD_VERSION
updateOnboardingProfile({ ...(strongholdVersion && { strongholdVersion }) })
completeOnboardingProcess()
$onboardingRouter.next()
return Promise.resolve()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { generateRandomId } from '@core/utils'
import { STRONGHOLD_VERSION } from '@core/stronghold'
import { IOnboardingProfile } from '../interfaces'

/**
Expand All @@ -10,6 +9,5 @@ export function buildInitialOnboardingProfile(isDeveloperProfile: boolean): Part
return {
id: generateRandomId(),
isDeveloperProfile,
strongholdVersion: STRONGHOLD_VERSION,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ export const OFFICIAL_NODE_URLS: Readonly<{ [key in NetworkId]?: string[] }> = {
'https://chrysalis-nodes.iota.cafe',
'https://iota-node.tanglebay.com',
],
[NetworkId.Shimmer]: ['https://api.shimmer.network'],
[NetworkId.Shimmer]: ['https://api.shimmer.network', 'https://shimmer-node.tanglebay.com'],
[NetworkId.Testnet]: ['https://api.testnet.shimmer.network'],
}
2 changes: 1 addition & 1 deletion packages/shared/lib/core/network/tests/network.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ describe('File: network.ts', () => {
'https://chrysalis-nodes.iota.cafe',
'https://iota-node.tanglebay.com',
],
[NetworkId.Shimmer]: ['https://api.shimmer.network'],
[NetworkId.Shimmer]: ['https://api.shimmer.network', 'https://shimmer-node.tanglebay.com'],
[NetworkId.Testnet]: ['https://api.testnet.shimmer.network'],
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export function saveActiveProfile(): void {
isDeveloperProfile: _activeProfile.isDeveloperProfile,
clientOptions: _activeProfile.clientOptions,
forceAssetRefresh: _activeProfile.forceAssetRefresh,
strongholdVersion: _activeProfile.strongholdVersion,
...(_activeProfile.strongholdVersion && { strongholdVersion: _activeProfile.strongholdVersion }),
...(_activeProfile.hasVisitedDashboard && { hasVisitedDashboard: _activeProfile.hasVisitedDashboard }),
...(_activeProfile.lastUsedAccountIndex && { lastUsedAccountIndex: _activeProfile.lastUsedAccountIndex }),
...(_activeProfile.accountPersistedData && { accountPersistedData: _activeProfile.accountPersistedData }),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
} from '../../constants'
import { IPersistedProfile } from '../../interfaces'
import { currentProfileVersion, profiles, saveProfile } from '../../stores'
import { ProfileType } from '@core/profile/enums'

/**
* Migrates profile data in need of being modified to accommodate changes
Expand Down Expand Up @@ -60,6 +61,7 @@ const persistedProfileMigrationsMap: Record<number, (existingProfile: unknown) =
10: persistedProfileMigrationToV11,
11: persistedProfileMigrationToV12,
12: persistedProfileMigrationToV13,
13: persistedProfileMigrationToV14,
}

function persistedProfileMigrationToV4(existingProfile: unknown): void {
Expand Down Expand Up @@ -289,3 +291,11 @@ function persistedProfileMigrationToV13(

saveProfile(newProfile as IPersistedProfile)
}

function persistedProfileMigrationToV14(existingProfile: IPersistedProfile): void {
const isLedgerProfile = existingProfile?.type === ProfileType.Ledger
if (isLedgerProfile) {
delete existingProfile.strongholdVersion
saveProfile(existingProfile)
}
}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const PROFILE_VERSION = 13
export const PROFILE_VERSION = 14
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ export interface IPersistedProfile {
lastUsedAccountIndex?: number
clientOptions: IClientOptions
forceAssetRefresh: boolean
strongholdVersion: StrongholdVersion
strongholdVersion?: StrongholdVersion
pfp?: INft
}
2 changes: 1 addition & 1 deletion packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@iota/transaction-converter": "^1.0.0-beta.30",
"@iota/unit-converter": "^1.0.0-beta.30",
"@iota/util.js": "^2.0.0-rc.1",
"@iota/wallet": "2.0.3-rc.42",
"@iota/wallet": "2.0.3-rc.44",
"@sveltejs/svelte-virtual-list": "^3.0.1",
"big-integer": "^1.6.51",
"big.js": "^6.0.3",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -915,10 +915,10 @@
dependencies:
big-integer "^1.6.51"

"@iota/[email protected].42":
version "2.0.3-rc.42"
resolved "https://registry.yarnpkg.com/@iota/wallet/-/wallet-2.0.3-rc.42.tgz#62373ba2dca09a9d6a0358ae2580e89f88d1f353"
integrity sha512-w3M0B/KLDYyYP0C72rHgc1KQ+WN21RDdFldapVbGDgtWyDuQN/XiXC90hPDvr8G8++V9d2nQ0gnxfSvpfsgOPQ==
"@iota/[email protected].44":
version "2.0.3-rc.44"
resolved "https://registry.yarnpkg.com/@iota/wallet/-/wallet-2.0.3-rc.44.tgz#5d724638a23c68e5f0f61861660ac4ed321a0a54"
integrity sha512-/o1o9yH83nY16nvqLfcMtSZPy92Ca0m5+MtKjnR2V0u5UCwUu6GH3cSauIuWrT4rFJoaKZF3CAPcc2raJ/5YDg==
dependencies:
"@iota/types" "^1.0.0-beta.15"
cargo-cp-artifact "^0.1.6"
Expand Down