From 4f1ba157e166c41e515b6476e9ca01bc78bb440d Mon Sep 17 00:00:00 2001
From: Szymon Lesisz <sz.lesisz@gmail.com>
Date: Fri, 4 Jan 2019 14:32:14 +0100
Subject: [PATCH] update "rippleGetAccountInfo" and "ethereumGetAccountInfo"
 params

---
 src/actions/Web3Actions.js                |  9 +++++----
 src/actions/ethereum/BlockchainActions.js | 10 ++++++----
 src/actions/ethereum/SendFormActions.js   |  1 +
 src/actions/ripple/DiscoveryActions.js    |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/actions/Web3Actions.js b/src/actions/Web3Actions.js
index 2bb0a43e..101f17d5 100644
--- a/src/actions/Web3Actions.js
+++ b/src/actions/Web3Actions.js
@@ -120,15 +120,16 @@ export const initWeb3 = (network: string, urlIndex: number = 0): PromiseAction<W
     web3.currentProvider.on('error', onEnd);
 });
 
-export const discoverAccount = (address: string, network: string): PromiseAction<EthereumAccount> => async (dispatch: Dispatch): Promise<EthereumAccount> => {
+export const discoverAccount = (descriptor: string, network: string): PromiseAction<EthereumAccount> => async (dispatch: Dispatch): Promise<EthereumAccount> => {
     const instance: Web3Instance = await dispatch(initWeb3(network));
-    const balance = await instance.web3.eth.getBalance(address);
-    const nonce = await instance.web3.eth.getTransactionCount(address);
+    const balance = await instance.web3.eth.getBalance(descriptor);
+    const nonce = await instance.web3.eth.getTransactionCount(descriptor);
     return {
-        address,
+        descriptor,
         transactions: 0,
         block: 0,
         balance: EthereumjsUnits.convert(balance, 'wei', 'ether'),
+        availableBalance: EthereumjsUnits.convert(balance, 'wei', 'ether'),
         nonce,
     };
 };
diff --git a/src/actions/ethereum/BlockchainActions.js b/src/actions/ethereum/BlockchainActions.js
index 8632e013..087420aa 100644
--- a/src/actions/ethereum/BlockchainActions.js
+++ b/src/actions/ethereum/BlockchainActions.js
@@ -16,14 +16,15 @@ import type { NetworkToken } from 'reducers/LocalStorageReducer';
 import * as Web3Actions from 'actions/Web3Actions';
 import * as AccountsActions from 'actions/AccountsActions';
 
-export const discoverAccount = (device: TrezorDevice, address: string, network: string): PromiseAction<EthereumAccount> => async (dispatch: Dispatch): Promise<EthereumAccount> => {
+export const discoverAccount = (device: TrezorDevice, descriptor: string, network: string): PromiseAction<EthereumAccount> => async (dispatch: Dispatch): Promise<EthereumAccount> => {
     // get data from connect
     const txs = await TrezorConnect.ethereumGetAccountInfo({
         account: {
-            address,
+            descriptor,
             block: 0,
             transactions: 0,
             balance: '0',
+            availableBalance: '0',
             nonce: 0,
         },
         coin: network,
@@ -34,12 +35,13 @@ export const discoverAccount = (device: TrezorDevice, address: string, network:
     }
 
     // blockbook web3 fallback
-    const web3account = await dispatch(Web3Actions.discoverAccount(address, network));
+    const web3account = await dispatch(Web3Actions.discoverAccount(descriptor, network));
     return {
-        address,
+        descriptor,
         transactions: txs.payload.transactions,
         block: txs.payload.block,
         balance: web3account.balance,
+        availableBalance: web3account.balance,
         nonce: web3account.nonce,
     };
 };
diff --git a/src/actions/ethereum/SendFormActions.js b/src/actions/ethereum/SendFormActions.js
index af5d3108..82f4a25d 100644
--- a/src/actions/ethereum/SendFormActions.js
+++ b/src/actions/ethereum/SendFormActions.js
@@ -559,6 +559,7 @@ export const onSend = (): AsyncAction => async (dispatch: Dispatch, getState: Ge
 
             blockHeight: 0,
             blockHash: undefined,
+            timestamp: undefined,
         };
 
         dispatch(BlockchainActions.onNotification({
diff --git a/src/actions/ripple/DiscoveryActions.js b/src/actions/ripple/DiscoveryActions.js
index 0f93a7a2..362d2ca2 100644
--- a/src/actions/ripple/DiscoveryActions.js
+++ b/src/actions/ripple/DiscoveryActions.js
@@ -66,7 +66,7 @@ export const discoverAccount = (device: TrezorDevice, discoveryProcess: Discover
         deviceID: device.features ? device.features.device_id : '0',
         deviceState: device.state || '0',
         accountPath: account.path || [],
-        descriptor: account.address,
+        descriptor: account.descriptor,
 
         balance: toDecimalAmount(account.balance, network.decimals),
         availableBalance: toDecimalAmount(account.availableBalance, network.decimals),