fix: error when deleting a profile and doing auto-logout (#8208)

* fix: error when deleting a profile * fix: error with auto-logout * fix: more errors when doing auto logout * fix: conditional place --------- Co-authored-by: Begoña Álvarez de la Cruz <[email protected]>
iotaledger · Mar 19, 2024 · c5a0f34 · c5a0f34
1 parent 72521de
commit c5a0f34
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 72 deletions.
diff --git a/packages/desktop/components/popups/AccountConfirmationPopup.svelte b/packages/desktop/components/popups/AccountConfirmationPopup.svelte
@@ -44,7 +44,7 @@
  : ''
 
  $: void setStorageDeposit(accountOutput)
- $: isTransferring = $selectedWallet.isTransferring
+ $: isTransferring = $selectedWallet?.isTransferring
 
  async function setStorageDeposit(accountOutput: AccountOutput): Promise<void> {
  try {

diff --git a/packages/desktop/components/popups/ActivateAccountPopup.svelte b/packages/desktop/components/popups/ActivateAccountPopup.svelte
@@ -6,7 +6,7 @@
  export let outputId: string | undefined
 
  // Redirect to the dashboard when the output we passed previously has now been consumed
- $: isAccountActivated = $selectedWallet.walletUnspentOutputs.some((output) => outputId === output.outputId)
+ $: isAccountActivated = $selectedWallet?.walletUnspentOutputs?.some((output) => outputId === output.outputId)
  $: !isAccountActivated && $dashboardRouter.goTo(DashboardRoute.Wallet)
 </script>
 

diff --git a/packages/desktop/components/popups/ActivityDetailsPopup.svelte b/packages/desktop/components/popups/ActivityDetailsPopup.svelte
@@ -35,7 +35,7 @@
 
  const explorerUrl = getOfficialExplorerUrl($activeProfile?.network?.id)
 
- $: activity = $selectedWalletActivities.find((_activity) => _activity.id === activityId)
+ $: activity = $selectedWalletActivities?.find((_activity) => _activity.id === activityId)
  $: isTimelocked = activity?.asyncData?.asyncStatus === ActivityAsyncStatus.Timelocked
  $: isActivityIncomingAndUnclaimed =
  activity?.asyncData &&
@@ -100,61 +100,63 @@
  })
 </script>
 
-<activity-details-popup class="w-full h-full space-y-6 flex flex-auto flex-col shrink-0">
- <div class="flex flex-col">
- <Text type={TextType.h3} fontWeight={FontWeight.semibold} classes="text-left">
- {localize('popups.transactionDetails.title')}
- </Text>
- {#if explorerUrl && activity?.transactionId}
- <button
- class="action w-max flex justify-start text-center font-medium text-14 text-blue-500"
- on:click={onExplorerClick}
- >
- {localize('general.viewOnExplorer')}
- </button>
- {:else if activity?.transactionId}
- <button
- class="action w-fit flex justify-start text-center font-medium text-14 text-blue-500"
- on:click={onTransactionIdClick}
- >
- {truncateString(activity.transactionId, 12, 12)}
- </button>
+{#if activity}
+ <activity-details-popup class="w-full h-full space-y-6 flex flex-auto flex-col shrink-0">
+ <div class="flex flex-col">
+ <Text type={TextType.h3} fontWeight={FontWeight.semibold} classes="text-left">
+ {localize('popups.transactionDetails.title')}
+ </Text>
+ {#if explorerUrl && activity.transactionId}
+ <button
+ class="action w-max flex justify-start text-center font-medium text-14 text-blue-500"
+ on:click={onExplorerClick}
+ >
+ {localize('general.viewOnExplorer')}
+ </button>
+ {:else if activity.transactionId}
+ <button
+ class="action w-fit flex justify-start text-center font-medium text-14 text-blue-500"
+ on:click={onTransactionIdClick}
+ >
+ {truncateString(activity.transactionId, 12, 12)}
+ </button>
+ {/if}
+ </div>
+ <activity-details class="w-full h-full space-y-6 flex flex-auto flex-col shrink-0">
+ {#if activity.type === ActivityType.Basic || activity.type === ActivityType.Vesting}
+ <BasicActivityDetails {activity} />
+ {:else if activity.type === ActivityType.Foundry}
+ <FoundryActivityDetails {activity} />
+ {:else if activity.type === ActivityType.Governance}
+ <GovernanceActivityDetails {activity} />
+ {:else if activity.type === ActivityType.Consolidation}
+ <ConsolidationActivityDetails {activity} />
+ {:else if activity.type === ActivityType.Nft}
+ <NftActivityDetails {activity} />
+ {:else if activity.type === ActivityType.Account}
+ <AccountActivityDetails {activity} />
+ {/if}
+ <ActivityInformation {activity} />
+ </activity-details>
+ {#if !isTimelocked && isActivityIncomingAndUnclaimed}
+ <popup-buttons class="flex flex-row flex-nowrap w-full space-x-4">
+ <Button
+ outline
+ classes="w-full"
+ disabled={activity.asyncData?.isClaiming || activity.asyncData?.isRejected}
+ onClick={onRejectClick}
+ >
+ {localize('actions.reject')}
+ </Button>
+ <Button
+ classes="w-full"
+ disabled={activity.asyncData?.isClaiming}
+ onClick={onClaimClick}
+ isBusy={activity.asyncData?.isClaiming}
+ >
+ {localize('actions.claim')}
+ </Button>
+ </popup-buttons>
  {/if}
- </div>
- <activity-details class="w-full h-full space-y-6 flex flex-auto flex-col shrink-0">
- {#if activity.type === ActivityType.Basic || activity.type === ActivityType.Vesting}
- <BasicActivityDetails {activity} />
- {:else if activity.type === ActivityType.Foundry}
- <FoundryActivityDetails {activity} />
- {:else if activity.type === ActivityType.Governance}
- <GovernanceActivityDetails {activity} />
- {:else if activity.type === ActivityType.Consolidation}
- <ConsolidationActivityDetails {activity} />
- {:else if activity.type === ActivityType.Nft}
- <NftActivityDetails {activity} />
- {:else if activity.type === ActivityType.Account}
- <AccountActivityDetails {activity} />
- {/if}
- <ActivityInformation {activity} />
- </activity-details>
- {#if !isTimelocked && isActivityIncomingAndUnclaimed}
- <popup-buttons class="flex flex-row flex-nowrap w-full space-x-4">
- <Button
- outline
- classes="w-full"
- disabled={activity.asyncData?.isClaiming || activity.asyncData?.isRejected}
- onClick={onRejectClick}
- >
- {localize('actions.reject')}
- </Button>
- <Button
- classes="w-full"
- disabled={activity.asyncData?.isClaiming}
- onClick={onClaimClick}
- isBusy={activity.asyncData?.isClaiming}
- >
- {localize('actions.claim')}
- </Button>
- </popup-buttons>
- {/if}
-</activity-details-popup>
+ </activity-details-popup>
+{/if}
diff --git a/packages/desktop/components/popups/BurnNativeTokensConfirmationPopup.svelte b/packages/desktop/components/popups/BurnNativeTokensConfirmationPopup.svelte
@@ -63,8 +63,8 @@
  <Button
  classes="w-full"
  variant={ButtonVariant.Warning}
- isBusy={$selectedWallet.isTransferring}
- disabled={$selectedWallet.isTransferring}
+ isBusy={$selectedWallet?.isTransferring}
+ disabled={$selectedWallet?.isTransferring}
  onClick={onBurnTokenClick}
  >
  {localize('actions.burnToken')}

diff --git a/packages/desktop/components/popups/ConfirmationPopup.svelte b/packages/desktop/components/popups/ConfirmationPopup.svelte
@@ -65,8 +65,8 @@
  <Button
  classes="w-full"
  variant={buttonVariant}
- disabled={$selectedWallet.isTransferring || isBusy}
- isBusy={$selectedWallet.isTransferring || isBusy}
+ disabled={$selectedWallet?.isTransferring || isBusy}
+ isBusy={$selectedWallet?.isTransferring || isBusy}
  onClick={onConfirmClick}
  >
  {confirmText}

diff --git a/packages/desktop/components/popups/MintNftConfirmationPopup.svelte b/packages/desktop/components/popups/MintNftConfirmationPopup.svelte
@@ -138,14 +138,14 @@
  </nft-details>
  </div>
  <div class="flex flex-row flex-nowrap w-full space-x-4">
- <Button outline classes="w-full" disabled={$selectedWallet.isTransferring} onClick={onBackClick}>
+ <Button outline classes="w-full" disabled={$selectedWallet?.isTransferring} onClick={onBackClick}>
  {localize('actions.back')}
  </Button>
  <Button
  classes="w-full"
- disabled={$selectedWallet.isTransferring}
+ disabled={$selectedWallet?.isTransferring}
  onClick={onConfirmClick}
- isBusy={$selectedWallet.isTransferring}
+ isBusy={$selectedWallet?.isTransferring}
  >
  {localize('actions.confirm')}
  </Button>

diff --git a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte b/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
@@ -69,7 +69,7 @@
  transactionDetails.asset?.metadata?.standard === TokenStandard.BaseToken
  $: isInternal = recipient.type === SubjectType.Wallet
  $: isLayer2Transaction = !!layer2Parameters
- $: isTransferring = $selectedWallet.isTransferring
+ $: isTransferring = $selectedWallet?.isTransferring
  $: hideGiftToggle = isBaseTokenTransfer || isLayer2Transaction || (disableToggleGift && !giftStorageDeposit)
 
  $: if (!isSendAndClosePopup) expirationDate, giftStorageDeposit, void rebuildTransactionOutput()

diff --git a/packages/desktop/components/popups/send/SendFormPopup.svelte b/packages/desktop/components/popups/send/SendFormPopup.svelte
@@ -24,7 +24,7 @@
  $: hasSpendableNfts = $ownedNfts.some((nft) => nft.isSpendable)
  $: isTransferInProgress =
  $selectedWalletActivities.some((_activity) => _activity.inclusionState === InclusionState.Pending) ||
- $selectedWallet.isTransferring
+ $selectedWallet?.isTransferring
 
  async function validate(
  inputValidations?: [() => Promise<void>],

diff --git a/...ws/dashboard/wallet/views/implicit-account-creation-multistep/FundConfirmationView.svelte b/...ws/dashboard/wallet/views/implicit-account-creation-multistep/FundConfirmationView.svelte
@@ -27,7 +27,7 @@
  ? formatTokenAmountBestMatch(Number(selectedOutput?.output.amount), baseCoin.metadata)
  : '-')
  $: formattedWalletBalance =
- $selectedWallet.balances?.baseCoin?.available && baseCoin
+ $selectedWallet?.balances?.baseCoin?.available && baseCoin
  ? formatTokenAmountBestMatch(Number($selectedWallet.balances.baseCoin.available), baseCoin.metadata)
  : '-'
 

diff --git a/packages/shared/lib/core/wallet/actions/getWalletAssetsForSelectedWallet.ts b/packages/shared/lib/core/wallet/actions/getWalletAssetsForSelectedWallet.ts
@@ -31,8 +31,8 @@ function getWalletAssetForNetwork(marketCoinPrices: MarketCoinPrices, networkId:
  const baseCoin: IAsset = {
  ...persistedBaseCoin,
  balance: {
- total: Number(wallet?.balances?.baseCoin?.total),
- available: Number(wallet?.balances?.baseCoin?.available),
+ total: Number(wallet?.balances?.baseCoin?.total ?? 0),
+ available: Number(wallet?.balances?.baseCoin?.available ?? 0),
  },
  ...(shouldCalculateFiatPrice && { marketPrices: marketCoinPrices?.[marketCoinId] }),
  }