git.iko.soy/bridge
on master help sign in
Merge pull request #299 from urbit/nemesis-copy

Nemesis copy

commit32f6c42ab587d04d0686290a75b153b0064590f3 authorAnthony Arroyo <anthony@tlon.io> dateTue 8 Oct 2019, 15:26 (7 years ago) parent95075416228c33
2 files changed+8−8
compare with master
unifiedsplit
src/views/Activate/PassportTransfer.js+4−4 src/views/Admin/Reticket/ReticketExecute.js+4−4
src/views/Activate/PassportTransfer.js+4−4
@@ -26,13 +26,13 @@ const labelForProgress = progress => {
2626 if (progress <= 0) {
2727 return 'Verify Passport';
2828 } else if (progress <= TRANSACTION_PROGRESS.GENERATING) {
29− return 'Generating Transactions...';
29+ return 'Generating Ethereum Transactions...';
3030 } else if (progress <= TRANSACTION_PROGRESS.SIGNING) {
31− return 'Signing Transactions...';
31+ return 'Signing Ethereum Transactions...';
3232 } else if (progress <= TRANSACTION_PROGRESS.FUNDING) {
33− return 'Funding Transactions...';
33+ return 'Funding Ethereum Transactions...';
3434 } else if (progress <= TRANSACTION_PROGRESS.TRANSFERRING) {
35− return 'Transferring Point...';
35+ return 'Transferring ID...';
3636 } else if (progress <= TRANSACTION_PROGRESS.CLEANING) {
3737 return 'Cleaning Up...';
3838 } else if (progress <= TRANSACTION_PROGRESS.DONE) {
src/views/Admin/Reticket/ReticketExecute.js+4−4
@@ -26,13 +26,13 @@ const labelForProgress = progress => {
2626 if (progress <= 0) {
2727 return 'Starting...';
2828 } else if (progress <= TRANSACTION_PROGRESS.GENERATING) {
29− return 'Generating Transactions...';
29+ return 'Generating Ethereum Transactions...';
3030 } else if (progress <= TRANSACTION_PROGRESS.SIGNING) {
31− return 'Signing Transactions...';
31+ return 'Signing Ethereum Transactions...';
3232 } else if (progress <= TRANSACTION_PROGRESS.FUNDING) {
33− return 'Funding Transactions...';
33+ return 'Funding Ethereum Transactions...';
3434 } else if (progress <= TRANSACTION_PROGRESS.TRANSFERRING) {
35− return 'Transferring Point...';
35+ return 'Transferring ID...';
3636 } else if (progress <= TRANSACTION_PROGRESS.CLEANING) {
3737 return 'Cleaning Up...';
3838 } else if (progress <= TRANSACTION_PROGRESS.DONE) {