on master help sign in
clear linter errors
commit59f91dd4f62e991fcfcb3d34a2b55722262dca9e authorLiam Fitzgerald <liam@urizen.co> dateFri 3 Jan 2020, 09:53 (7 years ago) parent44dc2fe
7 files changed+20−38
src/components/InlineEthereumTransaction.js+1−1 src/form/EmailChipInput.js+1−2 src/views/Invite/Cohort.js+5−24 src/views/Invite/InviteEmail.js+2−2 src/views/Party/ShowParty.js+9−6 src/views/Point.js+1−2 src/views/Points.js+1−1
src/components/InlineEthereumTransaction.js+1−1
@@ -10,7 +10,7 @@ import {
1010 Text,
1111} from 'indigo-react';
1212
13−import { useExploreTxUrl, useExploreTxUrls } from 'lib/explorer';
13+import { useExploreTxUrls } from 'lib/explorer';
1414import { hexify } from 'lib/txn';
1515import pluralize from 'lib/pluralize';
1616
src/form/EmailChipInput.js+1−2
@@ -35,13 +35,12 @@ const EmailChipInput = ({ className, name, label, disabled }) => {
3535
3636 const {
3737 input,
38− meta: { active, error, dirtySinceLastSubmit },
38+ meta: { active, error },
3939 } = useField(name, {
4040 subscription: {
4141 active: true,
4242 error: true,
4343 value: true,
44− dirtySinceLastSubmit: true,
4544 },
4645 isEqual,
4746 });
src/views/Invite/Cohort.js+5−24
@@ -32,7 +32,6 @@ import {
3232import { MIN_PLANET, GAS_LIMITS } from 'lib/constants';
3333import pluralize from 'lib/pluralize';
3434import useGasPrice from 'lib/useGasPrice';
35−import useSetState from 'lib/useSetState';
3635
3736import EmailChipInput from 'form/EmailChipInput';
3837import FormError from 'form/FormError';
@@ -43,7 +42,7 @@ import {
4342 composeValidator,
4443 hasErrors,
4544} from 'form/validators';
46−import { WARNING, onlyHasWarning } from 'form/helpers';
45+import { WARNING } from 'form/helpers';
4746
4847const GAS_LIMIT = GAS_LIMITS.GIFT_PLANET;
4948
@@ -54,8 +53,6 @@ const STATUS = {
5453 FAILURE: 'FAILURE',
5554};
5655
57−const nameForEmailField = i => `emails[${i}]`;
58−
5956const useInviter = sendInvites => {
6057 const { contracts, web3, networkType } = useNetwork();
6158 const { wallet, walletType, walletHdPath } = useWallet();
@@ -69,7 +66,7 @@ const useInviter = sendInvites => {
6966
7067 const [progress, setProgress] = useState(0);
7168 const [txStatus, setTxStatus] = useState(STATUS.INPUT);
72− const [errors, addError] = useSetState();
69+ // const [errors, addError] = useSetState();
7370
7471 const isDone = txStatus === STATUS.SUCCESS;
7572 useEffect(() => {
@@ -119,13 +116,10 @@ const useInviter = sendInvites => {
119116 };
120117 }
121118
122− console.log('b');
123119 // NB(shrugs) - must be processed in serial because main thread, etc
124120 let signedInvites = [];
125121 let errorCount = 0;
126122 for (let i = 0; i < numInvites; i++) {
127− console.log(`c: ${i}`);
128− const name = nameForEmailField(i);
129123 setProgress(x => x + 1);
130124 try {
131125 const planet = planets[i];
@@ -257,17 +251,13 @@ const InviteMail = () => {
257251 const [count, setCount] = useState(0);
258252 const canInput = status === STATUS.INPUT;
259253 const isSending = txStatus === STATUS.SENDING || status === STATUS.SENDING;
260− const isFailed = status === STATUS.FAILURE || txStatus === STATUS.FAILURE;
261254 const isDone = status === STATUS.SUCCESS;
262255 const onSubmit = useCallback(
263256 async values => {
264− console.log('GENERATING');
265257 const emailCount = values.emails.length;
266− console.log(values);
267258 setCount(emailCount);
268259 setStatus(STATUS.SENDING);
269260 const errors = await generateInvites(emailCount);
270− console.log(errors);
271261 if (errors) {
272262 setStatus(STATUS.FAILED);
273263 return errors;
@@ -279,8 +269,6 @@ const InviteMail = () => {
279269 useEffect(() => {
280270 async function processInvites() {
281271 if (invites.length !== 0 && txStatus === STATUS.SUCCESS) {
282− console.log(JSON.stringify(invites));
283− console.log('a');
284272 await timeout(500);
285273
286274 resetInvites();
@@ -366,14 +354,7 @@ const InviteMail = () => {
366354};
367355
368356const InviteUrl = () => {
369− const {
370− txStatus,
371− errors,
372− needFunds,
373− invites,
374− generateInvites,
375− resetInvites,
376− } = useInviter();
357+ const { txStatus, needFunds, invites, generateInvites } = useInviter();
377358
378359 const [error, setError] = useState();
379360
@@ -417,9 +398,9 @@ const InviteUrl = () => {
417398 Generating Invite URL
418399 </Grid.Item>
419400 );
401+ default:
402+ return null;
420403 }
421−
422− return null;
423404 };
424405
425406 const url = `https://bridge.urbit.org/#${get(invites, '[0].ticket', '')}`;
src/views/Invite/InviteEmail.js+2−2
@@ -66,7 +66,7 @@ import timeout from 'lib/timeout';
6666const INITIAL_VALUES = { emails: [''] };
6767
6868const GAS_LIMIT = GAS_LIMITS.GIFT_PLANET;
69−const HAS_RECEIVED_TEXT = 'This email has already received an invite.';
69+// const HAS_RECEIVED_TEXT = 'This email has already received an invite.';
7070
7171const STATUS = {
7272 INPUT: 'INPUT',
@@ -110,7 +110,7 @@ export default function InviteEmail() {
110110 const { syncInvites, getInvites } = usePointCache();
111111 const { pointCursor } = usePointCursor();
112112 const point = need.point(pointCursor);
113− const { getHasReceived, sendMail } = useMailer();
113+ const { sendMail } = useMailer();
114114 const { gasPrice } = useGasPrice();
115115
116116 const cachedEmails = useRef({});
src/views/Party/ShowParty.js+9−6
@@ -1,5 +1,5 @@
11import React, { useMemo, useEffect, useCallback, useState } from 'react';
2−import { Grid, Flex, Input } from 'indigo-react';
2+import { Grid, Flex } from 'indigo-react';
33import * as ob from 'urbit-ob';
44import { Just } from 'folktale/maybe';
55import cn from 'classnames';
@@ -53,10 +53,13 @@ function PartyList({ points, className }) {
5353 points.map(syncInvites);
5454 }, [points, syncInvites]);
5555
56− const handleChange = useCallback(e => {
57− setQuery(e.target.value);
58− e.preventDefault();
59− });
56+ const handleChange = useCallback(
57+ e => {
58+ setQuery(e.target.value);
59+ e.preventDefault();
60+ },
61+ [setQuery]
62+ );
6063
6164 const visiblePoints = useMemo(
6265 () =>
@@ -92,7 +95,7 @@ function PartyList({ points, className }) {
9295}
9396
9497export default function ShowParty() {
95− const { pop, push, names } = useLocalRouter();
98+ const { pop } = useLocalRouter();
9699
97100 const { pointCursor } = usePointCursor();
98101 const point = need.point(pointCursor);
src/views/Point.js+1−2
@@ -1,5 +1,5 @@
11import React, { useCallback, useState } from 'react';
2−import { Just, Nothing } from 'folktale/maybe';
2+import { Just } from 'folktale/maybe';
33import { Grid, Flex } from 'indigo-react';
44import { azimuth } from 'azimuth-js';
55
@@ -15,7 +15,6 @@ import { matchBlinky } from 'components/Blinky';
1515import DownloadSigilButton from 'components/DownloadSigilButton';
1616import BarGraph from 'components/BarGraph';
1717import Chip from 'components/Chip';
18−import MaybeSigil from 'components/MaybeSigil';
1918import InviteSigilList from 'components/InviteSigilList';
2019
2120import * as need from 'lib/need';
src/views/Points.js+1−1
@@ -1,6 +1,6 @@
11import React, { useCallback, useEffect, useMemo } from 'react';
22import { Just, Nothing } from 'folktale/maybe';
3−import { Grid, H5, H1, HelpText, LinkButton, Flex } from 'indigo-react';
3+import { Grid, H5, HelpText, LinkButton, Flex } from 'indigo-react';
44import { get } from 'lodash';
55
66import { useHistory } from 'store/history';