tokens and coins instead of flag

Keeper-Wallet · Nov 15, 2018 · 116eedf · 116eedf
1 parent fad42b5
commit 116eedf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/controllers/MessageController.js b/src/controllers/MessageController.js
@@ -210,8 +210,10 @@ export class MessageController extends EventEmitter {
 
                 if (field.hasOwnProperty('tokens') && field.hasOwnProperty('assetId')) {
                     const asset = await this.assetInfo(data[key].assetId);
-                    const amount = new BigNumber(field.tokens).multipliedBy(field.nonDecimal ? 1 : 10 ** asset.precision).toString();
-                    data[key] = new Money(amount, asset)
+                    data[key] = Money.fromTokens(field.tokens, asset)
+                } else if (field.hasOwnProperty('coins') && field.hasOwnProperty('assetId')) {
+                    const asset = await this.assetInfo(data[key].assetId);
+                    data[key] = Money.fromCoins(field.coins, asset)
                 } else if (Array.isArray(field)) {
                     data[key] = await Promise.all(data[key].map((item) => this._transformData(item)));
                 } else {

diff --git a/test/MessageController.spec.js b/test/MessageController.spec.js
@@ -26,7 +26,7 @@ describe("MessageController", () => {
                 assetId:'WAVES'
             },
             fee: {
-                tokens: '0.001',
+                coins: '1000000',
                 assetId:'WAVES'
             },
             attachment: '',