paid-services 3.14.0 → 3.14.3

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Versions
 
-## Version 3.14.0
+## Version 3.14.3
+
+- `manageTrades`: Fix listing of trades that have fiat-pricing
+
+## Version 3.14.1
 
 - `manageTrades`: Add support for dynamic fiat-priced trades
 

package/package.json

@@ -43,5 +43,5 @@
     "integration-tests": "tap -j 2 --branches=1 --functions=1 --lines=1 --statements=1 -t 180 test/integration/*.js",
     "test": "tap --branches=1 --functions=1 --lines=1 --statements=1 -t 60 test/actions/*.js test/balanced/*.js test/capacity/*.js test/client/*.js test/config/*.js test/p2p/*.js test/records/*.js test/respond/*.js test/server/*.js test/server/*.js test/services/*.js test/trades/*.js"
   },
-  "version": "3.14.0"
+  "version": "3.14.3"
 }

package/trades/find_trade.js

@@ -85,7 +85,7 @@ module.exports = ({ask, id, lnd, logger, nodes}, cbk) => {
           return cbk();
         }
 
-        return requestTradeById({action, id, lnd, to}, cbk);
+        return requestTradeById({id, lnd, to}, cbk);
       })],
 
       // Request an inventory of trades

package/trades/manage_trades.js

@@ -200,11 +200,14 @@ module.exports = ({ask, lnd, logger, request, separator}, cbk) => {
           return cbk([404, 'NoTradesCurrentlyOpen']);
         }
 
+        const trades = getTrades.filter(n => !!n.secret && !!n.description);
+
         return ask({
-          choices: getTrades.filter(n => !!n.secret).map(trade => ({
-            name: `${tokensAsBigUnit(trade.tokens)} ${trade.description}`,
-            value: trade.id,
-          })),
+          choices: trades.map(({description, id, price, tokens}) => {
+            const charging = !!tokens ? tokensAsBigUnit(tokens) : price;
+
+            return {name: `${charging} ${description}`, value: id};
+          }),
           message: 'Trade?',
           name: 'manage',
           type: 'list',
@@ -258,6 +261,7 @@ module.exports = ({ask, lnd, logger, request, separator}, cbk) => {
           expires_at: trade.expires_at,
           id: trade.id,
           network: getNetwork.network,
+          price: trade.price,
           public_key: getIdentity.public_key,
           secret: trade.secret,
           tokens: trade.tokens,
@@ -311,8 +315,10 @@ module.exports = ({ask, lnd, logger, request, separator}, cbk) => {
           return logger.info(`sold: ${tokensAsBigUnit(tokens)} ${item}`);
         });
 
-        sub.on('start', ({description, tokens}) => {
-          const trade = `${tokensAsBigUnit(tokens)} ${description}`;
+        sub.on('start', ({description, price, tokens}) => {
+          const amount = !!tokens ? tokensAsBigUnit(tokens) : price;
+
+          const trade = `${amount} ${description}`;
 
           return logger.info(`open: ${trade}`);
         });

package/trades/trade_from_invoice.js

@@ -32,7 +32,7 @@ module.exports = args => {
     return {};
   }
 
-  if (!!args.is_push || !args.tokens) {
+  if (!!args.is_push) {
     return {};
   }