Skip to content

T
token
Commit 0c8563f2 authored by shajiaming's avatar shajiaming
Browse files
Options

Merge branch 'master' into develop

parents 1b095a0f 7dce0747
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
wallet/controllers/FlashController.php
View file @ 0c8563f2
......@@ -160,7 +160,9 @@ class FlashController extends BaseController
'min_fee' => $result['min_fee'] ?? '',
'fee_percent' => $result['fee_percent'] ?? '',
'sort' => $result['sort'] ?? '',
'market_price_float' => $result['market_price_float'] ?? ''
'market_price_float' => $result['market_price_float'] ?? '',
'from_market_price_source' => $result['from_market_price_source'] ?? '',
'to_market_price_source' => $result['to_market_price_source'] ?? ''
];
$appKey = isset($node_params['appKey']) ? $node_params['appKey'] : null;
$appSecret = isset($node_params['appSecret']) ? $node_params['appSecret'] : null;
......@@ -210,7 +212,9 @@ class FlashController extends BaseController
'min_fee' => $result['min_fee'] ?? '',
'fee_percent' => $result['fee_percent'] ?? '',
'sort' => $result['sort'] ?? '',
'market_price_float' => $result['market_price_float'] ?? ''
'market_price_float' => $result['market_price_float'] ?? '',
'from_market_price_source' => $result['from_market_price_source'] ?? '',
'to_market_price_source' => $result['to_market_price_source'] ?? ''
];
$appKey = isset($node_params['appKey']) ? $node_params['appKey'] : null;
$appSecret = isset($node_params['appSecret']) ? $node_params['appSecret'] : null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment