Merge branch 'main' into relead-actionables-after-voting

dfinity · Mar 25, 2024 · a3ebdc4 · a3ebdc4
2 parents 4118e1e + 414970a
commit a3ebdc4
Show file tree

Hide file tree

Showing 32 changed files with 349 additions and 175 deletions.
diff --git a/CHANGELOG-Nns-Dapp-unreleased.md b/CHANGELOG-Nns-Dapp-unreleased.md
@@ -15,20 +15,16 @@ proposal is successful, the changes it released will be moved from this file to
 
 #### Added
 
-* Add feature flag `ENABLE_HIDE_ZERO_BALANCE`.
-
 #### Changed
 
-* Adjusted table colors in dark theme.
+* Always omit the account parameter in the URL when navigating to a main account.
 
 #### Deprecated
 
 #### Removed
 
 #### Fixed
 
-* Min ckBTC withdrawal amount was unknown when withdrawing directly from My Tokens.
-* Fix menu width in collapsed state.
 * Make token table rows always clickable. A few edge cases were missing.
 
 #### Security

diff --git a/CHANGELOG-Nns-Dapp.md b/CHANGELOG-Nns-Dapp.md
@@ -11,6 +11,25 @@ The NNS Dapp is released through proposals in the Network Nervous System. Theref
 Unreleased changes are added to `CHANGELOG-Nns-Dapp-unreleased.md` and moved
 here after a successful release.
 
+## Proposal 128768
+
+### Application
+
+#### Added
+
+* Add feature flag `ENABLE_HIDE_ZERO_BALANCE`.
+
+#### Changed
+
+* Adjusted table colors in dark theme.
+
+#### Fixed
+
+* Min ckBTC withdrawal amount was unknown when withdrawing directly from My Tokens.
+* Fix menu width in collapsed state.
+
+### Operations
+
 ## Proposal 128350
 
 ### Application

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "2.0.70"
+version = "2.0.71"
 
 [workspace.dependencies]
 ic-cdk = "0.9.2"

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dfinity/nns-dapp",
-  "version": "2.0.70",
+  "version": "2.0.71",
   "private": true,
   "license": "SEE LICENSE IN LICENSE.md",
   "scripts": {

diff --git a/frontend/src/lib/components/proposal-detail/NnsProposal.svelte b/frontend/src/lib/components/proposal-detail/NnsProposal.svelte
@@ -22,6 +22,8 @@
   import { AppPath } from "$lib/constants/routes.constants";
   import { SplitBlock } from "@dfinity/gix-components";
   import { nonNullish } from "@dfinity/utils";
+  import { actionableProposalsSegmentStore } from "$lib/stores/actionable-proposals-segment.store";
+  import { actionableNnsProposalsStore } from "$lib/stores/actionable-nns-proposals.store";
 
   const { store } = getContext<SelectedProposalContext>(
     SELECTED_PROPOSAL_CONTEXT_KEY
@@ -33,7 +35,10 @@
     : undefined;
 
   let proposalIds: bigint[] | undefined;
-  $: proposalIds = $filteredProposals.proposals?.map(({ id }) => id as bigint);
+  $: proposalIds =
+    $actionableProposalsSegmentStore.selected === "actionable"
+      ? $actionableNnsProposalsStore.proposals?.map(({ id }) => id as bigint)
+      : $filteredProposals.proposals?.map(({ id }) => id as bigint);
 </script>
 
 <TestIdWrapper testId="nns-proposal-component">

diff --git a/frontend/src/lib/components/proposal-detail/ProposalNavigation.svelte b/frontend/src/lib/components/proposal-detail/ProposalNavigation.svelte
@@ -61,6 +61,7 @@
     on:click={selectNewer}
     class:hidden={isNullish(newerId)}
     data-tid="proposal-nav-newer"
+    data-test-proposal-id={newerId?.toString() ?? ""}
   >
     <IconLeft />
     {$i18n.proposal_detail.newer_short}</button
@@ -72,6 +73,7 @@
     on:click={selectOlder}
     class:hidden={isNullish(olderId)}
     data-tid="proposal-nav-older"
+    data-test-proposal-id={olderId?.toString() ?? ""}
   >
     {$i18n.proposal_detail.older_short}
     <IconRight />