on master help sign in
Merge branch 'master' into linear-release
1074b35Fang
package.json+1−1
@@ -1,6 +1,6 @@
1{
1{
2 "name": "bridge",
2 "name": "bridge",
3− "version": "2.1.0",
3+ "version": "2.1.3",
4 "description": "An application for interacting with Azimuth",
4 "description": "An application for interacting with Azimuth",
5 "repository": {
5 "repository": {
6 "type": "git",
6 "type": "git",
src/lib/inviteMail.js+1−1
@@ -2,7 +2,7 @@
2// did not succeed", you might need to visit localhost:3001 or whatever
2// did not succeed", you might need to visit localhost:3001 or whatever
3// explicitly and tell your browser that's safe to access.
3// explicitly and tell your browser that's safe to access.
4// https://stackoverflow.com/a/53011185/1334324
4// https://stackoverflow.com/a/53011185/1334324
5−const baseUrl = 'https://localhost:3002';
5+const baseUrl = 'https://onboarding-emails.urbit.org:3002';
6
6
7function sendRequest(where, what) {
7function sendRequest(where, what) {
8 return new Promise((resolve, reject) => {
8 return new Promise((resolve, reject) => {
src/lib/tank.js+1−1
@@ -8,7 +8,7 @@ import { RETRY_OPTIONS, waitForTransactionConfirm } from './txn';
8// did not succeed", you might need to visit localhost:3001 or whatever
8// did not succeed", you might need to visit localhost:3001 or whatever
9// explicitly and tell your browser that's safe to access.
9// explicitly and tell your browser that's safe to access.
10// https://stackoverflow.com/a/53011185/1334324
10// https://stackoverflow.com/a/53011185/1334324
11−const baseUrl = 'https://localhost:3001';
11+const baseUrl = 'https://gas-tank.urbit.org:3001';
12
12
13function sendRequest(where, what) {
13function sendRequest(where, what) {
14 return new Promise((resolve, reject) => {
14 return new Promise((resolve, reject) => {
src/views/Party/PartySetPoolSize.js+18−1
@@ -13,6 +13,7 @@ import { GAS_LIMITS } from 'lib/constants';
13import { useLocalRouter } from 'lib/LocalRouter';
13import { useLocalRouter } from 'lib/LocalRouter';
14import useCurrentPermissions from 'lib/useCurrentPermissions';
14import useCurrentPermissions from 'lib/useCurrentPermissions';
15import patp2dec from 'lib/patp2dec';
15import patp2dec from 'lib/patp2dec';
16+import convertToInt from 'lib/convertToInt';
16
17
17import ViewHeader from 'components/ViewHeader';
18import ViewHeader from 'components/ViewHeader';
18import InlineEthereumTransaction from 'components/InlineEthereumTransaction';
19import InlineEthereumTransaction from 'components/InlineEthereumTransaction';
@@ -56,6 +57,15 @@ function useSetPoolSize() {
56export default function PartySetPoolSize() {
57export default function PartySetPoolSize() {
57 const { pop } = useLocalRouter();
58 const { pop } = useLocalRouter();
58 const { contracts } = useNetwork();
59 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;
59
69
60 const _contracts = need.contracts(contracts);
70 const _contracts = need.contracts(contracts);
61
71
@@ -104,7 +114,14 @@ export default function PartySetPoolSize() {
104 <CopiableAddress>
114 <CopiableAddress>
105 {_contracts.delegatedSending.address}
115 {_contracts.delegatedSending.address}
106 </CopiableAddress>{' '}
116 </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.
108 </Grid.Item>
125 </Grid.Item>
109 )}
126 )}
110
127
src/views/Points.js−12
@@ -218,11 +218,6 @@ export default function Points() {
218 push,
218 push,
219 ]);
219 ]);
220
220
221− const goViewPoint = useCallback(() => push(names.VIEW_POINT), [
222− names.VIEW_POINT,
223− push,
224− ]);
225−
226 const goStarRelease = useCallback(() => push(names.STAR_RELEASE), [
221 const goStarRelease = useCallback(() => push(names.STAR_RELEASE), [
227 names.STAR_RELEASE,
222 names.STAR_RELEASE,
228 push,
223 push,
@@ -368,13 +363,6 @@ export default function Points() {
368 <Grid.Divider />
363 <Grid.Divider />
369 </>
364 </>
370 )}
365 )}
371− <Grid.Item
372− full
373− as={ForwardButton}
374− detail="View an ID"
375− onClick={goViewPoint}>
376− View a point
377− </Grid.Item>
378 </Grid>
366 </Grid>
379 </Footer>
367 </Footer>
380 </Grid>
368 </Grid>
src/views/Senate.js+2−2
@@ -90,7 +90,7 @@ export default function Senate() {
90 let polls = {};
90 let polls = {};
91 for (let doc of proposals) {
91 for (let doc of proposals) {
92 let poll = await azimuth.polls.getDocumentPoll(_contracts, doc);
92 let poll = await azimuth.polls.getDocumentPoll(_contracts, doc);
93− poll.endTime = polls.start + poll.duration;
93+ poll.endTime = convertToInt(poll.start) + convertToInt(poll.duration);
94 poll.hasVoted = await azimuth.polls.hasVotedOnDocumentPoll(
94 poll.hasVoted = await azimuth.polls.hasVotedOnDocumentPoll(
95 _contracts,
95 _contracts,
96 _point,
96 _point,
@@ -140,7 +140,7 @@ export default function Senate() {
140 <a
140 <a
141 target="_blank"
141 target="_blank"
142 rel="noopener noreferrer"
142 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`}>
144 <code>{doc}</code>↗
144 <code>{doc}</code>↗
145 </a>
145 </a>
146 </Grid.Item>
146 </Grid.Item>