aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
diff options
context:
space:
mode:
authorAlexander Tseung <alextsg@gmail.com>2018-09-18 01:09:48 +0800
committerAlexander Tseung <alextsg@gmail.com>2018-09-20 05:31:10 +0800
commit04ec3f0b6b3c66b8d75b7d3da257680a97453915 (patch)
tree604f5623534e28d74691113c66f2ecf9f7fb2a53 /ui/app
parentd0d0103bb52cbc032a3b3ea2a2ff5edbf67b0d19 (diff)
downloadtangerine-wallet-browser-04ec3f0b6b3c66b8d75b7d3da257680a97453915.tar
tangerine-wallet-browser-04ec3f0b6b3c66b8d75b7d3da257680a97453915.tar.gz
tangerine-wallet-browser-04ec3f0b6b3c66b8d75b7d3da257680a97453915.tar.bz2
tangerine-wallet-browser-04ec3f0b6b3c66b8d75b7d3da257680a97453915.tar.lz
tangerine-wallet-browser-04ec3f0b6b3c66b8d75b7d3da257680a97453915.tar.xz
tangerine-wallet-browser-04ec3f0b6b3c66b8d75b7d3da257680a97453915.tar.zst
tangerine-wallet-browser-04ec3f0b6b3c66b8d75b7d3da257680a97453915.zip
Fix Transaction view styles
Diffstat (limited to 'ui/app')
-rw-r--r--ui/app/components/transaction-action/transaction-action.component.js4
-rw-r--r--ui/app/components/transaction-activity-log/index.scss4
-rw-r--r--ui/app/components/transaction-list/index.scss4
3 files changed, 9 insertions, 3 deletions
diff --git a/ui/app/components/transaction-action/transaction-action.component.js b/ui/app/components/transaction-action/transaction-action.component.js
index 81a1e96d0..1729b878c 100644
--- a/ui/app/components/transaction-action/transaction-action.component.js
+++ b/ui/app/components/transaction-action/transaction-action.component.js
@@ -4,7 +4,7 @@ import { getTransactionActionKey } from '../../helpers/transactions.util'
export default class TransactionAction extends PureComponent {
static contextTypes = {
- tOrDefault: PropTypes.func,
+ t: PropTypes.func,
}
static propTypes = {
@@ -35,7 +35,7 @@ export default class TransactionAction extends PureComponent {
}
const actionKey = await getTransactionActionKey(transaction, data)
- const action = actionKey && this.context.tOrDefault(actionKey)
+ const action = actionKey && this.context.t(actionKey)
this.setState({ transactionAction: action })
}
diff --git a/ui/app/components/transaction-activity-log/index.scss b/ui/app/components/transaction-activity-log/index.scss
index 2324d44b1..a9933dac6 100644
--- a/ui/app/components/transaction-activity-log/index.scss
+++ b/ui/app/components/transaction-activity-log/index.scss
@@ -33,6 +33,10 @@
&:last-child::after {
height: 50%;
}
+
+ &:first-child:last-child::after {
+ display: none;
+ }
}
&__activity-icon {
diff --git a/ui/app/components/transaction-list/index.scss b/ui/app/components/transaction-list/index.scss
index d944ef20e..777f701f9 100644
--- a/ui/app/components/transaction-list/index.scss
+++ b/ui/app/components/transaction-list/index.scss
@@ -3,6 +3,8 @@
flex-direction: column;
flex: 1;
overflow-y: hidden;
+ margin-top: 8px;
+ border-top: 1px solid $geyser;
&__completed-transactions {
display: flex;
@@ -15,7 +17,7 @@
font-size: .875rem;
color: $dusty-gray;
border-bottom: 1px solid $geyser;
- padding: 16px 0 8px 20px;
+ padding: 8px 0 8px 20px;
@media screen and (max-width: $break-small) {
padding: 8px 0 8px 16px;