1
0
mirror of https://github.com/trezor/trezor-wallet synced 2024-11-24 09:18:09 +00:00

Fix pending transactions styling

This commit is contained in:
Vasek Mlejnsky 2018-09-20 09:37:17 +02:00
parent 5329460d89
commit 3202ba2f6d
2 changed files with 21 additions and 13 deletions

View File

@ -792,7 +792,7 @@ export const onSend = (): AsyncAction => async (dispatch: Dispatch, getState: Ge
data: currentState.data, data: currentState.data,
gasLimit: currentState.gasLimit, gasLimit: currentState.gasLimit,
gasPrice: currentState.gasPrice, gasPrice: currentState.gasPrice,
nonce nonce,
})); }));
const selected: ?TrezorDevice = getState().wallet.selectedDevice; const selected: ?TrezorDevice = getState().wallet.selectedDevice;
@ -831,7 +831,7 @@ export const onSend = (): AsyncAction => async (dispatch: Dispatch, getState: Ge
const serializedTx: string = await dispatch(serializeEthereumTx(txData)); const serializedTx: string = await dispatch(serializeEthereumTx(txData));
const push = await TrezorConnect.pushTransaction({ const push = await TrezorConnect.pushTransaction({
tx: serializedTx, tx: serializedTx,
coin: network.network coin: network.network,
}); });
if (!push.success) { if (!push.success) {

View File

@ -18,12 +18,17 @@ type Props = {
} }
const Wrapper = styled.div` const Wrapper = styled.div`
padding-top: 20px;
border-top: 1px solid ${colors.DIVIDER}; border-top: 1px solid ${colors.DIVIDER};
`; `;
const StyledLink = styled(Link)`
text-decoration: none;
`;
const TransactionWrapper = styled.div` const TransactionWrapper = styled.div`
border-bottom: 1px solid ${colors.DIVIDER}; border-bottom: 1px solid ${colors.DIVIDER};
padding: 14px 48px; padding: 14px 0;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
@ -54,7 +59,9 @@ const TransactionName = styled.div`
flex: 1; flex: 1;
`; `;
const TransactionAmount = styled.div``; const TransactionAmount = styled.div`
color: colors.TEXT_SECONDARY;
`;
class PendingTransactions extends Component<Props> { class PendingTransactions extends Component<Props> {
getPendingTransactions() { getPendingTransactions() {
@ -142,13 +149,14 @@ class PendingTransactions extends Component<Props> {
</TransactionIcon> </TransactionIcon>
<TransactionName> <TransactionName>
<Link <StyledLink
href={`${this.props.network.explorer.tx}${tx.id}`} href={`${this.props.network.explorer.tx}${tx.id}`}
target="_blank" target="_blank"
rel="noreferrer noopener" rel="noreferrer noopener"
isGray
> >
{this.getTransactionName(tx)} {this.getTransactionName(tx)}
</Link> </StyledLink>
</TransactionName> </TransactionName>
<TransactionAmount> <TransactionAmount>