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 missing date for when stake changes take effect #413

Merged
merged 4 commits into from
Jan 18, 2024
Merged

Fix missing date for when stake changes take effect #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b9a621
Fix missing date for when stake changes take effect
Dec 4, 2023
0e9580c
Update wallet-common-helpers hash to target main
shjortConcordium Dec 6, 2023
8c16fdb
Fix yarn.lock
Dec 6, 2023
4350b11
Merge branch 'main' into missing-reward-change-date
shjortConcordium Jan 18, 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
6 changes: 6 additions & 0 deletions packages/browser-wallet/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

### Fixed

- Missing date for delegation/validation stake decrease/stop has been restored.

## 1.3.0

### Added
Expand Down
2 changes: 1 addition & 1 deletion packages/browser-wallet/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"react-window-infinite-loader": "^1.0.8",
"readable-stream": "^4.2.0",
"uuid": "^8.3.2",
"wallet-common-helpers": "https://github.com/Concordium/concordium-wallet-common-helpers.git#d6dd106aa892d683bcaad33189ed4043bcfc55a0"
"wallet-common-helpers": "https://github.com/Concordium/concordium-wallet-common-helpers.git#b5b8acd7304f297a1aa67c91b735e90f3edef5a5"
},
"devDependencies": {
"@babel/core": "^7.18.2",
Expand Down
9 changes: 7 additions & 2 deletions packages/browser-wallet/src/popup/pages/Account/Earn/Earn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import {
ChainParametersV0,
isBakerAccount,
isDelegatorAccount,
isRewardStatusV1,
RewardStatus,
RewardStatusV0,
} from '@concordium/web-sdk';

import Button from '@popup/shared/Button';
Expand Down Expand Up @@ -72,6 +73,10 @@ function Earn({ chainParameters }: EarnProps) {
);
}

function isNotRewardStatusV0(rewardStatus?: RewardStatus): rewardStatus is Exclude<RewardStatus, RewardStatusV0> {
return rewardStatus ? rewardStatus.version !== 0 : false;
}

export default function EarnRoutes() {
const { setDetailsExpanded } = useContext(accountPageContext);
const accountInfo = ensureDefined(useSelectedAccountInfo(), 'Expected to find account info for selected account');
Expand Down Expand Up @@ -107,7 +112,7 @@ export default function EarnRoutes() {

const consensusStatus = useAsyncMemo(() => client.getConsensusStatus(), undefined, []);
const tokenomicsInfo = useAsyncMemo(
() => client.getTokenomicsInfo().then(filterType(isRewardStatusV1)),
() => client.getTokenomicsInfo().then(filterType(isNotRewardStatusV0)),
undefined,
[]
);
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2280,7 +2280,7 @@ __metadata:
tsconfig-paths-webpack-plugin: ^3.5.2
typescript: ^5.2.2
uuid: ^8.3.2
wallet-common-helpers: "https://github.com/Concordium/concordium-wallet-common-helpers.git#d6dd106aa892d683bcaad33189ed4043bcfc55a0"
wallet-common-helpers: "https://github.com/Concordium/concordium-wallet-common-helpers.git#b5b8acd7304f297a1aa67c91b735e90f3edef5a5"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -23299,9 +23299,9 @@ __metadata:
languageName: node
linkType: hard

"wallet-common-helpers@https://github.com/Concordium/concordium-wallet-common-helpers.git#d6dd106aa892d683bcaad33189ed4043bcfc55a0":
"wallet-common-helpers@https://github.com/Concordium/concordium-wallet-common-helpers.git#b5b8acd7304f297a1aa67c91b735e90f3edef5a5":
version: 2.0.0
resolution: "wallet-common-helpers@https://github.com/Concordium/concordium-wallet-common-helpers.git#commit=d6dd106aa892d683bcaad33189ed4043bcfc55a0"
resolution: "wallet-common-helpers@https://github.com/Concordium/concordium-wallet-common-helpers.git#commit=b5b8acd7304f297a1aa67c91b735e90f3edef5a5"
dependencies:
buffer: ^6.0.3
cbor: ^8.0.0
Expand All @@ -23311,7 +23311,7 @@ __metadata:
"@concordium/web-sdk": 7.x
react: ">=16"
react-dom: ">=16"
checksum: 508bf6f0d52f72ff110090e4ee2ec0e58affe2d93cdb55e26a7962d2fbe2714b9bd169ce196556a54aa4d16f13541bd6fcf6b32adc709845591cf97fc61a746a
checksum: 44d3f75d2547b3bf3242f4783110bf21dedec6b142dcbad749040a64d017665c6fa3012d791e85160f6b79188adddd9dc89e65bb75d567accd12affc17bde635
languageName: node
linkType: hard

Expand Down
Loading