Merge branch 'main' of github.com:AmbireTech/ambire-common into v2

Author: superKalo

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.93.1",
+  "version": "2.93.2",
   "name": "ambire-common",
   "description": "Common ground for the Ambire apps",
   "scripts": {

src/controllers/accountPicker/accountPicker.ts

@@ -882,7 +882,6 @@ export class AccountPickerController extends EventEmitter implements IAccountPic
       }
 
       const masterFingerprint = this.#externalSignerControllers.qr?.masterFingerprint || ''
-      const qrWalletConfig = keyType === 'qr' ? this.keyIterator.walletConfig : undefined
 
       const hdPathTemplate = this.hdPathTemplate as HD_PATH_TEMPLATE_TYPE
 

src/controllers/main/main.ts

@@ -1157,11 +1157,11 @@ export class MainController extends EventEmitter implements IMainController {
 
       const keyIterator = new QrKeyIterator({ controller: qrCtrl })
       // Initialize the QR iterator from payload before AccountPicker init.
-      // This populates QR-specific iterator state (walletConfig, xpub, parsedAccount)
+      // This populates QR-specific iterator state (xpub, parsedAccount, hdPathTemplate)
       // that AccountPicker needs to configure derivation and retrieval.
       await keyIterator.initFromQrPayload(payload)
 
-      const hdPathTemplate = keyIterator.walletConfig?.hdPathTemplate
+      const hdPathTemplate = keyIterator.hdPathTemplate
       if (!hdPathTemplate) {
         const message = 'Invalid QR hardware wallet payload. Please try again.'
         throw new EmittableError({

src/controllers/portfolio/portfolio.ts

@@ -941,13 +941,20 @@ export class PortfolioController extends EventEmitter implements IPortfolioContr
     if (res.data.banner) {
       const banner = res.data.banner
 
+      const endTimeNumber =
+        typeof banner.endTime === 'number' ? banner.endTime : new Date(banner.endTime).getTime()
+      const startTimeNumber =
+        typeof banner.startTime === 'number'
+          ? banner.startTime
+          : new Date(banner.startTime).getTime()
+
       const formattedBanner: Banner = {
         // eslint-disable-next-line no-underscore-dangle
         id: banner.id || banner._id,
         type: banner.type || 'updates',
         meta: {
-          startTime: banner.startTime,
-          endTime: banner.endTime
+          startTime: startTimeNumber,
+          endTime: endTimeNumber
         },
         ...(banner.text && { text: banner.text }),
         ...(banner.title && { title: banner.title }),

src/interfaces/keyIterator.ts

@@ -1,29 +1,13 @@
 import { HD_PATH_TEMPLATE_TYPE } from '../consts/derivation'
 import { SelectedAccountForImport } from './account'
-import {
-  ExternalSignerController,
-  Key,
-  ParsedQrAccount,
-  QrProtocolType,
-  QrWalletType
-} from './keystore'
+import { ExternalSignerController, Key, ParsedQrAccount, QrProtocolType } from './keystore'
 
 export type QrWalletConfig = {
-  walletType: QrWalletType
   protocol: QrProtocolType
   label: string
-  hdPathTemplate: string
-  relativePathTemplate: string
   tutorialUrl?: string
 }
 
-type QrParsedAccountMeta = {
-  hdPath?: string
-  accounts?: Array<{
-    hdPath?: string
-  }>
-}
-
 export interface KeyIterator {
   type: Key['type']
   subType: 'seed' | 'private-key' | 'hw'
@@ -58,6 +42,5 @@ export interface KeyIterator {
   /** Checks if the seed matches the key iterator's seed (optional, for hot wallets) */
   isSeedMatching?: (seedToCompareWith: string) => boolean
   // QR-specific optional fields
-  walletConfig?: QrWalletConfig
   parsedAccount?: ParsedQrAccount
 }