Merge branch 'main' into has-dissolve-delay-util

dfinity · Feb 5, 2025 · 155d356 · 155d356
2 parents e6d1693 + 0090dd0
commit 155d356
Show file tree

Hide file tree

Showing 237 changed files with 2,280 additions and 3,098 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -342,7 +342,7 @@ jobs:
           Ledger canister ID:     np5km-uyaaa-aaaaq-aadrq-cai
           Index canister ID:      n535v-yiaaa-aaaaq-aadsq-cai
           Swap canister ID:       n223b-vqaaa-aaaaq-aadsa-cai
-          Transaction fee:      50
+          Transaction fee:      1000
           Minimum neuron stake: 100
           Proposal fee:         15000")
   checks-pass:

diff --git a/CHANGELOG-Nns-Dapp-unreleased.md b/CHANGELOG-Nns-Dapp-unreleased.md
@@ -14,21 +14,21 @@ proposal is successful, the changes it released will be moved from this file to
 
 #### Added
 
-- Import tokens by URL.
-- Custom sorting of staking nervous systems table.
+* Custom sorting of staking nervous systems table.
+* Custom sorting of tokens table.
+* Navigation to a token's wallet from the top token positions on the portfolio page.
+* Navigation to a project's neurons from the top projects on the portfolio page.
 
 #### Changed
 
-- Proceed with rollout of re-enabling of certification of certain calls from `30%` to `100%`.
-- Change the Page Banner icon in the staking page.
-
 #### Deprecated
 
 #### Removed
 
 #### Fixed
 
-- Reporting: Add Excel string format preservation for neuron ids.
+* Fix the back button on the accounts page when navigating from the portfolio page.
+* Reporting: Correct the formatting of neuron ids in the CSV output.
 
 #### 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 135055
+
+### Application
+
+#### Added
+
+- Import tokens by URL.
+
+#### Changed
+
+- Proceed with rollout of re-enabling of certification of certain calls from `30%` to `100%`.
+- Change the Page Banner icon in the staking page.
+
+#### Fixed
+
+- Reporting: Add Excel string format preservation for neuron ids.
+
+### Operations
+
 ## Proposal 134977
 
 ### Application