Merge commit 'd90e22c7ca322bece56aa7fb023c19b989086ef2' into checkpoint/main_from_release_2.7.3_d90e22c7ca322bece56aa7fb023c19b989086ef2

Author: AmineKhaldi

packages/api-react/src/services/wallet.ts

@@ -1063,8 +1063,9 @@ export const walletApi = apiWithTag.injectEndpoints({
 
           poolStates.forEach((poolStateItem: any) => {
             const poolWalletStatus = poolWalletStates.find(
-              (item) => item.launcherId === poolStateItem.poolConfig.launcherId,
+              (item) => normalizeHex(item.launcherId) === normalizeHex(poolStateItem.poolConfig.launcherId),
             );
+
             if (!poolWalletStatus) {
               external.push({
                 poolState: normalizePoolState(poolStateItem),

packages/gui/src/electron/main.tsx

@@ -53,7 +53,7 @@ import PreferencesAPI from './constants/PreferencesAPI';
 import About from './dialogs/About/About';
 import Confirm, { type ConfirmProps } from './dialogs/Confirm/Confirm';
 import KeyDetail from './dialogs/KeyDetail/KeyDetail';
-import { readPrefs, savePrefs, migratePrefs } from './prefs';
+import { readPrefs, savePrefs, migratePrefs, sanitizeRendererPrefs } from './prefs';
 import { readAddressBook, saveAddressBook } from './utils/addressBook';
 import chiaEnvironment, { chiaInit } from './utils/chiaEnvironment';
 import { dispatchPairRequest } from './utils/dispatchPairRequest';