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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 5 commits into from
Mar 19, 2024
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
921b9f3
fix: error when deleting a profile
cpl121 Mar 15, 2024
ca5fc21
fix: error with auto-logout
cpl121 Mar 15, 2024
a295823
fix: more errors when doing auto logout
cpl121 Mar 15, 2024
b93b918
fix: conditional place
cpl121 Mar 18, 2024
0cdfe6e
Merge branch 'develop-iota2.0' into fix/error-when-deleting-a-profile
begonaalvarezd Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/desktop/components/popups/AccountConfirmationPopup.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
: ''
$: void setStorageDeposit(accountOutput)
$: isTransferring = $selectedWallet.isTransferring
$: isTransferring = $selectedWallet?.isTransferring
async function setStorageDeposit(accountOutput: AccountOutput): Promise<void> {
try {
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop/components/popups/ActivateAccountPopup.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
112 changes: 57 additions & 55 deletions packages/desktop/components/popups/ActivityDetailsPopup.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down Expand Up @@ -101,60 +101,62 @@
</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}
evavirseda marked this conversation as resolved.
Show resolved Hide resolved
<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>
4 changes: 2 additions & 2 deletions packages/desktop/components/popups/BurnNativeTokensConfirmationPopup.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')}
Expand Down
4 changes: 2 additions & 2 deletions packages/desktop/components/popups/ConfirmationPopup.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
6 changes: 3 additions & 3 deletions packages/desktop/components/popups/MintNftConfirmationPopup.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop/components/popups/send/SendConfirmationPopup.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop/components/popups/send/SendFormPopup.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>],
Expand Down
2 changes: 1 addition & 1 deletion ...ws/dashboard/wallet/views/implicit-account-creation-multistep/FundConfirmationView.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
: '-'
Expand Down
4 changes: 2 additions & 2 deletions packages/shared/lib/core/wallet/actions/getWalletAssetsForSelectedWallet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] }),
}
Expand Down
Loading