on master help sign in
ui: address PR feedback
688345ftomholford
src/lib/constants.ts+1−1
@@ -132,7 +132,7 @@ const TRANSACTION_STATUS_ICONS = {
132 confirmed: 'Checkmark',
132 confirmed: 'Checkmark',
133 pending: 'Clock',
133 pending: 'Clock',
134 sending: 'ArrowNorth',
134 sending: 'ArrowNorth',
135− failed: 'X',
135+ failed: 'ExclaimationMark',
136 unknown: 'NullIcon',
136 unknown: 'NullIcon',
137};
137};
138
138
src/views/Transactions/TransactionHistory.scss+15−2
@@ -230,11 +230,20 @@
230 &.failed {
230 &.failed {
231 background-color: rgb(246,200,196);
231 background-color: rgb(246,200,196);
232 color: rgb(236,81,66);
232 color: rgb(236,81,66);
233− width: 58px;
233+ width: 62px;
234+
235+ span.icon-wrapper {
236+ height: 16px;
237+ width: 16px;
238+ border-radius: 50%;
239+ background-color: #FF4136;
240+ }
234
241
235 svg {
242 svg {
243+ padding-top: 1px;
244+
236 path {
245 path {
237− fill: rgb(236,81,66);;
246+ fill: white;
238 }
247 }
239 }
248 }
240 }
249 }
@@ -250,6 +259,10 @@
250 }
259 }
251 }
260 }
252 }
261 }
262+
263+ &.unknown {
264+ width: 82px;
265+ }
253 }
266 }
254 }
267 }
255 }
268 }
src/views/Transactions/TransactionHistory.tsx+1−1
@@ -144,7 +144,7 @@ const TransactionHistory = () => {
144 <PatpRow patp={patp} />
144 <PatpRow patp={patp} />
145 {txnsByPatp[patp]
145 {txnsByPatp[patp]
146 .sort((a, b) => {
146 .sort((a, b) => {
147− return a.time - b.time;
147+ return b.time - a.time;
148 })
148 })
149 .map(tx => (
149 .map(tx => (
150 <TransactionRow key={tx.time} {...tx} />
150 <TransactionRow key={tx.time} {...tx} />
src/views/Transactions/TransactionRow.tsx+2−8
@@ -78,16 +78,10 @@ export const TransactionRow = ({
78 const statusBadge = useMemo(() => {
78 const statusBadge = useMemo(() => {
79 return (
79 return (
80 <div className={cn(['badge', status])}>
80 <div className={cn(['badge', status])}>
81− <span>
81+ <span className={'icon-wrapper'}>
82 <Icon icon={TRANSACTION_STATUS_ICONS[status] || 'Bug'} />
82 <Icon icon={TRANSACTION_STATUS_ICONS[status] || 'Bug'} />
83 </span>
83 </span>
84− <span>
85− {status === 'pending'
86− ? nextRoll
87− : status === 'confirmed'
88− ? 'Completed'
89− : titleize(status)}
84+ <span>{status === 'pending' ? nextRoll : titleize(status)}</span>
90− </span>
91 </div>
85 </div>
92 );
86 );
93 }, [nextRoll, status]);
87 }, [nextRoll, status]);