Merge branch 'get-network-economics-parameters' of github.com:dfinity…

…/nns-dapp into get-network-economics-parameters
dfinity · Jan 17, 2025 · cd61a3b · cd61a3b
2 parents 8d238cb + b1d4eba
commit cd61a3b
Show file tree

Hide file tree

Showing 51 changed files with 2,618 additions and 630 deletions.
diff --git a/CHANGELOG-Nns-Dapp-unreleased.md b/CHANGELOG-Nns-Dapp-unreleased.md
@@ -14,28 +14,14 @@ proposal is successful, the changes it released will be moved from this file to
 
 #### Added
 
-- Reporting: Full period filter, year-to-date, and last year
-- Show USD values of neuron stakes.
-- Display missing reward warnings in case of neuron inactivity.
-
 #### Changed
 
-- Allow `dfinity:` token prefix in QR code for ICP payment.
-- Recover from interrupted canister creation in the frontend.
-- Sort projects on the Voting page based on actionable proposals and name.
-- Hide former Cycle-Transfer-Station SNS from Voting page.
-
 #### Deprecated
 
 #### Removed
 
-- Remove hardcoding of "DFINITY Foundation" and "Internet Computer Association" in the displayed list of known neurons.
-- Remove "Make neurons public" banner.
-
 #### Fixed
 
-- Fixed "Confirm following" for non-HW hotkey neurons.
-
 #### Security
 
 #### Not Published

diff --git a/CHANGELOG-Nns-Dapp.md b/CHANGELOG-Nns-Dapp.md
@@ -11,6 +11,34 @@ 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 134787
+
+### Application
+
+#### Added
+
+- Reporting: Full period filter, year-to-date, and last year
+- Show USD values of neuron stakes.
+- Display missing reward warnings in case of neuron inactivity.
+
+#### Changed
+
+- Allow `dfinity:` token prefix in QR code for ICP payment.
+- Recover from interrupted canister creation in the frontend.
+- Sort projects on the Voting page based on actionable proposals and name.
+- Hide former Cycle-Transfer-Station SNS from Voting page.
+
+#### Removed
+
+- Remove hardcoding of "DFINITY Foundation" and "Internet Computer Association" in the displayed list of known neurons.
+- Remove "Make neurons public" banner.
+
+#### Fixed
+
+- Fixed "Confirm following" for non-HW hotkey neurons.
+
+### Operations
+
 ## Proposal 134484
 
 ### 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.98"
+version = "2.0.99"
 
 [workspace.dependencies]
 ic-cdk = "0.17.1"

diff --git a/dfx.json b/dfx.json
@@ -442,7 +442,7 @@
         "DIDC_VERSION": "didc 0.4.0",
         "POCKETIC_VERSION": "3.0.1",
         "CARGO_SORT_VERSION": "1.0.9",
-        "SNSDEMO_RELEASE": "release-2025-01-08",
+        "SNSDEMO_RELEASE": "release-2025-01-15",
         "IC_COMMIT_FOR_PROPOSALS": "release-2025-01-09_03-19-base",
         "IC_COMMIT_FOR_SNS_AGGREGATOR": "release-2025-01-03_03-07-base"
       },

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.98",
+  "version": "2.0.99",
   "private": true,
   "license": "SEE LICENSE IN LICENSE.md",
   "scripts": {