bd2a4fd · bridge · git.iko.soy

src/components/NetworkingKeys.js+8−2

compare with master

unifiedsplit

@@ -84,8 +84,14 @@ export default function NetworkingKeys({ point }) {

84 details.chain(chainKeyProp('encryptionKey'))

85 )}

86 <Grid.Item full as={Flex} row justify="between" className="mt3">

87+ {renderDetail(

88+ 'Revision',

87− {renderDetail('Revision', details.map(d => d.keyRevisionNumber))}

89+ details.map(d => d.keyRevisionNumber)

90+ )}

91+ {renderDetail(

92+ 'Continuity Era',

88− {renderDetail('Continuity Era', details.map(d => d.continuityNumber))}

93+ details.map(d => d.continuityNumber)

94+ )}

89 {renderDetail(

95 {renderDetail(

90 'Crypto Suite Ver.',

96 'Crypto Suite Ver.',

91 details.map(d => d.cryptoSuiteVersion)

97 details.map(d => d.cryptoSuiteVersion)

src/indigo-react/components/SelectInput.js+4−1

@@ -31,7 +31,10 @@ export default function SelectInput({

31 const ref = useRef();

32

33 // close select on outside clicks

34+ useOnClickOutside(

35+ ref,

34− useOnClickOutside(ref, useCallback(() => setIsOpen(false), [setIsOpen]));

36+ useCallback(() => setIsOpen(false), [setIsOpen])

37+ );

35

38

36 const toggleOpen = useCallback(() => {

39 const toggleOpen = useCallback(() => {

37 input.onFocus();

40 input.onFocus();

src/lib/lib.js+4−1

@@ -27,7 +27,10 @@ const safeToWei = (num, source) => {

27};

28

29const compose = (...fs) =>

30+ fs.reduceRight(

30− fs.reduceRight((pF, nF) => (...args) => nF(pF(...args)), v => v);

31+ (pF, nF) => (...args) => nF(pF(...args)),

32+ v => v

33+ );

31

34

32const allFalse = (...args) => args.every(a => a === false);

35const allFalse = (...args) => args.every(a => a === false);

33

36

src/lib/reticket.js+5−1

@@ -203,7 +203,11 @@ export async function reticketPointBetweenWallets({

203

204 progress(TRANSACTION_PROGRESS.TRANSFERRING);

205

206− await sendAndAwaitAllSerial(web3, txPairs.map(p => p.signed), usedTank);

206+ await sendAndAwaitAllSerial(

207+ web3,

208+ txPairs.map(p => p.signed),

209+ usedTank

210+ );

207

211

208 //

212 //

209 // move leftover eth

213 // move leftover eth

src/lib/routeNames.js−1

@@ -5,7 +5,6 @@ export const ROUTE_NAMES = {

5 ACTIVATE: Symbol('ACTIVATE'),

6 INVITE_TRANSACTIONS: Symbol('INVITE_TRANSACTIONS'),

7 INVITES_MANAGE: Symbol('INVITES_MANAGE'),

8− SENATE: Symbol('SENATE'),

9 //

8 //

10 LOGIN: Symbol('LOGIN'),

9 LOGIN: Symbol('LOGIN'),

11 LOGIN_OTHER: Symbol('OTHER'),

10 LOGIN_OTHER: Symbol('OTHER'),

src/lib/txn.js+1−1

@@ -107,8 +107,8 @@ const sendSignedTransaction = (web3, stx, doubtNonceError) => {

107 if (stx instanceof FakeMetamaskTransaction) {

108 eventEmitter = web3.eth.sendTransaction(stx.txnData);

109 } else {

110− eventEmitter = web3.eth.sendSignedTransaction(rawTx);

111 rawTx = hexify(stx.serialize());

110 rawTx = hexify(stx.serialize());

111+ eventEmitter = web3.eth.sendSignedTransaction(rawTx);

112 }

113 return new Promise(async (resolve, reject) => {

114 eventEmitter

src/lib/useLocaHosting.js → src/lib/useLocalHosting.jsrenamed+3−3

@@ -21,9 +21,9 @@ export default function useLocalHosting() {

21 const updateStatus = async point => {

22 const patp = ob.patp(point).slice(1);

23 try {

24+ const { who } = await fetch(

24− const { who } = await fetch(`https://${patp}.${DOMAIN}/who.json`).then(

25+ `https://${patp}.${DOMAIN}/who.json`

25− r => r.json()

26+ ).then(r => r.json());

26− );

27 if (who === patp) {

28 setStatus(STATE.RUNNING);

29 } else {

src/lib/useRouter.js+8−3

@@ -85,9 +85,14 @@ export default function useRouter({

85 setRoutes,

86 initialRoutes,

87 ]);

88− const includes = useCallback(key => _includes(routes.map(r => r.key), key), [

88+ const includes = useCallback(

89+ key =>

90+ _includes(

91+ routes.map(r => r.key),

92+ key

93+ ),

89− routes,

94+ [routes]

90− ]);

95+ );

91 const data = useMemo(() => {

96 const data = useMemo(() => {

92 return get(last(routes), 'data', NULL_DATA);

97 return get(last(routes), 'data', NULL_DATA);

93 }, [routes]);

98 }, [routes]);

src/views/UrbitOS/Home.js+1−1

@@ -22,7 +22,7 @@ import { useLocalRouter } from 'lib/LocalRouter';

22import { useHosting } from 'store/hosting';

23import DownloadKeyfileButton from 'components/DownloadKeyfileButton';

24import useLifecycle from 'lib/useLifecycle';

25−import useLocalHosting from 'lib/useLocaHosting';

25+import useLocalHosting from 'lib/useLocalHosting';

26

27export default function UrbitOSHome({ manualNetworkSeed }) {

28 const { pointCursor } = usePointCursor();