- {hasWebUsb && (
+ {isWebUSB(transport) && (
Device not recognized?
diff --git a/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/index.js b/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/index.js
index a0cad05f..96f302b4 100644
--- a/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/index.js
+++ b/src/js/views/Wallet/components/LeftNavigation/components/RowCoin/index.js
@@ -83,7 +83,7 @@ const iconShape = {
RowCoin.propTypes = {
coin: PropTypes.shape({
name: PropTypes.string.isRequired,
- network: PropTypes.string.isRequired,
+ network: PropTypes.string,
img: PropTypes.string,
}).isRequired,
iconLeft: PropTypes.shape(iconShape),
diff --git a/src/js/views/Wallet/components/Tabs/index.js b/src/js/views/Wallet/components/TopNavigationAccount/index.js
similarity index 96%
rename from src/js/views/Wallet/components/Tabs/index.js
rename to src/js/views/Wallet/components/TopNavigationAccount/index.js
index f8b85375..b08dddb3 100644
--- a/src/js/views/Wallet/components/Tabs/index.js
+++ b/src/js/views/Wallet/components/TopNavigationAccount/index.js
@@ -76,7 +76,7 @@ class Indicator extends Component {
}
}
-const AccountTabs = (props: any) => {
+const TopNavigationAccount = (props: any) => {
const urlParams = props.match.params;
const basePath = `/device/${urlParams.device}/network/${urlParams.network}/account/${urlParams.account}`;
@@ -102,4 +102,4 @@ const AccountTabs = (props: any) => {
);
};
-export default AccountTabs;
\ No newline at end of file
+export default TopNavigationAccount;
\ No newline at end of file
diff --git a/src/js/views/Wallet/views/DeviceSettingsTabs/index.js b/src/js/views/Wallet/components/TopNavigationDeviceSettings/index.js
similarity index 100%
rename from src/js/views/Wallet/views/DeviceSettingsTabs/index.js
rename to src/js/views/Wallet/components/TopNavigationDeviceSettings/index.js
diff --git a/src/js/views/Wallet/index.js b/src/js/views/Wallet/index.js
index 494981d1..eb787da2 100644
--- a/src/js/views/Wallet/index.js
+++ b/src/js/views/Wallet/index.js
@@ -14,10 +14,10 @@ import Footer from 'components/Footer';
import ModalContainer from 'components/modal';
import Notifications from 'components/Notification';
import Log from 'components/Log';
-import DeviceSettingsTabs from './views/DeviceSettingsTabs';
import LeftNavigation from './components/LeftNavigation/Container';
-import AccountTabs from './components/Tabs';
+import TopNavigationAccount from './components/TopNavigationAccount';
+import TopNavigationDeviceSettings from './components/TopNavigationDeviceSettings';
type WalletContainerProps = {
wallet: $ElementType,
@@ -35,7 +35,7 @@ const AppWrapper = styled.div`
display: flex;
flex-direction: column;
background: ${colors.BACKGROUND};
-
+
&.resized {
min-height: 680px;
}
@@ -80,8 +80,8 @@ const Wallet = (props: WalletContainerProps) => (
-
-
+
+
diff --git a/src/js/views/Wallet/components/Receive/Container.js b/src/js/views/Wallet/views/AccountReceive/Container.js
similarity index 100%
rename from src/js/views/Wallet/components/Receive/Container.js
rename to src/js/views/Wallet/views/AccountReceive/Container.js
diff --git a/src/js/views/Wallet/components/Receive/index.js b/src/js/views/Wallet/views/AccountReceive/index.js
similarity index 95%
rename from src/js/views/Wallet/components/Receive/index.js
rename to src/js/views/Wallet/views/AccountReceive/index.js
index 13a8a9e8..e1289c2d 100644
--- a/src/js/views/Wallet/components/Receive/index.js
+++ b/src/js/views/Wallet/views/AccountReceive/index.js
@@ -7,7 +7,7 @@ import Tooltip from 'rc-tooltip';
import { QRCode } from 'react-qr-svg';
import { Notification } from 'components/Notification';
-import SelectedAccount from '../SelectedAccount';
+import SelectedAccount from 'views/Wallet/components/SelectedAccount';
import type { Props } from './index';
@@ -16,7 +16,7 @@ const StyledH2 = styled(H2)`
padding: 20px 48px;
`;
-const Receive = (props: Props) => {
+const AccountReceive = (props: Props) => {
const device = props.wallet.selectedDevice;
const {
account,
@@ -96,6 +96,6 @@ const Receive = (props: Props) => {
export default (props: Props) => (
-
+
);
\ No newline at end of file
diff --git a/src/js/views/Wallet/components/Send/Container.js b/src/js/views/Wallet/views/AccountSend/Container.js
similarity index 100%
rename from src/js/views/Wallet/components/Send/Container.js
rename to src/js/views/Wallet/views/AccountSend/Container.js
diff --git a/src/js/views/Wallet/components/Send/components/AdvancedForm.js b/src/js/views/Wallet/views/AccountSend/components/AdvancedForm.js
similarity index 100%
rename from src/js/views/Wallet/components/Send/components/AdvancedForm.js
rename to src/js/views/Wallet/views/AccountSend/components/AdvancedForm.js
diff --git a/src/js/views/Wallet/components/Send/components/CoinSelectOption.js b/src/js/views/Wallet/views/AccountSend/components/CoinSelectOption.js
similarity index 100%
rename from src/js/views/Wallet/components/Send/components/CoinSelectOption.js
rename to src/js/views/Wallet/views/AccountSend/components/CoinSelectOption.js
diff --git a/src/js/views/Wallet/components/Send/components/FeeSelect.js b/src/js/views/Wallet/views/AccountSend/components/FeeSelect.js
similarity index 100%
rename from src/js/views/Wallet/components/Send/components/FeeSelect.js
rename to src/js/views/Wallet/views/AccountSend/components/FeeSelect.js
diff --git a/src/js/views/Wallet/components/Send/components/PendingTransactions.js b/src/js/views/Wallet/views/AccountSend/components/PendingTransactions.js
similarity index 100%
rename from src/js/views/Wallet/components/Send/components/PendingTransactions.js
rename to src/js/views/Wallet/views/AccountSend/components/PendingTransactions.js
diff --git a/src/js/views/Wallet/components/Send/index.js b/src/js/views/Wallet/views/AccountSend/index.js
similarity index 97%
rename from src/js/views/Wallet/components/Send/index.js
rename to src/js/views/Wallet/views/AccountSend/index.js
index f9caeefe..33ddc752 100644
--- a/src/js/views/Wallet/components/Send/index.js
+++ b/src/js/views/Wallet/views/AccountSend/index.js
@@ -5,16 +5,15 @@ import styled from 'styled-components';
import Select from 'react-select';
import { H2 } from 'components/Heading';
import { calculate, validation } from 'actions/SendFormActions';
+import SelectedAccount from 'views/Wallet/components/SelectedAccount';
import type { Token } from 'flowtype';
import AdvancedForm from './components/AdvancedForm';
import PendingTransactions from './components/PendingTransactions';
import { FeeSelectValue, FeeSelectOption } from './components/FeeSelect';
-import SelectedAccount from '../SelectedAccount';
-
import type { Props } from './index';
-export default class SendContainer extends Component {
+export default class AccountSendContainer extends Component {
componentWillReceiveProps(newProps: Props) {
calculate(this.props, newProps);
validation(newProps);
diff --git a/src/js/views/Wallet/components/Sign/index.js b/src/js/views/Wallet/views/AccountSignVerify/index.js
similarity index 95%
rename from src/js/views/Wallet/components/Sign/index.js
rename to src/js/views/Wallet/views/AccountSignVerify/index.js
index 53a8fe78..7935b1e6 100644
--- a/src/js/views/Wallet/components/Sign/index.js
+++ b/src/js/views/Wallet/views/AccountSignVerify/index.js
@@ -40,7 +40,7 @@ const Textarea = styled.textarea`
const Input = styled.input``;
-const SignVerify = () => (
+const AccountSignVerify = () => (
Sign message
@@ -63,4 +63,4 @@ const SignVerify = () => (
);
-export default SignVerify;
\ No newline at end of file
+export default AccountSignVerify;
\ No newline at end of file
diff --git a/src/js/views/Wallet/views/Account/Container.js b/src/js/views/Wallet/views/AccountSummary/Container.js
similarity index 100%
rename from src/js/views/Wallet/views/Account/Container.js
rename to src/js/views/Wallet/views/AccountSummary/Container.js
diff --git a/src/js/views/Wallet/views/Account/components/Details/index.js b/src/js/views/Wallet/views/AccountSummary/components/Details/index.js
similarity index 100%
rename from src/js/views/Wallet/views/Account/components/Details/index.js
rename to src/js/views/Wallet/views/AccountSummary/components/Details/index.js
diff --git a/src/js/views/Wallet/views/Account/components/Tokens/index.js b/src/js/views/Wallet/views/AccountSummary/components/Tokens/index.js
similarity index 100%
rename from src/js/views/Wallet/views/Account/components/Tokens/index.js
rename to src/js/views/Wallet/views/AccountSummary/components/Tokens/index.js
diff --git a/src/js/views/Wallet/views/Account/index.js b/src/js/views/Wallet/views/AccountSummary/index.js
similarity index 100%
rename from src/js/views/Wallet/views/Account/index.js
rename to src/js/views/Wallet/views/AccountSummary/index.js
diff --git a/src/js/views/index.js b/src/js/views/index.js
index be4f89eb..62186655 100644
--- a/src/js/views/index.js
+++ b/src/js/views/index.js
@@ -10,6 +10,11 @@ import LandingContainer from 'views/Landing/Container';
// wallet views
import WalletContainer from 'views/Wallet';
+import AccountSummary from 'views/Wallet/views/AccountSummary/Container';
+import AccountSend from 'views/Wallet/views/AccountSend/Container';
+import AccountReceive from 'views/Wallet/views/AccountReceive/Container';
+import AccountSignVerify from 'views/Wallet/views/AccountSignVerify';
+
import WalletDashboard from 'views/Wallet/views/Dashboard';
import WalletDeviceSettings from 'views/Wallet/views/DeviceSettings';
import WalletSettings from 'views/Wallet/views/WalletSettings';
@@ -18,13 +23,6 @@ import WalletInitialize from 'views/Wallet/views/Initialize';
import WalletAcquire from 'views/Wallet/views/Acquire';
import WalletUnreadableDevice from 'views/Wallet/views/UnreadableDevice';
-// wallet views - accounts
-// import SummaryContainer from './Wallet/components/Summary/Container';
-import AccountContainer from 'views/Wallet/views/Account/Container';
-import SignVerifyContainer from './Wallet/components/Sign';
-import ReceiveContainer from './Wallet/components/Receive/Container';
-import SendFormContainer from './Wallet/components/Send/Container';
-
import store, { history } from '../store';
const App = () => (
@@ -45,11 +43,11 @@ const App = () => (
-
-
-
-
-
+
+
+
+
+