git.iko.soy/bridge
on master help sign in
Merge branch 'master' into linear-release
commit1074b35ea6302064db9aa1400da8d8ea70a1a46e authorFang <git@fang.io> dateThu 19 Dec 2019, 18:02 (7 years ago) parente0bf2e07a1be54
6 files changed+23−18
compare with master
unifiedsplit
package.json+1−1 src/lib/inviteMail.js+1−1 src/lib/tank.js+1−1 src/views/Party/PartySetPoolSize.js+18−1 src/views/Points.js−12 src/views/Senate.js+2−2
package.json+1−1
@@ -1,6 +1,6 @@
11{
22 "name": "bridge",
3− "version": "2.1.0",
3+ "version": "2.1.3",
44 "description": "An application for interacting with Azimuth",
55 "repository": {
66 "type": "git",
src/lib/inviteMail.js+1−1
@@ -2,7 +2,7 @@
22// did not succeed", you might need to visit localhost:3001 or whatever
33// explicitly and tell your browser that's safe to access.
44// https://stackoverflow.com/a/53011185/1334324
5−const baseUrl = 'https://localhost:3002';
5+const baseUrl = 'https://onboarding-emails.urbit.org:3002';
66
77function sendRequest(where, what) {
88 return new Promise((resolve, reject) => {
src/lib/tank.js+1−1
@@ -8,7 +8,7 @@ import { RETRY_OPTIONS, waitForTransactionConfirm } from './txn';
88// did not succeed", you might need to visit localhost:3001 or whatever
99// explicitly and tell your browser that's safe to access.
1010// https://stackoverflow.com/a/53011185/1334324
11−const baseUrl = 'https://localhost:3001';
11+const baseUrl = 'https://gas-tank.urbit.org:3001';
1212
1313function sendRequest(where, what) {
1414 return new Promise((resolve, reject) => {
src/views/Party/PartySetPoolSize.js+18−1
@@ -13,6 +13,7 @@ import { GAS_LIMITS } from 'lib/constants';
1313import { useLocalRouter } from 'lib/LocalRouter';
1414import useCurrentPermissions from 'lib/useCurrentPermissions';
1515import patp2dec from 'lib/patp2dec';
16+import convertToInt from 'lib/convertToInt';
1617
1718import ViewHeader from 'components/ViewHeader';
1819import InlineEthereumTransaction from 'components/InlineEthereumTransaction';
@@ -56,6 +57,15 @@ function useSetPoolSize() {
5657export default function PartySetPoolSize() {
5758 const { pop } = useLocalRouter();
5859 const { contracts } = useNetwork();
60+ const { pointCursor } = usePointCursor();
61+ const { getDetails } = usePointCache();
62+
63+ const _point = need.point(pointCursor);
64+ const _details = need.details(getDetails(_point));
65+ const hasKeysSet =
66+ 0 !== convertToInt(_details.encryptionKey, 16) &&
67+ 0 !== convertToInt(_details.authenticationKey, 16) &&
68+ 0 !== _details.cryptoSuiteVersion;
5969
6070 const _contracts = need.contracts(contracts);
6171
@@ -104,7 +114,14 @@ export default function PartySetPoolSize() {
104114 <CopiableAddress>
105115 {_contracts.delegatedSending.address}
106116 </CopiableAddress>{' '}
107− for invitations to be available.
117+ for invitations to be available for use.
118+ </Grid.Item>
119+ )}
120+
121+ {!hasKeysSet && (
122+ <Grid.Item full as={WarningBox} className="mb4 f6">
123+ Networking keys must be configured for invitations to be available
124+ for use.
108125 </Grid.Item>
109126 )}
110127
src/views/Points.js−12
@@ -218,11 +218,6 @@ export default function Points() {
218218 push,
219219 ]);
220220
221− const goViewPoint = useCallback(() => push(names.VIEW_POINT), [
222− names.VIEW_POINT,
223− push,
224− ]);
225−
226221 const goStarRelease = useCallback(() => push(names.STAR_RELEASE), [
227222 names.STAR_RELEASE,
228223 push,
@@ -368,13 +363,6 @@ export default function Points() {
368363 <Grid.Divider />
369364 </>
370365 )}
371− <Grid.Item
372− full
373− as={ForwardButton}
374− detail="View an ID"
375− onClick={goViewPoint}>
376− View a point
377− </Grid.Item>
378366 </Grid>
379367 </Footer>
380368 </Grid>
src/views/Senate.js+2−2
@@ -90,7 +90,7 @@ export default function Senate() {
9090 let polls = {};
9191 for (let doc of proposals) {
9292 let poll = await azimuth.polls.getDocumentPoll(_contracts, doc);
93− poll.endTime = polls.start + poll.duration;
93+ poll.endTime = convertToInt(poll.start) + convertToInt(poll.duration);
9494 poll.hasVoted = await azimuth.polls.hasVotedOnDocumentPoll(
9595 _contracts,
9696 _point,
@@ -140,7 +140,7 @@ export default function Senate() {
140140 <a
141141 target="_blank"
142142 rel="noopener noreferrer"
143− href={`https://github.com/urbit/azimuth/blob/master/proposals/${doc}.txt`}>
143+ href={`https://raw.githubusercontent.com/urbit/azimuth/master/proposals/${doc}.txt`}>
144144 <code>{doc}</code>↗
145145 </a>
146146 </Grid.Item>