Merge branch 'main' into deprecate-voting-power

dfinity · Dec 20, 2024 · 61ba75d · 61ba75d
2 parents 1b7a67d + 175db2e
commit 61ba75d
Show file tree

Hide file tree

Showing 45 changed files with 882 additions and 139 deletions.
diff --git a/.github/repo_policies/BOT_APPROVED_FILES b/.github/repo_policies/BOT_APPROVED_FILES
@@ -0,0 +1,10 @@
+# List of approved files that can be changed by a bot via an automated PR
+# This is to increase security and prevent accidentally updating files that shouldn't be changed by a bot
+
+Cargo.lock
+declarations/*/*/*.did
+dfx.json
+frontend/package-lock.json
+frontend/src/tests/workflows/Launchpad/sns-agg-page-*.json
+rs/proposals/src/canisters/*/api.rs
+rs/sns_aggregator/src/types/*.rs
diff --git a/CHANGELOG-Nns-Dapp-unreleased.md b/CHANGELOG-Nns-Dapp-unreleased.md
@@ -14,6 +14,8 @@ 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
+
 #### Changed
 
 #### Deprecated

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-2024-12-11",
+        "SNSDEMO_RELEASE": "release-2024-12-18",
         "IC_COMMIT_FOR_PROPOSALS": "release-2024-12-06_03-16-base",
         "IC_COMMIT_FOR_SNS_AGGREGATOR": "release-2024-12-06_03-16-base"
       },

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/lib/components/accounts/UiTransactionsList.svelte b/frontend/src/lib/components/accounts/UiTransactionsList.svelte
@@ -10,22 +10,29 @@
   export let transactions: UiTransaction[];
   export let loading: boolean;
   export let completed = false;
+
+  $: isEmpty = transactions.length === 0;
+
+  $: showSkeleton = isEmpty && loading;
+  $: showNoTransactions = isEmpty && !loading;
+  $: disabledInifiteScroll = loading || completed;
 </script>
 
 <div data-tid="transactions-list" class="container">
-  {#if transactions.length === 0 && !loading}
-    <NoTransactions />
-  {:else if transactions.length === 0 && loading}
+  {#if showSkeleton}
     <SkeletonCard cardType="info" />
     <SkeletonCard cardType="info" />
+  {:else if showNoTransactions}
+    <NoTransactions />
   {:else}
-    <InfiniteScroll on:nnsIntersect disabled={loading || completed}>
+    <InfiniteScroll on:nnsIntersect disabled={disabledInifiteScroll}>
       {#each transactions as transaction (transaction.domKey)}
         <div animate:flip={{ duration: 250 }}>
           <TransactionCard {transaction} />
         </div>
       {/each}
     </InfiniteScroll>
+
     {#if loading}
       <Spinner inline />
     {/if}

diff --git a/frontend/src/lib/components/common/MenuItems.svelte b/frontend/src/lib/components/common/MenuItems.svelte
@@ -7,6 +7,7 @@
   import { authSignedInStore } from "$lib/derived/auth.derived";
   import { pageStore } from "$lib/derived/page.derived";
   import { proposalsPathStore } from "$lib/derived/paths.derived";
+  import { ENABLE_PORTFOLIO_PAGE } from "$lib/stores/feature-flags.store";
   import { i18n } from "$lib/stores/i18n";
   import {
     ACTIONABLE_PROPOSALS_URL,
@@ -39,6 +40,21 @@
     statusIcon?: ComponentType;
   }[];
   $: routes = [
+    ...($ENABLE_PORTFOLIO_PAGE
+      ? [
+          {
+            context: "portfolio",
+            href: AppPath.Portfolio,
+            selected: isSelectedPath({
+              currentPath: $pageStore.path,
+              paths: [AppPath.Portfolio],
+            }),
+            title: $i18n.navigation.portfolio,
+            // TODO: Fix this once we have new version of GIX
+            icon: IconWallet,
+          },
+        ]
+      : []),
     {
       context: "accounts",
       href: AppPath.Tokens,