From d3e207c6dac006d4c02669d9d5ce13abd84e93b0 Mon Sep 17 00:00:00 2001
From: Sosthene <contact@sosthene.net>
Date: Wed, 16 Jul 2025 11:31:29 +0200
Subject: [PATCH] [bug] fix types mismatch with `Device`

---
 src/router.ts           |  4 ++--
 src/services/service.ts | 15 ++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/router.ts b/src/router.ts
index b24368b..8720137 100755
--- a/src/router.ts
+++ b/src/router.ts
@@ -140,11 +140,11 @@ export async function init(): Promise<void> {
     (window as any).myService = services;
     const db = await Database.getInstance();
     db.registerServiceWorker('/src/service-workers/database.worker.js');
-    let device = await services.getDeviceFromDatabase();
+    const device = await services.getDeviceFromDatabase();
     console.log('🚀 ~ setTimeout ~ device:', device);
 
     if (!device) {
-      device = await services.createNewDevice();
+      await services.createNewDevice();
     } else {
       services.restoreDevice(device);
     }
diff --git a/src/services/service.ts b/src/services/service.ts
index 2a8212d..9020242 100755
--- a/src/services/service.ts
+++ b/src/services/service.ts
@@ -761,7 +761,7 @@ export default class Services {
     }
   }
 
-  public dumpDeviceFromMemory(): string {
+  public dumpDeviceFromMemory(): Device {
     try {
       return this.sdkClient.dump_device();
     } catch (e) {
@@ -786,7 +786,7 @@ export default class Services {
     }
   }
 
-  async saveDeviceInDatabase(device: any): Promise<void> {
+  async saveDeviceInDatabase(device: Device): Promise<void> {
     const db = await Database.getInstance();
     const walletStore = 'wallet';
     try {
@@ -804,14 +804,13 @@ export default class Services {
     }
   }
 
-  async getDeviceFromDatabase(): Promise<string | null> {
+  async getDeviceFromDatabase(): Promise<Device | null> {
     const db = await Database.getInstance();
     const walletStore = 'wallet';
     try {
       const dbRes = await db.getObject(walletStore, '1');
       if (dbRes) {
-        const wallet = dbRes['device'];
-        return wallet;
+        return dbRes['device'];
       } else {
         return null;
       }
@@ -824,8 +823,7 @@ export default class Services {
     try {
       const device = await this.getDeviceFromDatabase();
       if (device) {
-        const parsed: Device = JSON.parse(device);
-        const pairedMember = parsed['paired_member']; 
+        const pairedMember = device['paired_member']; 
         return pairedMember.sp_addresses;
       } else {
         return null;
@@ -890,10 +888,9 @@ export default class Services {
     return spAddress;
   }
 
-  restoreDevice(device: string) {
+  public restoreDevice(device: Device) {
     try {
       this.sdkClient.restore_device(device);
-      const spAddress = this.sdkClient.get_address();
     } catch (e) {
       console.error(e);
     }