aee35bb · bridge · git.iko.soy

src/Bridge.js+1−1

compare with master

unifiedsplit

@@ -25,7 +25,7 @@ const kInitialRoutes = kIsStubbed

25 { name: ROUTE_NAMES.LANDING },

26 { name: ROUTE_NAMES.NETWORK },

27 { name: ROUTE_NAMES.WALLET },

28− { name: ROUTE_NAMES.SHIPS },

28+ { name: ROUTE_NAMES.POINTS },

29 ]

30 : [{ name: ROUTE_NAMES.LANDING }];

31

src/components/old/RenderedPoint.js+3−3

@@ -25,7 +25,7 @@ const RenderedPoint = props => {

25 className="clickable"

26 onClick={() => {

27 setPointCursor(Maybe.Just(point));

28− routeHandler(ROUTE_NAMES.SHIP);

28+ routeHandler(ROUTE_NAMES.POINT);

29 }}>

30 {sigil}

31 </div>

@@ -34,7 +34,7 @@ const RenderedPoint = props => {

34 className="clickable"

35 onClick={() => {

36 setPointCursor(Maybe.Just(point));

37− routeHandler(ROUTE_NAMES.SHIP);

37+ routeHandler(ROUTE_NAMES.POINT);

38 }}>

39 <code>{name}</code>

40 </div>

@@ -45,7 +45,7 @@ const RenderedPoint = props => {

45 prop-size={'sm'}

46 onClick={() => {

47 setPointCursor(Maybe.Just(point));

48− routeHandler(ROUTE_NAMES.SHIP);

48+ routeHandler(ROUTE_NAMES.POINT);

49 }}>

50 {'Details →'}

51 </Button>

src/lib/routeNames.js+3−3

@@ -18,9 +18,9 @@ export const ROUTE_NAMES = {

18 TREZOR: Symbol('TREZOR'),

19 PRIVATE_KEY: Symbol('PRIVATE_KEY'),

20 KEYSTORE: Symbol('KEYSTORE'),

21− VIEW_SHIP: Symbol('VIEW_SHIP'),

21+ VIEW_POINT: Symbol('VIEW_POINT'),

22− SHIPS: Symbol('SHIPS'),

22+ POINTS: Symbol('POINTS'),

23− SHIP: Symbol('SHIP'),

23+ POINT: Symbol('POINT'),

24 SET_MANAGEMENT_PROXY: Symbol('SET_MANAGEMENT_PROXY'),

25 SET_SPAWN_PROXY: Symbol('SET_SPAWN_PROXY'),

26 SET_TRANSFER_PROXY: Symbol('SET_TRANSFER_PROXY'),

src/lib/router.js+6−6

@@ -46,7 +46,7 @@ const ROUTES = {

46 [ROUTE_NAMES.CANCEL_TRANSFER]: CancelTransfer,

47 [ROUTE_NAMES.NETWORK]: Network,

48 [ROUTE_NAMES.WALLET]: Wallet,

49− [ROUTE_NAMES.VIEW_SHIP]: ViewPoint,

49+ [ROUTE_NAMES.VIEW_POINT]: ViewPoint,

50 [ROUTE_NAMES.MNEMONIC]: Mnemonic,

51 [ROUTE_NAMES.TICKET]: Ticket,

52 [ROUTE_NAMES.SHARDS]: Shards,

@@ -54,8 +54,8 @@ const ROUTES = {

54 [ROUTE_NAMES.TREZOR]: Trezor,

55 [ROUTE_NAMES.PRIVATE_KEY]: PrivateKey,

56 [ROUTE_NAMES.KEYSTORE]: Keystore,

57− [ROUTE_NAMES.SHIPS]: Points,

57+ [ROUTE_NAMES.POINTS]: Points,

58− [ROUTE_NAMES.SHIP]: Point,

58+ [ROUTE_NAMES.POINT]: Point,

59 [ROUTE_NAMES.SET_MANAGEMENT_PROXY]: SetManagementProxy,

60 [ROUTE_NAMES.SET_SPAWN_PROXY]: SetSpawnProxy,

61 [ROUTE_NAMES.SET_TRANSFER_PROXY]: SetTransferProxy,

@@ -107,11 +107,11 @@ export const getRouteBreadcrumb = ({

107 return 'Private Key';

108 case ROUTE_NAMES.KEYSTORE:

109 return 'Keystore File';

110− case ROUTE_NAMES.SHIPS:

110+ case ROUTE_NAMES.POINTS:

111 return 'Points';

112− case ROUTE_NAMES.VIEW_SHIP:

112+ case ROUTE_NAMES.VIEW_POINT:

113 return 'View';

114− case ROUTE_NAMES.SHIP:

114+ case ROUTE_NAMES.POINT:

115 return ob.patp(need.pointCursor(pointCursor));

116 case ROUTE_NAMES.SET_TRANSFER_PROXY:

117 case ROUTE_NAMES.SET_MANAGEMENT_PROXY:

src/views/Keystore.js+1−1

@@ -152,7 +152,7 @@ class Keystore extends React.Component {

152 className={'mt-10'}

153 prop-size={'wide lg'}

154 disabled={Nothing.hasInstance(wallet)}

155− onClick={() => history.popAndPush(ROUTE_NAMES.SHIPS)}>

155+ onClick={() => history.popAndPush(ROUTE_NAMES.POINTS)}>

156 {'Continue →'}

157 </Button>

158 </View>

src/views/Landing.js+1−1

@@ -34,7 +34,7 @@ function Landing(props) {

34 here. You'll need either your Urbit ticket or a keypair.

35 </P>

36

37− <ForwardButton onClick={() => history.push(ROUTE_NAMES.VIEW_SHIP)}>

37+ <ForwardButton onClick={() => history.push(ROUTE_NAMES.VIEW_POINT)}>

38 View a point

39 </ForwardButton>

40 <P>{'View an Azimuth point without signing into a wallet.'}</P>

src/views/Ledger.js+1−1

@@ -206,7 +206,7 @@ class Ledger extends React.Component {

206 className={'mt-8'}

207 prop-size={'wide lg'}

208 disabled={Maybe.Nothing.hasInstance(wallet)}

209− onClick={() => history.popAndPush(ROUTE_NAMES.SHIPS)}>

209+ onClick={() => history.popAndPush(ROUTE_NAMES.POINTS)}>

210 {'Continue →'}

211 </Button>

212 </View>

src/views/Mnemonic.js+1−1

@@ -66,7 +66,7 @@ export default function Mnemonic() {

66

67 <ForwardButton

68 disabled={Nothing.hasInstance(wallet)}

69− onClick={() => history.popAndPush(ROUTE_NAMES.SHIPS)}>

69+ onClick={() => history.popAndPush(ROUTE_NAMES.POINTS)}>

70 Continue

71 </ForwardButton>

72 </View>

src/views/Points.js+1−1

@@ -104,7 +104,7 @@ class Points extends React.Component {

104 <Button

105 prop-type={'link'}

106 prop-size={'md'}

107− onClick={() => history.push(ROUTE_NAMES.VIEW_SHIP)}>

107+ onClick={() => history.push(ROUTE_NAMES.VIEW_POINT)}>

108 {'View a point →'}

109 </Button>

110 <P>{'View a point on Azimuth.'}</P>

src/views/PrivateKey.js+1−1

@@ -70,7 +70,7 @@ class PrivateKey extends React.Component {

70 className={'mt-10'}

71 prop-size={'wide lg'}

72 disabled={Maybe.Nothing.hasInstance(wallet)}

73− onClick={() => history.popAndPush(ROUTE_NAMES.SHIPS)}>

73+ onClick={() => history.popAndPush(ROUTE_NAMES.POINTS)}>

74 {'Continue →'}

75 </Button>

76 </View>

src/views/Shards.js+1−1

@@ -198,7 +198,7 @@ class Shards extends React.Component {

198 className={'mt-4'}

199 prop-size={'xl wide'}

200 disabled={Nothing.hasInstance(wallet)}

201− onClick={() => history.popAndPush(ROUTE_NAMES.SHIPS)}>

201+ onClick={() => history.popAndPush(ROUTE_NAMES.POINTS)}>

202 {'Continue →'}

203 </Button>

204 </View>

src/views/Ticket.js+1−1

@@ -140,7 +140,7 @@ class Ticket extends React.Component {

140 className={'mt-4'}

141 prop-size={'xl wide'}

142 disabled={Nothing.hasInstance(wallet)}

143− onClick={() => history.popAndPush(ROUTE_NAMES.SHIPS)}>

143+ onClick={() => history.popAndPush(ROUTE_NAMES.POINTS)}>

144 {'Continue →'}

145 </Button>

146 </View>

src/views/Trezor.js+1−1

@@ -132,7 +132,7 @@ class Trezor extends React.Component {

132 className={'mt-8'}

133 prop-size={'wide lg'}

134 disabled={Maybe.Nothing.hasInstance(wallet)}

135− onClick={() => history.popAndPush(ROUTE_NAMES.SHIPS)}>

135+ onClick={() => history.popAndPush(ROUTE_NAMES.POINTS)}>

136 {'Continue →'}

137 </Button>

138 </View>

src/views/ViewPoint.js+1−1

@@ -52,7 +52,7 @@ export default function ViewPoint() {

52 onClick={() => {

53 setPointCursor(Maybe.Just(parseInt(ob.patp2dec(pointName), 10)));

54 // ^ pointCursor expects native number type, not string

55− history.popAndPush(ROUTE_NAMES.SHIP);

55+ history.popAndPush(ROUTE_NAMES.POINT);

56 }}

57 solid>

58 Continue