git.iko.soy/bridge
on master help sign in
Actually render error messages
510f315Fang
src/views/Invite/InviteEmail.js+22−18
compare with master
unifiedsplit
@@ -322,7 +322,8 @@ export default function InviteEmail() {
322 setStatus(STATUS.SENDING);
322 setStatus(STATUS.SENDING);
323 clearReceipts();
323 clearReceipts();
324
324
325− let errorCount = 0;
325+ let unsentInvites = [];
326+ let orphanedInvites = [];
326 const txAndMailings = inputs.map(async input => {
327 const txAndMailings = inputs.map(async input => {
327 const invite = invites[input.name];
328 const invite = invites[input.name];
328 try {
329 try {
@@ -337,10 +338,7 @@ export default function InviteEmail() {
337 if (!didConfirm) throw new Error();
338 if (!didConfirm) throw new Error();
338 } catch (error) {
339 } catch (error) {
339 console.error(error);
340 console.error(error);
340− errorCount++;
341+ unsentInvites.push(invite);
341− addError({
342− [input.name]: `Transaction Failure for ${invite.email}`,
343− });
344 return;
342 return;
345 }
343 }
346
344
@@ -354,11 +352,7 @@ export default function InviteEmail() {
354 if (!success) throw new Error('Failed to send mail');
352 if (!success) throw new Error('Failed to send mail');
355 } catch (error) {
353 } catch (error) {
356 console.error(error);
354 console.error(error);
357− errorCount++;
355+ orphanedInvites.push(invite);
358− //TODO make sure this actually gets displayed
359− addError({
360− [input.name]: `Mailing Failure for ${invite.email}, please send them this code manually: ${invite.ticket}`,
361− });
362 }
356 }
363
357
364 addReceipt({ [input.name]: true });
358 addReceipt({ [input.name]: true });
@@ -366,13 +360,24 @@ export default function InviteEmail() {
366
360
367 await Promise.all(txAndMailings);
361 await Promise.all(txAndMailings);
368 // if there are any receipt errors, throw a general error
362 // if there are any receipt errors, throw a general error
369− if (errorCount > 0) {
363+ let errorString = '';
364+ if (orphanedInvites.length > 0) {
365+ errorString =
366+ 'Not all invite emails were sent. ' +
367+ 'Please send the following invite codes manually: ' +
368+ orphanedInvites.map(i => `${i.email}: ${i.ticket}`).join(', ') +
369+ '. ';
370+ }
371+ if (unsentInvites.length > 0) {
372+ errorString =
373+ errorString +
374+ 'Not all invites were created. ' +
375+ 'Did not send invites for: ' +
376+ unsentInvites.map(i => i.email).join(', ') +
377+ '.';
378+ }
379+ if (errorString !== '') {
370− throw new Error(
380+ throw new Error(errorString);
371− `There ${pluralize(errorCount, 'was', 'were')} ${pluralize(
372− errorCount,
373− 'error'
374− )} while sending transactions.`
375− );
376 }
381 }
377 }, [
382 }, [
378 web3,
383 web3,
@@ -382,7 +387,6 @@ export default function InviteEmail() {
382 invites,
387 invites,
383 point,
388 point,
384 wallet,
389 wallet,
385− addError,
386 sendMail,
390 sendMail,
387 ]);
391 ]);
388
392