Merge pull request #52 from ainize-team/fix/woojae/depositAddress

fix: depositAddress
ainize-team · Sep 20, 2023 · 8b31a44 · 8b31a44
2 parents 9a9d34e + 007ee79
commit 8b31a44
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/ainize.ts b/src/ainize.ts
@@ -34,8 +34,8 @@ export default class Ainize {
   }
 
   async logout() {
-    await this.handler.disconnect();
     this.ain.removeDefaultAccount();
+    await this.handler.disconnect();
     console.log('logout success!');
   }
 

diff --git a/src/controllers/modelController.ts b/src/controllers/modelController.ts
@@ -65,7 +65,7 @@ export default class ModelController {
     this.isLoggedIn();
     const userAddress = this.ain.getAddress();
     const balancePath = Path.app(modelName).balanceOfUser(userAddress);
-    return await this.ain.getValue(balancePath);
+    return await this.ain.getValue(balancePath) | 0;
   }
 
   async getCreditHistory(modelName: string) {
@@ -111,7 +111,7 @@ export default class ModelController {
   }
 
   private async getDepositAddress(appName: string) {
-    return (await this.ain.getValue(Path.app(appName).billingConfig())).defaultAddress;
+    return (await this.ain.getValue(Path.app(appName).billingConfig())).depositAddress;
   }
 
   private isLoggedIn() {

diff --git a/src/handlers/handler.ts b/src/handlers/handler.ts
@@ -35,8 +35,10 @@ export default class Handler {
   }
 
   private async disconnectedCb() {
-    console.log('disconnected. reconnecting...');
-    await this.connect();
+    if(!AinModule.getInstance().isDefaultAccountExist()) {
+      console.log('disconnected. reconnecting...');
+      await this.connect();
+    }
   }
 
   async subscribe(requester:string, recordId:string, appName: string, resolve: any) {