git.iko.soy/bridge
on master help sign in
Merge branch 'master' into gen-keyfile-improvements
commit42d9c645447afb3d614709be790a9ee3fd2a9134 authorChris Johnson <chris@cjohnson.io> dateFri 22 Mar 2019, 15:13 (8 years ago) parent23dbfee24800d0
5 files changed+29−11
compare with master
unifiedsplit
CHANGELOG+17−1 package.json+2−2 src/components/PointList.js+3−4 src/views/IssueChild.js+1−1 src/views/Points.js+6−3
CHANGELOG+17−1
@@ -1,9 +1,25 @@
11
22# Changelog
33
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+
420- 1.1.0 (2019-02-01)
521 This release adds more authentication options and fixes bugs:
6−
22+
723 * Add options for authenticating with private keys, keystore files
824 * Fix Ledger EIP-155 issue
925 * Styling and small bug fixes
package.json+2−2
@@ -1,6 +1,6 @@
11{
22 "name": "bridge",
3− "version": "1.1.0",
3+ "version": "1.2.1",
44 "description": "An application for interacting with Azimuth",
55 "repository": {
66 "type": "git",
@@ -55,7 +55,7 @@
5555 "checksum": "find build -exec shasum -a256 {} ';' > checksums.txt",
5656 "tar": "tar -czvf bridge-$npm_package_version.tar.gz README.md bridge-https.py checksums.txt build",
5757 "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",
5959 "pilot:ganache": "ganache-cli -m 'benefit crew supreme gesture quantum web media hazard theory mercy wing kitten' > /dev/null &",
6060 "pilot:deploy": "cd node_modules/azimuth-solidity && truffle deploy",
6161 "pilot:setup": "npm run pilot:ganache && npm run pilot:deploy",
src/components/PointList.js+3−4
@@ -4,12 +4,12 @@ import { Row } from './Base'
44import RenderedPoint from './RenderedPoint'
55
66const PointList = props => {
7− const { setPointCursor, routeHandler, points } = props
7+ const { setPointCursor, routeHandler, points, loading } = props
88 const chunks = lodash.chunk(points, 3)
99
1010 return (
1111 points.length === 0
12− ? <p>{'No points to display'}</p>
12+ ? <p>{loading ? 'Loading...' : 'No points to display' }</p>
1313 : lodash.map(chunks, (chunk, idx) =>
1414 <Row key={ `render-row-${idx}` }>
1515 {
@@ -23,8 +23,7 @@ const PointList = props => {
2323 }
2424 </Row>
2525 )
26−
27−)
26+ )
2827}
2928
3029export default PointList
src/views/IssueChild.js+1−1
@@ -442,7 +442,7 @@ class IssueChild extends React.Component {
442442 prop-format='innerLabel'
443443 placeholder={ `e.g. 0x84295d5e054d8cff5a22428b195f5a1615bd644f` }
444444 value={ state.receivingAddress }
445− disabled={ !state.available }
445+ disabled={ Nothing.hasInstance(state.isAvailable) || !state.isAvailable.value }
446446 onChange={ v => this.handleAddressInput(v) }>
447447 <InnerLabel>{ 'Receiving Address' }</InnerLabel>
448448 <ShowBlockie className={'mt-1'} address={state.receivingAddress} />
src/views/Points.js+6−3
@@ -27,7 +27,8 @@ class Points extends React.Component {
2727 managing: [],
2828 voting: [],
2929 spawning: [],
30− eclipticOwner: false
30+ eclipticOwner: false,
31+ loading: true
3132 }
3233 }
3334
@@ -66,7 +67,8 @@ class Points extends React.Component {
6667 managing,
6768 voting,
6869 spawning,
69− eclipticOwner
70+ eclipticOwner,
71+ loading: false
7072 })
7173
7274 this.cachePoints(ctrcs, addToPointCache, points)
@@ -84,7 +86,7 @@ class Points extends React.Component {
8486 const { setPointCursor, pushRoute } = this.props
8587 const { pointCache } = this.props
8688
87− const { points, incoming, managing, voting, spawning } = this.state
89+ const { points, incoming, managing, voting, spawning, loading } = this.state
8890 const { eclipticOwner } = this.state
8991
9092 const lookupPointButton =
@@ -227,6 +229,7 @@ class Points extends React.Component {
227229 setPointCursor={ setPointCursor }
228230 routeHandler={ pushRoute }
229231 points={ points }
232+ loading={ loading }
230233 />
231234
232235 { managingPoints }