` cannot be a child of ``. ` ` only allows these children: `<#text>`. The browser will 'repair' the HTML (by moving, removing, or inserting elements) which breaks Svelte's assumptions about the structure of your components.
https://svelte.dev/e/node_invalid_placement(node_invalid_placement) svelte/valid-compile
```
- Remove `span` in `option`.
Signed-off-by: David Dal Busco
chore: self-closing HTML tags for non-void elements are ambiguous (#6022)
Fix warning which becomes an error with Svelte v5 tooling (PR #6020).
```
19:5 error Self-closing HTML tags for non-void elements are ambiguous — use `
` rather than `
`
https://svelte.dev/e/element_invalid_self_closing_tag(element_invalid_self_closing_tag) svelte/valid-compile
```
- e.g. `
` -> `
`
Signed-off-by: David Dal Busco
chore: unrecognized attribute xmlns:svelte (#6021)
Fix warning which becomes an error with Svelte v5 tooling (PR #6020).
```
/Users/daviddalbusco/projects/dfinity/nns-dapp/frontend/src/lib/modals/neurons/SplitNnsNeuronModal.svelte
1:19 error Unrecognized attribute — should be one of `generics`, `lang` or `module`. If this exists for a preprocessor, ensure that the preprocessor removes it
https://svelte.dev/e/script_unknown_attribute(script_unknown_attribute) svelte/valid-compile
```
Signed-off-by: David Dal Busco
NNS1-3486: adds ReportingDateRangeSelector (#6019)
Users can filter their export by choosing one of three options: all,
this year, or last year.
{$i18n.accounts.select_network}
{$i18n.accounts.network_icp}
-
+
{/if}
{accountName}
diff --git a/frontend/src/lib/components/common/EmptyCards.svelte b/frontend/src/lib/components/common/EmptyCards.svelte
index 5c22cb7b3ba..565531b1430 100644
--- a/frontend/src/lib/components/common/EmptyCards.svelte
+++ b/frontend/src/lib/components/common/EmptyCards.svelte
@@ -4,19 +4,19 @@
diff --git a/frontend/src/lib/components/neuron-detail/NnsNeuronVotingPowerSection.svelte b/frontend/src/lib/components/neuron-detail/NnsNeuronVotingPowerSection.svelte
index 82d505c87c1..a95bb966e8a 100644
--- a/frontend/src/lib/components/neuron-detail/NnsNeuronVotingPowerSection.svelte
+++ b/frontend/src/lib/components/neuron-detail/NnsNeuronVotingPowerSection.svelte
@@ -3,6 +3,7 @@
import { i18n } from "$lib/stores/i18n";
import { replacePlaceholders } from "$lib/utils/i18n.utils";
import {
+ activityMultiplier,
ageMultiplier,
dissolveDelayMultiplier,
formatVotingPower,
@@ -41,15 +42,22 @@
{$i18n.neuron_detail.calculated_as}
-
- {$i18n.neuron_detail.voting_power_section_calculation_generic}
+
+ {$ENABLE_PERIODIC_FOLLOWING_CONFIRMATION
+ ? $i18n.neuron_detail.voting_power_section_calculation_generic_new
+ : $i18n.neuron_detail.voting_power_section_calculation_generic}
{$i18n.neuron_detail.this_neuron_calculation}
{replacePlaceholders(
- $i18n.neuron_detail.voting_power_section_calculation_specific,
+ $ENABLE_PERIODIC_FOLLOWING_CONFIRMATION
+ ? $i18n.neuron_detail.voting_power_section_calculation_specific_new
+ : $i18n.neuron_detail.voting_power_section_calculation_specific,
{
$stake: formatTokenE8s({
value: neuronStake(neuron),
@@ -59,6 +67,7 @@
$dissolveMultiplier: dissolveDelayMultiplier(
neuron.dissolveDelaySeconds
).toFixed(2),
+ $activityMultiplier: activityMultiplier(neuron).toFixed(2),
$votingPower: formatVotingPower(neuron.votingPower),
}
)}
diff --git a/frontend/src/lib/components/neurons/NeuronsTable/NeuronStakeCell.svelte b/frontend/src/lib/components/neurons/NeuronsTable/NeuronStakeCell.svelte
index 97f2e8380a1..c956b021739 100644
--- a/frontend/src/lib/components/neurons/NeuronsTable/NeuronStakeCell.svelte
+++ b/frontend/src/lib/components/neurons/NeuronsTable/NeuronStakeCell.svelte
@@ -1,12 +1,18 @@
-
+ {#if $ENABLE_USD_VALUES_FOR_NEURONS}
+
+ {:else}
+
+ {/if}
{#if !(rowData.stake instanceof TokenAmountV2) || rowData.stake.toUlps() > 0}
{#if $ENABLE_USD_VALUES_FOR_NEURONS}
-
+
{:else}
{/if}
diff --git a/frontend/src/lib/components/tokens/TokensTable/TokenBalanceCell.svelte b/frontend/src/lib/components/tokens/TokensTable/TokenBalanceCell.svelte
index aab0522756f..4b9b28e8f4b 100644
--- a/frontend/src/lib/components/tokens/TokensTable/TokenBalanceCell.svelte
+++ b/frontend/src/lib/components/tokens/TokensTable/TokenBalanceCell.svelte
@@ -22,8 +22,10 @@
>
{:else if isUserTokenData(rowData)}
{#if $ENABLE_USD_VALUES}
-
+
{:else}
{/if}
diff --git a/frontend/src/lib/components/ui/ProposalStatusTag.svelte b/frontend/src/lib/components/ui/ProposalStatusTag.svelte
index 99e93d2e23e..f06a2cbf588 100644
--- a/frontend/src/lib/components/ui/ProposalStatusTag.svelte
+++ b/frontend/src/lib/components/ui/ProposalStatusTag.svelte
@@ -26,7 +26,7 @@
class="actionable-status-badge"
role="status"
transition:scale={{ duration: 250, easing: cubicOut }}
- />
+ >
dashboard .",
"calculated_as": "Calculated as:",
"voting_power_section_calculation_generic": "voting_power = (staked_amount + staked_maturity) × (1 + age_bonus) × (1 + dissolve_delay_bonus)",
+ "voting_power_section_calculation_generic_new": "voting_power = (staked_amount + staked_maturity) × (1 + age_bonus) × (1 + dissolve_delay_bonus) × activity_multiplier",
"this_neuron_calculation": "For this neuron, the calculation is:",
"voting_power_section_calculation_specific": "voting_power = ($stake + $maturityStaked) × $ageMultiplier × $dissolveMultiplier = $votingPower",
+ "voting_power_section_calculation_specific_new": "voting_power = ($stake + $maturityStaked) × $ageMultiplier × $dissolveMultiplier × $activityMultiplier = $votingPower",
"maturity_section_description": "Earn rewards by voting on proposals and/or following active neurons.",
"staked_description": "Staked",
"nns_staked_maturity_tooltip": "Staked maturity contributes to the neuron’s voting power, but cannot be spawned into a new neuron.",
diff --git a/frontend/src/lib/modals/neurons/SplitNnsNeuronModal.svelte b/frontend/src/lib/modals/neurons/SplitNnsNeuronModal.svelte
index e2fe445378d..4a2d1b0c8ca 100644
--- a/frontend/src/lib/modals/neurons/SplitNnsNeuronModal.svelte
+++ b/frontend/src/lib/modals/neurons/SplitNnsNeuronModal.svelte
@@ -1,4 +1,4 @@
-
-
+
diff --git a/frontend/src/tests/lib/services/reporting.services.spec.ts b/frontend/src/tests/lib/services/reporting.services.spec.ts
index ed0a9e10a86..75170720fa0 100644
--- a/frontend/src/tests/lib/services/reporting.services.spec.ts
+++ b/frontend/src/tests/lib/services/reporting.services.spec.ts
@@ -9,7 +9,10 @@ import {
mockMainAccount,
mockSubAccount,
} from "$tests/mocks/icp-accounts.store.mock";
-import { createTransactionWithId } from "$tests/mocks/icp-transactions.mock";
+import {
+ createTransactionWithId,
+ dateToNanoSeconds,
+} from "$tests/mocks/icp-transactions.mock";
import { mockNeuron } from "$tests/mocks/neurons.mock";
import type { SignIdentity } from "@dfinity/agent";
@@ -114,14 +117,14 @@ describe("reporting service", () => {
it("should handle errors and return accumulated transactions", async () => {
const firstBatch = [
- createTransactionWithId({ id: 1n }),
+ createTransactionWithId({ id: 3n }),
createTransactionWithId({ id: 2n }),
];
spyGetTransactions
.mockResolvedValueOnce({
transactions: firstBatch,
- oldestTxId: 2000n,
+ oldestTxId: 1n,
})
.mockRejectedValueOnce(new Error("API Error"));
@@ -133,6 +136,239 @@ describe("reporting service", () => {
expect(result).toEqual(firstBatch);
expect(spyGetTransactions).toHaveBeenCalledTimes(2);
});
+
+ it('should filter "to" the provided date', async () => {
+ const allTransactions = [
+ createTransactionWithId({
+ id: 3n,
+ timestamp: new Date("2023-01-02T00:00:00.000Z"),
+ }),
+ createTransactionWithId({
+ id: 2n,
+ timestamp: new Date("2023-01-01T00:00:00.000Z"),
+ }),
+ createTransactionWithId({
+ id: 1n,
+ timestamp: new Date("2022-12-31T00:00:00.000Z"),
+ }),
+ ];
+
+ spyGetTransactions.mockResolvedValue({
+ transactions: allTransactions,
+ oldestTxId: 1n,
+ });
+
+ const result = await getAllTransactionsFromAccountAndIdentity({
+ accountId: mockAccountId,
+ identity: mockSignInIdentity,
+ range: {
+ to: dateToNanoSeconds(new Date("2023-01-01T00:00:00.000Z")),
+ },
+ });
+
+ expect(result).toHaveLength(2);
+ expect(result).toEqual(allTransactions.slice(1));
+ expect(spyGetTransactions).toHaveBeenCalledTimes(1);
+ });
+
+ it('should filter "from" the provided date', async () => {
+ const allTransactions = [
+ createTransactionWithId({
+ id: 3n,
+ timestamp: new Date("2023-01-02T00:00:00.000Z"),
+ }),
+ createTransactionWithId({
+ id: 2n,
+ timestamp: new Date("2023-01-01T00:00:00.000Z"),
+ }),
+ createTransactionWithId({
+ id: 1n,
+ timestamp: new Date("2022-12-31T00:00:00.000Z"),
+ }),
+ ];
+
+ spyGetTransactions.mockResolvedValue({
+ transactions: allTransactions,
+ oldestTxId: 1n,
+ });
+
+ const result = await getAllTransactionsFromAccountAndIdentity({
+ accountId: mockAccountId,
+ identity: mockSignInIdentity,
+ range: {
+ from: dateToNanoSeconds(new Date("2023-01-01T00:00:00.000Z")),
+ },
+ });
+
+ expect(result).toHaveLength(2);
+ expect(result).toEqual(allTransactions.slice(0, 2));
+ expect(spyGetTransactions).toHaveBeenCalledTimes(1);
+ });
+
+ it("should handle date range where no transactions match", async () => {
+ const allTransactions = [
+ createTransactionWithId({
+ id: 3n,
+ timestamp: new Date("2023-01-02T00:00:00.000Z"),
+ }),
+ createTransactionWithId({
+ id: 2n,
+ timestamp: new Date("2022-12-30T00:00:00.000Z"),
+ }),
+ createTransactionWithId({
+ id: 1n,
+ timestamp: new Date("2022-12-29T00:00:00.000Z"),
+ }),
+ ];
+
+ spyGetTransactions.mockResolvedValue({
+ transactions: allTransactions,
+ oldestTxId: 1n,
+ });
+
+ const result = await getAllTransactionsFromAccountAndIdentity({
+ accountId: mockAccountId,
+ identity: mockSignInIdentity,
+ range: {
+ to: dateToNanoSeconds(new Date("2023-01-01T00:00:00.000Z")),
+ from: dateToNanoSeconds(new Date("2022-12-31T00:00:00.000Z")),
+ },
+ });
+
+ expect(result).toHaveLength(0);
+ expect(spyGetTransactions).toHaveBeenCalledTimes(1);
+ });
+
+ it('should return early if the last transaction is in the current page is older than "from" date', async () => {
+ const allTransactions = [
+ createTransactionWithId({
+ id: 3n,
+ timestamp: new Date("2023-01-02T00:00:00.000Z"),
+ }),
+ createTransactionWithId({
+ id: 2n,
+ timestamp: new Date("2022-12-31T00:00:00.000Z"),
+ }),
+ createTransactionWithId({
+ id: 1n,
+ timestamp: new Date("2022-12-30T00:00:00.000Z"),
+ }),
+ ];
+ const firstBatchOfMockTransactions = allTransactions.slice(0, 2);
+ const secondBatchOfMockTransactions = allTransactions.slice(2);
+
+ spyGetTransactions
+ .mockResolvedValueOnce({
+ transactions: firstBatchOfMockTransactions,
+ oldestTxId: 1n,
+ })
+ .mockResolvedValueOnce({
+ transactions: secondBatchOfMockTransactions,
+ oldestTxId: 1n,
+ });
+
+ const result = await getAllTransactionsFromAccountAndIdentity({
+ accountId: mockAccountId,
+ identity: mockSignInIdentity,
+ range: {
+ from: dateToNanoSeconds(new Date("2023-01-01T00:00:00.000Z")),
+ },
+ });
+
+ expect(result).toHaveLength(1);
+ expect(result).toEqual(allTransactions.slice(0, 1));
+ expect(spyGetTransactions).toHaveBeenCalledTimes(1);
+ });
+
+ it('should handle a range with both "from" and "to" dates', async () => {
+ const allTransactions = [
+ createTransactionWithId({
+ id: 6n,
+ timestamp: new Date("2023-02-02T00:00:00.000Z"),
+ }),
+ createTransactionWithId({
+ id: 5n,
+ timestamp: new Date("2023-01-01T00:00:00.000Z"),
+ }),
+ createTransactionWithId({
+ id: 4n,
+ timestamp: new Date("2022-12-31T10:00:00.000Z"),
+ }),
+ createTransactionWithId({
+ id: 3n,
+ timestamp: new Date("2022-12-31T00:00:00.000Z"),
+ }),
+ createTransactionWithId({
+ id: 2n,
+ timestamp: new Date("2022-12-30T00:00:00.000Z"),
+ }),
+ createTransactionWithId({
+ id: 1n,
+ timestamp: new Date("2022-11-20T00:00:00.000Z"),
+ }),
+ ];
+ const firstBatchOfMockTransactions = allTransactions.slice(0, 3);
+ const secondBatchOfMockTransactions = allTransactions.slice(3, 6);
+
+ spyGetTransactions
+ .mockResolvedValueOnce({
+ transactions: firstBatchOfMockTransactions,
+ oldestTxId: 1n,
+ })
+ .mockResolvedValueOnce({
+ transactions: secondBatchOfMockTransactions,
+ oldestTxId: 1n,
+ });
+
+ const result = await getAllTransactionsFromAccountAndIdentity({
+ accountId: mockAccountId,
+ identity: mockSignInIdentity,
+ range: {
+ to: dateToNanoSeconds(new Date("2023-01-02T00:00:00.000Z")),
+ from: dateToNanoSeconds(new Date("2022-11-30T00:00:00.000Z")),
+ },
+ });
+ expect(result).toHaveLength(4);
+ expect(result).toEqual(allTransactions.slice(1, -1));
+ expect(spyGetTransactions).toHaveBeenCalledTimes(2);
+ });
+
+ it("should filter the transactions even if one call fails", async () => {
+ const firstBatchOfMockTransactions = [
+ createTransactionWithId({
+ id: 6n,
+ timestamp: new Date("2023-02-02T00:00:00.000Z"),
+ }),
+ createTransactionWithId({
+ id: 5n,
+ timestamp: new Date("2023-01-01T00:00:00.000Z"),
+ }),
+ createTransactionWithId({
+ id: 4n,
+ timestamp: new Date("2022-12-31T10:00:00.000Z"),
+ }),
+ ];
+ spyGetTransactions
+ .mockResolvedValueOnce({
+ transactions: firstBatchOfMockTransactions,
+ oldestTxId: 3n,
+ })
+ .mockRejectedValueOnce(new Error("API Error"));
+ const result = await getAllTransactionsFromAccountAndIdentity({
+ accountId: mockAccountId,
+ identity: mockSignInIdentity,
+ range: {
+ to: dateToNanoSeconds(new Date("2023-01-02T00:00:00.000Z")),
+ from: dateToNanoSeconds(new Date("2022-11-30T00:00:00.000Z")),
+ },
+ });
+ expect(result).toHaveLength(2);
+ expect(result).toEqual([
+ firstBatchOfMockTransactions[1],
+ firstBatchOfMockTransactions[2],
+ ]);
+ expect(spyGetTransactions).toHaveBeenCalledTimes(2);
+ });
});
describe("getAccountTransactionsConcurrently", () => {
diff --git a/frontend/src/tests/lib/utils/neuron.utils.spec.ts b/frontend/src/tests/lib/utils/neuron.utils.spec.ts
index a61069968ff..66ada91ed88 100644
--- a/frontend/src/tests/lib/utils/neuron.utils.spec.ts
+++ b/frontend/src/tests/lib/utils/neuron.utils.spec.ts
@@ -18,6 +18,7 @@ import { neuronsStore } from "$lib/stores/neurons.store";
import { nowInSeconds } from "$lib/utils/date.utils";
import { enumValues } from "$lib/utils/enum.utils";
import {
+ activityMultiplier,
ageMultiplier,
allHaveSameFollowees,
ballotsWithDefinedProposal,
@@ -291,6 +292,67 @@ describe("neuron-utils", () => {
});
});
+ describe("activityMultiplier", () => {
+ it("returns 0 when decidingVotingPower is 0", () => {
+ expect(
+ activityMultiplier({
+ ...mockNeuron,
+ fullNeuron: {
+ ...mockFullNeuron,
+ decidingVotingPower: 0n,
+ potentialVotingPower: 0n,
+ },
+ })
+ ).toBe(0);
+ });
+
+ it("returns 0 when potentialVotingPower is 0", () => {
+ expect(
+ activityMultiplier({
+ ...mockNeuron,
+ fullNeuron: {
+ ...mockFullNeuron,
+ decidingVotingPower: 100_000_000n,
+ potentialVotingPower: 0n,
+ },
+ })
+ ).toBe(0);
+ });
+
+ it("calculates the multiplier", () => {
+ expect(
+ activityMultiplier({
+ ...mockNeuron,
+ fullNeuron: {
+ ...mockFullNeuron,
+ decidingVotingPower: 200_000_000n,
+ potentialVotingPower: 200_000_000n,
+ },
+ })
+ ).toBe(1);
+ expect(
+ activityMultiplier({
+ ...mockNeuron,
+ fullNeuron: {
+ ...mockFullNeuron,
+ decidingVotingPower: 100_000_000n,
+ potentialVotingPower: 200_000_000n,
+ },
+ })
+ ).toBe(0.5);
+ expect(
+ activityMultiplier({
+ ...mockNeuron,
+ fullNeuron: {
+ ...mockFullNeuron,
+ decidingVotingPower: 20_000n,
+ potentialVotingPower: 200_000_000n,
+ },
+ })
+ ).toBe(0.0001);
+ });
+ });
+
describe("bonusMultiplier", () => {
it("should return the multiplier", () => {
expect(
diff --git a/frontend/src/tests/lib/utils/neurons-table.utils.spec.ts b/frontend/src/tests/lib/utils/neurons-table.utils.spec.ts
index b5262e6d04f..decab7926af 100644
--- a/frontend/src/tests/lib/utils/neurons-table.utils.spec.ts
+++ b/frontend/src/tests/lib/utils/neurons-table.utils.spec.ts
@@ -1,3 +1,4 @@
+import { LEDGER_CANISTER_ID } from "$lib/constants/canister-ids.constants";
import { HOTKEY_PERMISSIONS } from "$lib/constants/sns-neurons.constants";
import {
compareByDissolveDelay,
@@ -16,11 +17,13 @@ import { mockNeuron, mockTableNeuron } from "$tests/mocks/neurons.mock";
import { createMockSnsNeuron } from "$tests/mocks/sns-neurons.mock";
import { mockSnsToken } from "$tests/mocks/sns-projects.mock";
import { NeuronState, type NeuronInfo } from "@dfinity/nns";
+import { Principal } from "@dfinity/principal";
import type { SnsNeuron } from "@dfinity/sns";
import { ICPToken, TokenAmountV2 } from "@dfinity/utils";
describe("neurons-table.utils", () => {
const now = new Date("2022-01-01T15:26:47Z");
+ const icpPrice = 10;
const makeStake = (amount: bigint) =>
TokenAmountV2.fromUlps({
@@ -28,6 +31,9 @@ describe("neurons-table.utils", () => {
token: ICPToken,
});
+ const makeUsdStake = (amount: bigint) =>
+ (Number(amount) * icpPrice) / 100_000_000;
+
beforeEach(() => {
vi.useFakeTimers().setSystemTime(now);
});
@@ -54,6 +60,7 @@ describe("neurons-table.utils", () => {
domKey: "42",
neuronId: "42",
stake: makeStake(defaultStake),
+ stakeInUsd: makeUsdStake(defaultStake),
availableMaturity: 0n,
stakedMaturity: 0n,
dissolveDelaySeconds: defaultDissolveDelaySeconds,
@@ -67,6 +74,9 @@ describe("neurons-table.utils", () => {
neuronInfos,
identity: mockIdentity,
accounts: mockAccountsStoreData,
+ icpSwapUsdPrices: {
+ [LEDGER_CANISTER_ID.toText()]: icpPrice,
+ },
i18n: en,
});
@@ -105,6 +115,7 @@ describe("neurons-table.utils", () => {
domKey: "42",
neuronId: "42",
stake: makeStake(stake1),
+ stakeInUsd: makeUsdStake(stake1),
},
{
...defaultExpectedTableNeuron,
@@ -112,6 +123,7 @@ describe("neurons-table.utils", () => {
domKey: "342",
neuronId: "342",
stake: makeStake(stake2),
+ stakeInUsd: makeUsdStake(stake2),
},
]);
});
@@ -131,6 +143,7 @@ describe("neurons-table.utils", () => {
{
...defaultExpectedTableNeuron,
stake: makeStake(stake),
+ stakeInUsd: makeUsdStake(stake),
},
]);
});
@@ -190,6 +203,7 @@ describe("neurons-table.utils", () => {
...defaultExpectedTableNeuron,
rowHref: undefined,
stake: makeStake(0n),
+ stakeInUsd: 0,
state: NeuronState.Spawning,
},
]);
@@ -226,6 +240,9 @@ describe("neurons-table.utils", () => {
neuronInfos: [hotkeyNeuronInfo],
identity: mockIdentity,
accounts: mockAccountsStoreData,
+ icpSwapUsdPrices: {
+ [LEDGER_CANISTER_ID.toText()]: icpPrice,
+ },
i18n: en,
});
expect(tableNeurons).toEqual([
@@ -239,10 +256,12 @@ describe("neurons-table.utils", () => {
describe("tableNeuronsFromSnsNeurons", () => {
const snsUniverseIdText = "br5f7-7uaaa-aaaaa-qaaca-cai";
+ const ledgerCanisterId = Principal.fromText("wxkl4-qiqaa-2q");
const neuronIdString = "123456789abcdef0";
const neuronId = hexStringToBytes(neuronIdString);
const stake = 300_000n;
const dissolveDelaySeconds = 8640000n;
+ const snsTokenPrice = 0.25;
const defaultCreateMockSnsNeuronParams = {
id: neuronId,
@@ -261,11 +280,15 @@ describe("neurons-table.utils", () => {
token: mockSnsToken,
});
+ const makeSnsUsdStake = (amount: bigint) =>
+ (Number(amount) * snsTokenPrice) / 100_000_000;
+
const expectedTableNeuron = {
rowHref: "/neuron/?u=br5f7-7uaaa-aaaaa-qaaca-cai&neuron=123456789abcdef0",
domKey: neuronIdString,
neuronId: neuronIdString,
stake: makeSnsStake(stake),
+ stakeInUsd: makeSnsUsdStake(stake),
availableMaturity: 0n,
stakedMaturity: 0n,
dissolveDelaySeconds,
@@ -280,6 +303,10 @@ describe("neurons-table.utils", () => {
universe: snsUniverseIdText,
token: mockSnsToken,
identity: mockIdentity,
+ icpSwapUsdPrices: {
+ [ledgerCanisterId.toText()]: snsTokenPrice,
+ },
+ ledgerCanisterId,
i18n: en,
});
diff --git a/frontend/src/tests/mocks/icp-transactions.mock.ts b/frontend/src/tests/mocks/icp-transactions.mock.ts
index a36627efe94..6fad5a6dc40 100644
--- a/frontend/src/tests/mocks/icp-transactions.mock.ts
+++ b/frontend/src/tests/mocks/icp-transactions.mock.ts
@@ -22,6 +22,10 @@ export const mockTransactionTransfer: Transaction = {
timestamp: [{ timestamp_nanos: 235n }],
};
+export const dateToNanoSeconds = (date: Date): bigint => {
+ return BigInt(date.getTime()) * BigInt(NANO_SECONDS_IN_MILLISECOND);
+};
+
const defaultTimestamp = new Date("2023-01-01T00:00:00.000Z");
export const createTransactionWithId = ({
memo,
@@ -35,8 +39,7 @@ export const createTransactionWithId = ({
id?: bigint;
}): TransactionWithId => {
const timestampNanos = {
- timestamp_nanos:
- BigInt(timestamp.getTime()) * BigInt(NANO_SECONDS_IN_MILLISECOND),
+ timestamp_nanos: dateToNanoSeconds(timestamp),
};
return {
id,
diff --git a/frontend/src/tests/mocks/neurons.mock.ts b/frontend/src/tests/mocks/neurons.mock.ts
index 4e04e5a4aaf..dbec2dead4a 100644
--- a/frontend/src/tests/mocks/neurons.mock.ts
+++ b/frontend/src/tests/mocks/neurons.mock.ts
@@ -115,6 +115,7 @@ export const mockTableNeuron: TableNeuron = {
amount: 1n,
token: ICPToken,
}),
+ stakeInUsd: 10,
availableMaturity: 0n,
stakedMaturity: 0n,
dissolveDelaySeconds: 1n,
diff --git a/frontend/src/tests/page-objects/NeuronStakeCell.page-object.ts b/frontend/src/tests/page-objects/NeuronStakeCell.page-object.ts
index 9aa98776f8b..25ec5177650 100644
--- a/frontend/src/tests/page-objects/NeuronStakeCell.page-object.ts
+++ b/frontend/src/tests/page-objects/NeuronStakeCell.page-object.ts
@@ -1,4 +1,5 @@
import { AmountDisplayPo } from "$tests/page-objects/AmountDisplay.page-object";
+import { AmountWithUsdPo } from "$tests/page-objects/AmountWithUsd.page-object";
import { BasePageObject } from "$tests/page-objects/base.page-object";
import type { PageObjectElement } from "$tests/types/page-object.types";
@@ -9,6 +10,10 @@ export class NeuronStakeCellPo extends BasePageObject {
return new NeuronStakeCellPo(element.byTestId(NeuronStakeCellPo.TID));
}
+ getAmountWithUsdPo(): AmountWithUsdPo {
+ return AmountWithUsdPo.under(this.root);
+ }
+
getAmountDisplayPo(): AmountDisplayPo {
return AmountDisplayPo.under(this.root);
}
@@ -20,4 +25,12 @@ export class NeuronStakeCellPo extends BasePageObject {
getStakeBalance(): Promise {
return this.getAmountDisplayPo().getAmount();
}
+
+ async getStakeInUsd(): Promise {
+ return await this.getAmountWithUsdPo().getAmountInUsd();
+ }
+
+ async hasStakeInUsd(): Promise {
+ return await this.getAmountWithUsdPo().isPresent();
+ }
}
diff --git a/frontend/src/tests/page-objects/NeuronsTableRow.page-object.ts b/frontend/src/tests/page-objects/NeuronsTableRow.page-object.ts
index 3f9302a5c65..d077bace992 100644
--- a/frontend/src/tests/page-objects/NeuronsTableRow.page-object.ts
+++ b/frontend/src/tests/page-objects/NeuronsTableRow.page-object.ts
@@ -46,6 +46,14 @@ export class NeuronsTableRowPo extends ResponsiveTableRowPo {
return this.getNeuronStakeCellPo().getStake();
}
+ getStakeInUsd(): Promise {
+ return this.getNeuronStakeCellPo().getStakeInUsd();
+ }
+
+ hasStakeInUsd(): Promise {
+ return this.getNeuronStakeCellPo().hasStakeInUsd();
+ }
+
// Stake without the currency symbol
getStakeBalance(): Promise {
return this.getNeuronStakeCellPo().getStakeBalance();
diff --git a/frontend/src/tests/page-objects/NnsNeuronVotingPowerSection.page-object.ts b/frontend/src/tests/page-objects/NnsNeuronVotingPowerSection.page-object.ts
index 86102a10af8..ea0839209ed 100644
--- a/frontend/src/tests/page-objects/NnsNeuronVotingPowerSection.page-object.ts
+++ b/frontend/src/tests/page-objects/NnsNeuronVotingPowerSection.page-object.ts
@@ -18,6 +18,10 @@ export class NnsNeuronVotingPowerSectionPo extends BasePageObject {
return this.getText("voting-power");
}
+ getGenericDescription(): Promise {
+ return this.getText("voting-power-generic-description");
+ }
+
getDescription(): Promise {
return this.getText("voting-power-description");
}
diff --git a/frontend/src/tests/page-objects/ReportingDateRangeSelector.page-object.ts b/frontend/src/tests/page-objects/ReportingDateRangeSelector.page-object.ts
new file mode 100644
index 00000000000..16a121e2dbb
--- /dev/null
+++ b/frontend/src/tests/page-objects/ReportingDateRangeSelector.page-object.ts
@@ -0,0 +1,24 @@
+import type { PageObjectElement } from "$tests/types/page-object.types";
+import { SimpleBasePageObject } from "./simple-base.page-object";
+
+export class ReportingDateRangeSelectorPo extends SimpleBasePageObject {
+ static readonly TID = "reporting-data-range-selector-component";
+
+ static under({
+ element,
+ }: {
+ element: PageObjectElement;
+ }): ReportingDateRangeSelectorPo {
+ return new ReportingDateRangeSelectorPo(
+ element.byTestId(ReportingDateRangeSelectorPo.TID)
+ );
+ }
+
+ getAllOptions() {
+ return this.getElement().querySelectorAll('input[type="radio"]');
+ }
+
+ getSelectedOption() {
+ return this.getElement().querySelector('input[type="radio"]:checked');
+ }
+}