on master help sign in
Merge branch 'master' into gen-keyfile-improvements
42d9c64Chris Johnson
CHANGELOG+17−1
@@ -1,9 +1,25 @@
1
1
2# Changelog
2# Changelog
3
3
4+- 1.2.1 (2019-03-21)
5+ This release fixes an issue with the spawning of child points.
6+
7+ * Correctly enable the spawn recipient field based on child availability (#83)
8+
9+- 1.2.0 (2019-03-20)
10+ This release fixes a number of issues, makes various improvements to the user interface, and prepares the Bridge codebase for future work.
11+
12+ * Ensure compatibility with latest Trezor firmware (#76)
13+ * Don't wait for transactions to confirm before showing transaction hash (#62)
14+ * Prevent galaxies from spawning planets, as per the contracts (#22)
15+ * Remove set transfer proxy action (was redundant with transfer) (#69)
16+ * Various smaller UX improvements (#66, #70, #72, #78)
17+ * Various copy fixes (#39, #63)
18+ * Various code fixes and cleanup (#61, #66, #77)
19+
4- 1.1.0 (2019-02-01)
20- 1.1.0 (2019-02-01)
5 This release adds more authentication options and fixes bugs:
21 This release adds more authentication options and fixes bugs:
6−
22+
7 * Add options for authenticating with private keys, keystore files
23 * Add options for authenticating with private keys, keystore files
8 * Fix Ledger EIP-155 issue
24 * Fix Ledger EIP-155 issue
9 * Styling and small bug fixes
25 * Styling and small bug fixes
package.json+2−2
@@ -1,6 +1,6 @@
1{
1{
2 "name": "bridge",
2 "name": "bridge",
3− "version": "1.1.0",
3+ "version": "1.2.1",
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",
@@ -55,7 +55,7 @@
55 "checksum": "find build -exec shasum -a256 {} ';' > checksums.txt",
55 "checksum": "find build -exec shasum -a256 {} ';' > checksums.txt",
56 "tar": "tar -czvf bridge-$npm_package_version.tar.gz README.md bridge-https.py checksums.txt build",
56 "tar": "tar -czvf bridge-$npm_package_version.tar.gz README.md bridge-https.py checksums.txt build",
57 "zip": "zip -r bridge-$npm_package_version.zip README.md bridge-https.py checksums.txt build",
57 "zip": "zip -r bridge-$npm_package_version.zip README.md bridge-https.py checksums.txt build",
58− "release": "npm run build && npm run checksum && npm run zip",
58+ "release": "npm install && npm run build && npm run checksum && npm run zip",
59 "pilot:ganache": "ganache-cli -m 'benefit crew supreme gesture quantum web media hazard theory mercy wing kitten' > /dev/null &",
59 "pilot:ganache": "ganache-cli -m 'benefit crew supreme gesture quantum web media hazard theory mercy wing kitten' > /dev/null &",
60 "pilot:deploy": "cd node_modules/azimuth-solidity && truffle deploy",
60 "pilot:deploy": "cd node_modules/azimuth-solidity && truffle deploy",
61 "pilot:setup": "npm run pilot:ganache && npm run pilot:deploy",
61 "pilot:setup": "npm run pilot:ganache && npm run pilot:deploy",
src/components/PointList.js+3−4
@@ -4,12 +4,12 @@ import { Row } from './Base'
4import RenderedPoint from './RenderedPoint'
4import RenderedPoint from './RenderedPoint'
5
5
6const PointList = props => {
6const PointList = props => {
7− const { setPointCursor, routeHandler, points } = props
7+ const { setPointCursor, routeHandler, points, loading } = props
8 const chunks = lodash.chunk(points, 3)
8 const chunks = lodash.chunk(points, 3)
9
9
10 return (
10 return (
11 points.length === 0
11 points.length === 0
12− ? <p>{'No points to display'}</p>
12+ ? <p>{loading ? 'Loading...' : 'No points to display' }</p>
13 : lodash.map(chunks, (chunk, idx) =>
13 : lodash.map(chunks, (chunk, idx) =>
14 <Row key={ `render-row-${idx}` }>
14 <Row key={ `render-row-${idx}` }>
15 {
15 {
@@ -23,8 +23,7 @@ const PointList = props => {
23 }
23 }
24 </Row>
24 </Row>
25 )
25 )
26−
27−)
26+ )
28}
27}
29
28
30export default PointList
29export default PointList
src/views/IssueChild.js+1−1
@@ -442,7 +442,7 @@ class IssueChild extends React.Component {
442 prop-format='innerLabel'
442 prop-format='innerLabel'
443 placeholder={ `e.g. 0x84295d5e054d8cff5a22428b195f5a1615bd644f` }
443 placeholder={ `e.g. 0x84295d5e054d8cff5a22428b195f5a1615bd644f` }
444 value={ state.receivingAddress }
444 value={ state.receivingAddress }
445− disabled={ !state.available }
445+ disabled={ Nothing.hasInstance(state.isAvailable) || !state.isAvailable.value }
446 onChange={ v => this.handleAddressInput(v) }>
446 onChange={ v => this.handleAddressInput(v) }>
447 <InnerLabel>{ 'Receiving Address' }</InnerLabel>
447 <InnerLabel>{ 'Receiving Address' }</InnerLabel>
448 <ShowBlockie className={'mt-1'} address={state.receivingAddress} />
448 <ShowBlockie className={'mt-1'} address={state.receivingAddress} />
src/views/Points.js+6−3
@@ -27,7 +27,8 @@ class Points extends React.Component {
27 managing: [],
27 managing: [],
28 voting: [],
28 voting: [],
29 spawning: [],
29 spawning: [],
30− eclipticOwner: false
30+ eclipticOwner: false,
31+ loading: true
31 }
32 }
32 }
33 }
33
34
@@ -66,7 +67,8 @@ class Points extends React.Component {
66 managing,
67 managing,
67 voting,
68 voting,
68 spawning,
69 spawning,
69− eclipticOwner
70+ eclipticOwner,
71+ loading: false
70 })
72 })
71
73
72 this.cachePoints(ctrcs, addToPointCache, points)
74 this.cachePoints(ctrcs, addToPointCache, points)
@@ -84,7 +86,7 @@ class Points extends React.Component {
84 const { setPointCursor, pushRoute } = this.props
86 const { setPointCursor, pushRoute } = this.props
85 const { pointCache } = this.props
87 const { pointCache } = this.props
86
88
87− const { points, incoming, managing, voting, spawning } = this.state
89+ const { points, incoming, managing, voting, spawning, loading } = this.state
88 const { eclipticOwner } = this.state
90 const { eclipticOwner } = this.state
89
91
90 const lookupPointButton =
92 const lookupPointButton =
@@ -227,6 +229,7 @@ class Points extends React.Component {
227 setPointCursor={ setPointCursor }
229 setPointCursor={ setPointCursor }
228 routeHandler={ pushRoute }
230 routeHandler={ pushRoute }
229 points={ points }
231 points={ points }
232+ loading={ loading }
230 />
233 />
231
234
232 { managingPoints }
235 { managingPoints }