git.iko.soy/bridge
on master help sign in
fix: allow warning/default highlighted text and update microcopy
9628d5dMatt Condon (shrugs)
src/components/Highlighted.js+11−2
compare with master
unifiedsplit
@@ -1,5 +1,14 @@
1import React from 'react';
1import React from 'react';
2+import cn from 'classnames';
2
3
3−export default function Highlighted(props) {
4+export default function Highlighted({ warning = false, ...rest }) {
5+ return (
6+ <span
4− return <span className="red3" {...props} />;
7+ className={cn({
8+ red3: warning,
9+ green3: !warning,
10+ })}
11+ {...rest}
12+ />
13+ );
5}
14}
src/views/Activate/PassportTransfer.js+2−2
@@ -168,7 +168,7 @@ export default function PassportTransfer({ className, resetActivateRouter }) {
168 if (needFunds) {
168 if (needFunds) {
169 return (
169 return (
170 <Grid.Item full className="mt8">
170 <Grid.Item full className="mt8">
171− <Highlighted>
171+ <Highlighted warning>
172 The address {needFunds.address} needs at least{' '}
172 The address {needFunds.address} needs at least{' '}
173 {fromWei(needFunds.minBalance)} ETH and currently has{' '}
173 {fromWei(needFunds.minBalance)} ETH and currently has{' '}
174 {fromWei(needFunds.balance)} ETH. Waiting until the account has
174 {fromWei(needFunds.balance)} ETH. Waiting until the account has
@@ -199,7 +199,7 @@ export default function PassportTransfer({ className, resetActivateRouter }) {
199 <Grid.Item full as={LoadingBar} progress={progress} />
199 <Grid.Item full as={LoadingBar} progress={progress} />
200 <Grid.Item full>
200 <Grid.Item full>
201 <Text className="f5 green4">
201 <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
203 this page until the process is complete.
203 this page until the process is complete.
204 </Text>
204 </Text>
205 </Grid.Item>
205 </Grid.Item>
src/views/Admin/Reticket/ReticketExecute.js+2−2
@@ -127,7 +127,7 @@ export default function ReticketExecute({ newWallet, setNewWallet }) {
127 if (needFunds) {
127 if (needFunds) {
128 return (
128 return (
129 <Grid.Item full>
129 <Grid.Item full>
130− <Highlighted>
130+ <Highlighted warning>
131 The address {needFunds.address} needs at least{' '}
131 The address {needFunds.address} needs at least{' '}
132 {fromWei(needFunds.minBalance)} ETH and currently has{' '}
132 {fromWei(needFunds.minBalance)} ETH and currently has{' '}
133 {fromWei(needFunds.balance)} ETH. Waiting until the account has
133 {fromWei(needFunds.balance)} ETH. Waiting until the account has
@@ -171,7 +171,7 @@ export default function ReticketExecute({ newWallet, setNewWallet }) {
171 <Grid.Item full as={LoadingBar} progress={progress} />
171 <Grid.Item full as={LoadingBar} progress={progress} />
172 <Grid.Item full>
172 <Grid.Item full>
173 <Text className="f5 green4">
173 <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
175 this page until the process is complete.
175 this page until the process is complete.
176 </Text>
176 </Text>
177 </Grid.Item>
177 </Grid.Item>
src/views/Invite/InviteEmail.js+1−1
@@ -509,7 +509,7 @@ export default function InviteEmail() {
509
509
510 {needFunds && (
510 {needFunds && (
511 <Grid.Item full>
511 <Grid.Item full>
512− <Highlighted>
512+ <Highlighted warning>
513 Your ownership address {needFunds.address} needs at least{' '}
513 Your ownership address {needFunds.address} needs at least{' '}
514 {fromWei(needFunds.minBalance)} ETH and currently has{' '}
514 {fromWei(needFunds.minBalance)} ETH and currently has{' '}
515 {fromWei(needFunds.balance)} ETH. Waiting until the account has
515 {fromWei(needFunds.balance)} ETH. Waiting until the account has