fix: update 2.0

[bytom/Byone.git] / src / background.js

diff --git a/src/background.js b/src/background.js
index b7b374b..96ce61e 100644 (file)
--- a/src/background.js
+++ b/src/background.js
@@ -126,10 +126,6 @@ export default class Background {
       sendResponse(Error.typeMissed('asset'));
       return false;
     }
-    if(typeof requestBody.to === 'string' && requestBody.amount === undefined){
-      sendResponse(Error.typeMissed('amount'));
-      return false;
-    }
 
     const {domain} = payload;
     const data={
@@ -290,15 +286,20 @@ export default class Background {
       }else{
         const {vpAddress, address} = currentAccount
         let account = {
+          // for bytom1
           addresses: [vpAddress, address],
           rootXPub: currentAccount.xpub,
-          net: bytom.net,
-          chain: bytom.chain
+          // for bytom2
+          xpub: currentAccount.xpub,
+          net: bytom.settings.network,
+          chain: bytom.settings.netType
         }
         if(bytom.settings.netType === 'vapor'){
           account.address = vpAddress;
+          account.account = vpAddress
         }else{
           account.address = address;
+          account.account = address
         }
 
 
@@ -306,7 +307,8 @@ export default class Background {
           sendResponse(account);
         } else{
           NotificationService.open(new Prompt(PromptTypes.REQUEST_AUTH, payload.domain, payload, approved => {
-            if(approved === false || approved.hasOwnProperty('isError')) sendResponse(approved);
+            if (approved === false) sendResponse(Error.forbidden())
+            else if(approved.hasOwnProperty('isError')) sendResponse(approved);
             else {
               bytom.settings.domains.unshift(domain);
               bytom.settings.domainsMeta[domain] = domainAttrs;
@@ -331,7 +333,8 @@ export default class Background {
       if(index !== -1) {
         payload.type = 'dis'
         NotificationService.open(new Prompt(PromptTypes.REQUEST_AUTH, payload.domain, payload, approved => {
-          if(approved === false || approved.hasOwnProperty('isError')) sendResponse(approved);
+          if (approved === false) sendResponse(Error.forbidden())
+          else if(approved.hasOwnProperty('isError')) sendResponse(approved);
           else {
             bytom.settings.domains.splice(index, 1);
             delete bytom.settings.domainsMeta[domain];