arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2025-01-23 06:21:06 +00:00
Code Issues Releases Wiki Activity

pass network.shortcut to Content component

Browse Source
This commit is contained in:
slowbackspace 2018-12-16 23:52:02 +01:00
parent 512574ece2
commit 800a5be990
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/Wallet/views/Account/Receive/ethereum/index.js
View File

@ -97,9 +97,10 @@ const AccountReceive = (props: Props) => {
discovery, discovery,
shouldRender, shouldRender,
loader, loader,
network,
} = props.selectedAccount; } = props.selectedAccount;
const { type, title, message } = loader; const { type, title, message } = loader;
if (!device || !account || !discovery || !shouldRender) return <Content type={type} title={title} message={message} isLoading />; if (!device || !account || !discovery || !shouldRender) return <Content type={type} title={title} message={message} networkShortcut={(network || {}).shortcut} isLoading />;
const { const {
addressVerified, addressVerified,

3
src/views/Wallet/views/Account/Receive/ripple/index.js
View File

@ -97,9 +97,10 @@ const AccountReceive = (props: Props) => {
discovery, discovery,
shouldRender, shouldRender,
loader, loader,
network,
} = props.selectedAccount; } = props.selectedAccount;
const { type, title, message } = loader; const { type, title, message } = loader;
if (!device || !account || !discovery || !shouldRender) return <Content type={type} title={title} message={message} isLoading />; if (!device || !account || !discovery || !shouldRender) return <Content type={type} title={title} message={message} networkShortcut={(network || {}).shortcut} isLoading />;
const { const {
addressVerified, addressVerified,

2
src/views/Wallet/views/Account/Send/ethereum/index.js
View File

@ -214,7 +214,7 @@ const AccountSend = (props: Props) => {
onSend, onSend,
} = props.sendFormActions; } = props.sendFormActions;
const { type, title, message } = loader; const { type, title, message } = loader;
if (!device || !account || !discovery || !network || !shouldRender) return <Content type={type} title={title} message={message} isLoading />; if (!device || !account || !discovery || !network || !shouldRender) return <Content type={type} title={title} message={message} networkShortcut={(network || {}).shortcut} isLoading />;
const isCurrentCurrencyToken = networkSymbol !== currency; const isCurrentCurrencyToken = networkSymbol !== currency;

2
src/views/Wallet/views/Account/Send/ripple/index.js
View File

@ -143,7 +143,7 @@ const AccountSend = (props: Props) => {
onSend, onSend,
} = props.sendFormActions; } = props.sendFormActions;
const { type, title, message } = loader; const { type, title, message } = loader;
if (!device || !account || !discovery || !network || !shouldRender) return <Content type={type} title={title} message={message} isLoading />; if (!device || !account || !discovery || !network || !shouldRender) return <Content type={type} title={title} message={message} networkShortcut={(network || {}).shortcut} isLoading />;
let isSendButtonDisabled: boolean = Object.keys(errors).length > 0 || total === '0' || amount.length === 0 || address.length === 0 || sending; let isSendButtonDisabled: boolean = Object.keys(errors).length > 0 || total === '0' || amount.length === 0 || address.length === 0 || sending;
let sendButtonText: string = ` ${total} ${network.symbol}`; let sendButtonText: string = ` ${total} ${network.symbol}`;

4
src/views/Wallet/views/Account/SignVerify/index.js
View File

@ -57,10 +57,10 @@ class SignVerify extends Component <Props> {
render() { render() {
const device = this.props.wallet.selectedDevice; const device = this.props.wallet.selectedDevice;
const { const {
account, discovery, shouldRender, notification, account, discovery, shouldRender, notification, network,
} = this.props.selectedAccount; } = this.props.selectedAccount;
const { type, title, message } = notification; const { type, title, message } = notification;
if (!device || !account || !discovery || !shouldRender) return <Content type={type} title={title} message={message} isLoading />; if (!device || !account || !discovery || !shouldRender) return <Content type={type} title={title} message={message} networkShortcut={(network || {}).shortcut} isLoading />;
const { const {
signVerifyActions, signVerifyActions,
signVerify: { signVerify: {

2
src/views/Wallet/views/Account/Summary/ethereum/index.js
View File

@ -82,7 +82,7 @@ const AccountSummary = (props: Props) => {
const { type, title, message } = loader; const { type, title, message } = loader;
if (!device || !account || !network || !shouldRender) return <Content type={type} title={title} message={message} isLoading />; if (!device || !account || !network || !shouldRender) return <Content type={type} title={title} message={message} networkShortcut={(network || {}).shortcut} isLoading />;
const explorerLink: string = `${network.explorer.address}${account.address}`; const explorerLink: string = `${network.explorer.address}${account.address}`;
const pendingAmount: BigNumber = stateUtils.getPendingAmount(pending, network.symbol); const pendingAmount: BigNumber = stateUtils.getPendingAmount(pending, network.symbol);

2
src/views/Wallet/views/Account/Summary/ripple/index.js
View File

@ -72,7 +72,7 @@ const AccountSummary = (props: Props) => {
const { type, title, message } = loader; const { type, title, message } = loader;
if (!device || !account || !network || !shouldRender) return <Content type={type} title={title} message={message} isLoading />; if (!device || !account || !network || !shouldRender) return <Content type={type} title={title} message={message} networkShortcut={(network || {}).shortcut} isLoading />;
const explorerLink: string = `${network.explorer.address}${account.address}`; const explorerLink: string = `${network.explorer.address}${account.address}`;
const pendingAmount: BigNumber = stateUtils.getPendingAmount(pending, network.symbol); const pendingAmount: BigNumber = stateUtils.getPendingAmount(pending, network.symbol);