From 96bd53e24bdefe9af3c645418fc5af1d4e5f4e8e Mon Sep 17 00:00:00 2001 From: Matthew Maxwell Date: Mon, 25 Apr 2022 09:32:49 -0500 Subject: [PATCH 1/2] fix: add reactive declaration for cached `profile.stakingRewards` --- packages/shared/components/StakingAssetTile.svelte | 2 ++ packages/shared/lib/assets.ts | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/shared/components/StakingAssetTile.svelte b/packages/shared/components/StakingAssetTile.svelte index 9509493af53..5679a6e406c 100644 --- a/packages/shared/components/StakingAssetTile.svelte +++ b/packages/shared/components/StakingAssetTile.svelte @@ -28,6 +28,7 @@ import { formatUnitBestMatch } from 'shared/lib/units' import { capitalize } from 'shared/lib/utils' import { selectedAccount } from 'shared/lib/wallet' + import { activeProfile } from '../lib/profile' export let asset: Asset @@ -49,6 +50,7 @@ const FIAT_PLACEHOLDER = '---' + $: $activeProfile.stakingRewards $: isDarkModeEnabled = $appSettings.darkMode $: isActivelyStaking = getAccount($stakedAccounts) && isStakingPossible(stakingEventState) $: isPartiallyStakedAndCanStake = $isPartiallyStaked && isStakingPossible(stakingEventState) diff --git a/packages/shared/lib/assets.ts b/packages/shared/lib/assets.ts index 7b7392fd6c4..42ac84ac6bb 100644 --- a/packages/shared/lib/assets.ts +++ b/packages/shared/lib/assets.ts @@ -45,14 +45,14 @@ export const assets = derived( if ($assemblyStakingRewards) { assets.push({ name: Token.Assembly, - balance: formatStakingAirdropReward(StakingAirdrop[Token.Assembly], Number($assemblyStakingRewards), 2), + balance: formatStakingAirdropReward(StakingAirdrop.Assembly, Number($assemblyStakingRewards), 2), color: '#DCABE1', }) } if ($shimmerStakingRewards) { assets.push({ name: Token.Shimmer, - balance: formatStakingAirdropReward(StakingAirdrop[Token.Shimmer], Number($shimmerStakingRewards), 2), + balance: formatStakingAirdropReward(StakingAirdrop.Shimmer, Number($shimmerStakingRewards), 2), color: '#25DFCA', }) } From a6a0cb3e9a627e711cc8fafee0bc99fd5708ff32 Mon Sep 17 00:00:00 2001 From: Matthew Maxwell Date: Mon, 25 Apr 2022 09:38:53 -0500 Subject: [PATCH 2/2] chore: cleanup import statement --- packages/shared/components/StakingAssetTile.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared/components/StakingAssetTile.svelte b/packages/shared/components/StakingAssetTile.svelte index 5679a6e406c..1ecd85f2858 100644 --- a/packages/shared/components/StakingAssetTile.svelte +++ b/packages/shared/components/StakingAssetTile.svelte @@ -28,7 +28,7 @@ import { formatUnitBestMatch } from 'shared/lib/units' import { capitalize } from 'shared/lib/utils' import { selectedAccount } from 'shared/lib/wallet' - import { activeProfile } from '../lib/profile' + import { activeProfile } from 'shared/lib/profile' export let asset: Asset