Merge branch 'feature/ddw-614-add-display-of-current-rewards-balance' of github.com:input-output-hk/daedalus into feature/ddw-614-add-display-of-current-rewards-balance

# Conflicts:
#	CHANGELOG.md

Author: DominikGuzei

CHANGELOG.md

@@ -4,7 +4,19 @@
 
 ### Features
 
+
 - Added display of current/unspent rewards ([PR 2803](https://github.com/input-output-hk/daedalus/pull/2803))
+- Improved stake pool searchbar ([PR 2847](https://github.com/input-output-hk/daedalus/pull/2847))
+- Implemented catalyst dynamic content ([PR 2856](https://github.com/input-output-hk/daedalus/pull/2856))
+
+### Fixes
+
+- Fixed main container zIndex ([PR 2863](https://github.com/input-output-hk/daedalus/pull/2863))
+
+## 4.9.0-FC1
+
+### Features
+
 - Added table view for delegated stake pools list ([PR 2837](https://github.com/input-output-hk/daedalus/pull/2837))
 - Removed Discreet mode notification ([PR 2852](https://github.com/input-output-hk/daedalus/pull/2852))
 - Unified CPU info in diagnostics dialog ([PR 2818](https://github.com/input-output-hk/daedalus/pull/2818))
@@ -17,7 +29,7 @@
 - Fixed behaviour of wallet settings option of the app menu ([PR 2838](https://github.com/input-output-hk/daedalus/pull/2838))
 - Fixed styling of ITN rewards feature ([PR 2861](https://github.com/input-output-hk/daedalus/pull/2861))
 - Fixed available disk space takes a long time to show ([PR 2849](https://github.com/input-output-hk/daedalus/pull/2849))
-
+  
 ### Chores
 
 - Migrated codebase from javascript to typescript ([PR 2843](https://github.com/input-output-hk/daedalus/pull/2843))

package.json

@@ -1,7 +1,7 @@
 {
   "name": "daedalus",
   "productName": "Daedalus",
-  "version": "4.8.0",
+  "version": "4.9.0-FC1",
   "description": "Cryptocurrency Wallet",
   "main": "./dist/main/index.js",
   "scripts": {

source/common/config/electron-store.config.ts

@@ -20,6 +20,7 @@ export const STORAGE_KEYS: Record<string, StorageKey> = {
   READ_NEWS: 'READ-NEWS',
   RESET: 'RESET',
   SMASH_SERVER: 'SMASH-SERVER',
+  STAKE_POOLS_LIST_VIEW_TOOLTIP: 'STAKE-POOLS-LIST-VIEW-TOOLTIP',
   STAKING_INFO_WAS_OPEN: 'ALONZO-INFO-WAS-OPEN',
   TERMS_OF_USE_ACCEPTANCE: 'TERMS-OF-USE-ACCEPTANCE',
   THEME: 'THEME',

source/common/types/electron-store.types.ts

@@ -15,6 +15,7 @@ export type StorageKey =
   | 'READ-NEWS'
   | 'RESET'
   | 'SMASH-SERVER'
+  | 'STAKE-POOLS-LIST-VIEW-TOOLTIP'
   | 'TERMS-OF-USE-ACCEPTANCE'
   | 'THEME'
   | 'TOKEN-FAVORITES'

source/main/ipc/electronStoreConversation.ts

@@ -37,6 +37,7 @@ const reset = async () => {
   await unset(keys.READ_NEWS);
   await unset(keys.SMASH_SERVER);
   await unset(keys.STAKING_INFO_WAS_OPEN);
+  await unset(keys.STAKE_POOLS_LIST_VIEW_TOOLTIP);
   await unset(keys.TERMS_OF_USE_ACCEPTANCE);
   await unset(keys.THEME);
   await unset(keys.USER_DATE_FORMAT_ENGLISH);

source/renderer/app/api/api.ts

@@ -40,6 +40,7 @@ import { getPublicKey } from './transactions/requests/getPublicKey';
 import { getICOPublicKey } from './transactions/requests/getICOPublicKey';
 // Voting requests
 import { createWalletSignature } from './voting/requests/createWalletSignature';
+import { getCatalystFund } from './voting/requests/getCatalystFund';
 // Wallets requests
 import { updateSpendingPassword } from './wallets/requests/updateSpendingPassword';
 import { updateByronSpendingPassword } from './wallets/requests/updateByronSpendingPassword';
@@ -204,6 +205,8 @@ import type {
 import type {
   CreateVotingRegistrationRequest,
   CreateWalletSignatureRequest,
+  GetCatalystFundResponse,
+  CatalystFund,
 } from './voting/types';
 import type { StakePoolProps } from '../domains/StakePool';
 import type { FaultInjectionIpcRequest } from '../../../common/types/cardano-node.types';
@@ -2931,6 +2934,42 @@ export default class AdaApi {
     fakeStakePoolsJson: Array<StakePool>
   ) => void;
   setStakePoolsFetchingFailed: () => void;
+  getCatalystFund = async (): Promise<CatalystFund> => {
+    logger.debug('AdaApi::getCatalystFund called', {});
+
+    try {
+      const catalystFund = await getCatalystFund();
+
+      logger.debug('AdaApi::getCatalystFund success', {
+        catalystFund,
+      });
+
+      return {
+        current: {
+          number: catalystFund.id + 1,
+          startTime: new Date(catalystFund.fund_start_time),
+          endTime: new Date(catalystFund.fund_end_time),
+          resultsTime: new Date(
+            catalystFund.chain_vote_plans?.[0]?.chain_committee_end_time
+          ),
+          registrationSnapshotTime: new Date(
+            catalystFund.registration_snapshot_time
+          ),
+        },
+        next: {
+          number: catalystFund.id + 2,
+          startTime: new Date(catalystFund.next_fund_start_time),
+          registrationSnapshotTime: new Date(
+            catalystFund.next_registration_snapshot_time
+          ),
+        },
+      };
+    } catch (error) {
+      logger.error('AdaApi::getCatalystFund error', {
+        error,
+      });
+    }
+  };
 } // ========== TRANSFORM SERVER DATA INTO FRONTEND MODELS =========
 
 const _createWalletFromServerData = action(

source/renderer/app/api/utils/localStorage.ts

@@ -398,6 +398,12 @@ export default class LocalStorageApi {
     LocalStorageApi.unset(keys.HARDWARE_WALLET_DEVICES, deviceId);
   unsetHardwareWalletDevicesAll = async (): Promise<void> =>
     LocalStorageApi.unset(keys.HARDWARE_WALLET_DEVICES);
+  setStakePoolsListViewTooltip = async (visited: boolean): Promise<void> =>
+    LocalStorageApi.set(keys.STAKE_POOLS_LIST_VIEW_TOOLTIP, visited);
+  getStakePoolsListViewTooltip = async (): Promise<boolean> =>
+    LocalStorageApi.get(keys.STAKE_POOLS_LIST_VIEW_TOOLTIP, true);
+  unsetStakePoolsListViewTooltip = async (): Promise<void> =>
+    LocalStorageApi.unset(keys.STAKE_POOLS_LIST_VIEW_TOOLTIP);
   reset = async () => {
     await LocalStorageApi.reset();
   };

source/renderer/app/api/voting/requests/getCatalystFund.ts

@@ -0,0 +1,11 @@
+import { externalRequest } from '../../utils/externalRequest';
+import { MAINNET_SERVICING_STATION_URL } from '../../../config/urlsConfig';
+import { GetCatalystFundResponse } from '../types';
+
+export const getCatalystFund = (): Promise<GetCatalystFundResponse> =>
+  externalRequest({
+    hostname: MAINNET_SERVICING_STATION_URL,
+    path: '/api/v0/fund',
+    method: 'GET',
+    protocol: 'https',
+  });

source/renderer/app/api/voting/types.ts

@@ -27,3 +27,29 @@ export type SignatureParams = {
     passphrase: string;
   };
 };
+export type GetCatalystFundResponse = {
+  id: number;
+  fund_end_time: string;
+  fund_name: string;
+  fund_start_time: string;
+  next_fund_start_time: string;
+  next_registration_snapshot_time: string;
+  registration_snapshot_time: string;
+  chain_vote_plans: Array<{
+    chain_committee_end_time: string;
+  }>;
+};
+export type CatalystFund = {
+  current: {
+    number: number;
+    startTime: Date;
+    endTime: Date;
+    resultsTime: Date;
+    registrationSnapshotTime: Date;
+  };
+  next: {
+    number: number;
+    startTime: Date;
+    registrationSnapshotTime: Date;
+  };
+};

source/renderer/app/components/layout/SidebarLayout.scss

@@ -12,8 +12,6 @@
   overflow: hidden;
   position: relative;
   width: 100%;
-  // Show elements that overflow the main above the sidebar area
-  z-index: 20;
 }
 
 .sidebar {
@@ -24,8 +22,6 @@
 .topbar {
   box-shadow: 0 5px 20px 0 var(--theme-sidebar-layout-topbar-shadow-color);
   flex-shrink: 0;
-  // Show elements that overflow the topbar above the content area
-  z-index: 20;
 }
 
 .contentWrapper {