From 2355d3d7845a1bad36f5b0c60aa6bab4c26e0f5f Mon Sep 17 00:00:00 2001
From: Szymon Lesisz <sz.lesisz@gmail.com>
Date: Fri, 18 May 2018 19:35:55 +0200
Subject: [PATCH] SelectedAccount component state type renamed to avoid
 confusion with reducer accountState

---
 src/js/components/wallet/account/SelectedAccount.js | 6 +++---
 src/js/components/wallet/account/receive/Receive.js | 8 ++++----
 src/js/components/wallet/account/receive/index.js   | 2 --
 src/js/components/wallet/account/send/SendForm.js   | 4 ++--
 src/js/components/wallet/account/summary/Summary.js | 4 ++--
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/js/components/wallet/account/SelectedAccount.js b/src/js/components/wallet/account/SelectedAccount.js
index 37e6ab43..cbe47ddc 100644
--- a/src/js/components/wallet/account/SelectedAccount.js
+++ b/src/js/components/wallet/account/SelectedAccount.js
@@ -27,16 +27,16 @@ export type DispatchProps = {
 
 export type Props = StateProps & DispatchProps;
 
-export type AccountState = {
+export type ComponentState = {
     device: ?TrezorDevice;
     account: ?Account;
     discovery: ?Discovery;
     deviceStatusNotification: ?React$Element<typeof Notification>;
 }
 
-export default class SelectedAccount<P> extends Component<Props & P, AccountState> {
+export default class SelectedAccount<P> extends Component<Props & P, ComponentState> {
 
-    state: AccountState = {
+    state: ComponentState = {
         device: null,
         account: null,
         discovery: null,
diff --git a/src/js/components/wallet/account/receive/Receive.js b/src/js/components/wallet/account/receive/Receive.js
index fa546ec7..b828df02 100644
--- a/src/js/components/wallet/account/receive/Receive.js
+++ b/src/js/components/wallet/account/receive/Receive.js
@@ -6,19 +6,19 @@ import React, { Component } from 'react';
 import Tooltip from 'rc-tooltip';
 import { QRCode } from 'react-qr-svg';
 
-import selectedAccount from '../SelectedAccount';
+import SelectedAccount from '../SelectedAccount';
 import { Notification } from '~/js/components/common/Notification';
 
-import type { AccountState } from '../SelectedAccount';
+import type { ComponentState } from '../SelectedAccount';
 import type { Props } from './index';
 
-export default class Receive extends selectedAccount<Props> {
+export default class Receive extends SelectedAccount<Props> {
     render() {
         return super.render() || _render(this.props, this.state);
     }
 }
 
-const _render = (props: Props, state: AccountState): React$Element<string> => {
+const _render = (props: Props, state: ComponentState): React$Element<string> => {
 
     const {
         device,
diff --git a/src/js/components/wallet/account/receive/index.js b/src/js/components/wallet/account/receive/index.js
index b2f783f6..8d24ff97 100644
--- a/src/js/components/wallet/account/receive/index.js
+++ b/src/js/components/wallet/account/receive/index.js
@@ -17,8 +17,6 @@ import type {
     DispatchProps as BaseDispatchProps 
 } from '../SelectedAccount';
 
-import type { AccountState } from '../SelectedAccount';
-
 type OwnProps = { }
 
 type StateProps = BaseStateProps & {
diff --git a/src/js/components/wallet/account/send/SendForm.js b/src/js/components/wallet/account/send/SendForm.js
index 49f1fc66..ffc72cb0 100644
--- a/src/js/components/wallet/account/send/SendForm.js
+++ b/src/js/components/wallet/account/send/SendForm.js
@@ -11,7 +11,7 @@ import SelectedAccount from '../SelectedAccount';
 import { findAccountTokens } from '~/js/reducers/TokensReducer';
 
 import type { Props } from './index';
-import type { AccountState } from '../SelectedAccount';
+import type { ComponentState } from '../SelectedAccount';
 
 export default class Send extends SelectedAccount<Props> {
     render() {
@@ -19,7 +19,7 @@ export default class Send extends SelectedAccount<Props> {
     }
 }
 
-const _render = (props: Props, state: AccountState): React$Element<string> => {
+const _render = (props: Props, state: ComponentState): React$Element<string> => {
 
     const {
         device,
diff --git a/src/js/components/wallet/account/summary/Summary.js b/src/js/components/wallet/account/summary/Summary.js
index 980e702e..28d2d1ee 100644
--- a/src/js/components/wallet/account/summary/Summary.js
+++ b/src/js/components/wallet/account/summary/Summary.js
@@ -13,7 +13,7 @@ import SummaryDetails from './SummaryDetails.js';
 import SummaryTokens from './SummaryTokens.js';
 
 import type { Props } from './index';
-import type { AccountState } from '../SelectedAccount';
+import type { ComponentState } from '../SelectedAccount';
 
 import type { TrezorDevice } from '~/flowtype';
 import type { NetworkToken } from '~/js/reducers/LocalStorageReducer';
@@ -27,7 +27,7 @@ export default class Summary extends SelectedAccount<Props> {
     }
 }
 
-const _render = (props: Props, state: AccountState): React$Element<string> => {
+const _render = (props: Props, state: ComponentState): React$Element<string> => {
 
     const {
         device,