git.iko.soy/bridge
on master help sign in
fix: allow warning/default highlighted text and update microcopy
commit9628d5d0ea9db3a37c923999a9a74d7799ea30c6 authorMatt Condon (shrugs) <mattgcondon@gmail.com> dateTue 30 Jul 2019, 07:37 (7 years ago) parentee158d9
4 files changed+16−7
compare with master
unifiedsplit
src/components/Highlighted.js+11−2 src/views/Activate/PassportTransfer.js+2−2 src/views/Admin/Reticket/ReticketExecute.js+2−2 src/views/Invite/InviteEmail.js+1−1
src/components/Highlighted.js+11−2
@@ -1,5 +1,14 @@
11import React from 'react';
2+import cn from 'classnames';
23
3−export default function Highlighted(props) {
4− return <span className="red3" {...props} />;
4+export default function Highlighted({ warning = false, ...rest }) {
5+ return (
6+ <span
7+ className={cn({
8+ red3: warning,
9+ green3: !warning,
10+ })}
11+ {...rest}
12+ />
13+ );
514}
src/views/Activate/PassportTransfer.js+2−2
@@ -168,7 +168,7 @@ export default function PassportTransfer({ className, resetActivateRouter }) {
168168 if (needFunds) {
169169 return (
170170 <Grid.Item full className="mt8">
171− <Highlighted>
171+ <Highlighted warning>
172172 The address {needFunds.address} needs at least{' '}
173173 {fromWei(needFunds.minBalance)} ETH and currently has{' '}
174174 {fromWei(needFunds.balance)} ETH. Waiting until the account has
@@ -199,7 +199,7 @@ export default function PassportTransfer({ className, resetActivateRouter }) {
199199 <Grid.Item full as={LoadingBar} progress={progress} />
200200 <Grid.Item full>
201201 <Text className="f5 green4">
202− This process can take up to 5 minutes to complete. Don't leave
202+ This process can take up to 5 minutes to complete. Don't close
203203 this page until the process is complete.
204204 </Text>
205205 </Grid.Item>
src/views/Admin/Reticket/ReticketExecute.js+2−2
@@ -127,7 +127,7 @@ export default function ReticketExecute({ newWallet, setNewWallet }) {
127127 if (needFunds) {
128128 return (
129129 <Grid.Item full>
130− <Highlighted>
130+ <Highlighted warning>
131131 The address {needFunds.address} needs at least{' '}
132132 {fromWei(needFunds.minBalance)} ETH and currently has{' '}
133133 {fromWei(needFunds.balance)} ETH. Waiting until the account has
@@ -171,7 +171,7 @@ export default function ReticketExecute({ newWallet, setNewWallet }) {
171171 <Grid.Item full as={LoadingBar} progress={progress} />
172172 <Grid.Item full>
173173 <Text className="f5 green4">
174− This process can take up to 5 minutes to complete. Don't leave
174+ This process can take up to 5 minutes to complete. Don't close
175175 this page until the process is complete.
176176 </Text>
177177 </Grid.Item>
src/views/Invite/InviteEmail.js+1−1
@@ -509,7 +509,7 @@ export default function InviteEmail() {
509509
510510 {needFunds && (
511511 <Grid.Item full>
512− <Highlighted>
512+ <Highlighted warning>
513513 Your ownership address {needFunds.address} needs at least{' '}
514514 {fromWei(needFunds.minBalance)} ETH and currently has{' '}
515515 {fromWei(needFunds.balance)} ETH. Waiting until the account has