git.iko.soy/bridge
on master help sign in
Switch to stripSigPrefix
b101092Patrick O'Sullivan
src/lib/lib.js−4
compare with master
unifiedsplit
@@ -70,9 +70,6 @@ const randomPatq = len => {
70const patpStringLength = byteLength =>
70const patpStringLength = byteLength =>
71 byteLength * 3 + Math.ceil(byteLength / 2);
71 byteLength * 3 + Math.ceil(byteLength / 2);
72
72
73−const deSiggedString = siggedString =>
74− siggedString.startsWith('~') ? siggedString.slice(1) : siggedString;
75−
76export {
73export {
77 safeFromWei,
74 safeFromWei,
78 safeToWei,
75 safeToWei,
@@ -87,5 +84,4 @@ export {
87 isValidGalaxy,
84 isValidGalaxy,
88 randomPatq,
85 randomPatq,
89 patpStringLength,
86 patpStringLength,
90− deSiggedString,
91};
87};
src/lib/useCheckExpired.ts+2−5
@@ -1,5 +1,5 @@
1+import { stripSigPrefix } from 'form/formatters';
1import expiredPlanetsWithInviteCodes from './expiredPlanetsWithInviteCodes.json';
2import expiredPlanetsWithInviteCodes from './expiredPlanetsWithInviteCodes.json';
2−import { deSiggedString } from './lib';
3
3
4export default function useIsExpired(
4export default function useIsExpired(
5 patp: string | null,
5 patp: string | null,
@@ -8,10 +8,7 @@ export default function useIsExpired(
8 let isExpired = false;
8 let isExpired = false;
9
9
10 if (patp !== null && ticket !== null) {
10 if (patp !== null && ticket !== null) {
11− const ticketPatp = deSiggedString(ticket)?.concat(
11+ const ticketPatp = stripSigPrefix(ticket).concat('-', stripSigPrefix(patp));
12− '-',
13− deSiggedString(patp)
14− );
15
12
16 const expired = Object.keys(expiredPlanetsWithInviteCodes).includes(
13 const expired = Object.keys(expiredPlanetsWithInviteCodes).includes(
17 ticketPatp
14 ticketPatp