git.iko.soy/bridge
on master help sign in
WIP un-compiling new PaperRenderer integration
commit82ad0d7d1d66d12ca7c587dddd7947fd3e936896 authorFang <git@fang.io> dateWed 4 Sep 2019, 06:48 (7 years ago) parent2059fcc
7 files changed+80−105
compare with master
unifiedsplit
package-lock.json+58−85 package.json+2−1 src/components/PaperBuilder.js+14 src/components/PaperRenderer.js−13 src/views/Activate/PassportDownload.js+2−2 src/views/Admin/AdminRedownload.js+2−2 src/views/Admin/Reticket/ReticketConfirm.js+2−2
package-lock.json+58−85
@@ -2167,32 +2167,33 @@
21672167 "integrity": "sha512-uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg==",
21682168 "dev": true
21692169 },
2170− "PaperCollateralRenderer": {
2171− "version": "github:urbit/PaperCollateralRenderer#8478aaf397e12769171b7b14332c47e4457e1d46",
2172− "from": "github:urbit/PaperCollateralRenderer#rc-immediate",
2170+ "PaperRenderer": {
2171+ "version": "github:urbit/PaperRenderer#4a5dd07e3ff2d225d6a955ef6a2ed822c7369422",
2172+ "from": "github:urbit/PaperRenderer#rc-2.0",
21732173 "requires": {
2174− "babel-polyfill": "^6.26.0",
2175− "dotenv": "^8.0.0",
2176− "flat": "^4.1.0",
2177− "lodash": "^4.17.10",
2178− "qr-image": "^3.2.0",
2179− "urbit-ob": "^1.4.4",
2180− "urbit-sigil-js": "^1.3.5"
2174+ "lodash.get": "^4.4.2",
2175+ "prop-types": "^15.7.2",
2176+ "urbit-sigil-js": "^1.3.7"
21812177 },
21822178 "dependencies": {
2183− "dotenv": {
2184− "version": "8.0.0",
2185− "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.0.0.tgz",
2186− "integrity": "sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg=="
2179+ "prop-types": {
2180+ "version": "15.7.2",
2181+ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
2182+ "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
2183+ "requires": {
2184+ "loose-envify": "^1.4.0",
2185+ "object-assign": "^4.1.1",
2186+ "react-is": "^16.8.1"
2187+ }
21872188 },
2188− "urbit-ob": {
2189− "version": "1.4.4",
2190− "resolved": "https://registry.npmjs.org/urbit-ob/-/urbit-ob-1.4.4.tgz",
2191− "integrity": "sha512-vWacJsymaUjEXjoibAWE996x9SjlYi+2EIjzh+0chAMwu69wG+6+ChMmBr0jliz20LGvIEgAazCtJURwAeYkhQ==",
2189+ "urbit-sigil-js": {
2190+ "version": "1.3.7",
2191+ "resolved": "https://registry.npmjs.org/urbit-sigil-js/-/urbit-sigil-js-1.3.7.tgz",
2192+ "integrity": "sha512-s/4sBpzSRX22r39FvNkpaMkt3xI6FJBj79Dp7FtYGR90es4ZLWNY3eA8QVrjHL+pcj4RyX56O62mXrRQ83ZsoQ==",
21922193 "requires": {
2193− "babel-plugin-lodash": "^3.3.4",
2194− "bn.js": "^4.11.8",
2195− "rollup-plugin-uglify-es": "0.0.1"
2194+ "react": "^16.8.6",
2195+ "svgson": "^4.0.0",
2196+ "transformation-matrix": "^1.14.0"
21962197 }
21972198 }
21982199 }
@@ -2888,18 +2889,6 @@
28882889 "@types/babel__traverse": "^7.0.6"
28892890 }
28902891 },
2891− "babel-plugin-lodash": {
2892− "version": "3.3.4",
2893− "resolved": "https://registry.npmjs.org/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz",
2894− "integrity": "sha512-yDZLjK7TCkWl1gpBeBGmuaDIFhZKmkoL+Cu2MUUjv5VxUZx/z7tBGBCBcQs5RI1Bkz5LLmNdjx7paOyQtMovyg==",
2895− "requires": {
2896− "@babel/helper-module-imports": "^7.0.0-beta.49",
2897− "@babel/types": "^7.0.0-beta.49",
2898− "glob": "^7.1.1",
2899− "lodash": "^4.17.10",
2900− "require-package-name": "^2.0.1"
2901− }
2902− },
29032892 "babel-plugin-macros": {
29042893 "version": "2.5.1",
29052894 "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.5.1.tgz",
@@ -7008,14 +6997,6 @@
70086997 "pinkie-promise": "^2.0.0"
70096998 }
70106999 },
7011− "flat": {
7012− "version": "4.1.0",
7013− "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
7014− "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==",
7015− "requires": {
7016− "is-buffer": "~2.0.3"
7017− }
7018− },
70197000 "flat-cache": {
70207001 "version": "2.0.1",
70217002 "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
@@ -11526,6 +11507,11 @@
1152611507 "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
1152711508 "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
1152811509 },
11510+ "lodash.get": {
11511+ "version": "4.4.2",
11512+ "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
11513+ "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
11514+ },
1152911515 "lodash.memoize": {
1153011516 "version": "4.1.2",
1153111517 "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -14223,11 +14209,6 @@
1422314209 "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
1422414210 "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
1422514211 },
14226− "qr-image": {
14227− "version": "3.2.0",
14228− "resolved": "https://registry.npmjs.org/qr-image/-/qr-image-3.2.0.tgz",
14229− "integrity": "sha1-n6gpW+rlDEoUnPn5CaHbRkqGcug="
14230− },
1423114212 "qs": {
1423214213 "version": "6.5.2",
1423314214 "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
@@ -15019,11 +15000,6 @@
1501915000 "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
1502015001 "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
1502115002 },
15022− "require-package-name": {
15023− "version": "2.0.1",
15024− "resolved": "https://registry.npmjs.org/require-package-name/-/require-package-name-2.0.1.tgz",
15025− "integrity": "sha1-wR6XJ2tluOKSP3Xav1+y7ww4Qbk="
15026− },
1502715003 "requireindex": {
1502815004 "version": "1.2.0",
1502915005 "resolved": "https://registry.npmjs.org/requireindex/-/requireindex-1.2.0.tgz",
@@ -15114,34 +15090,6 @@
1511415090 "safe-buffer": "^5.1.1"
1511515091 }
1511615092 },
15117− "rollup-plugin-uglify-es": {
15118− "version": "0.0.1",
15119− "resolved": "https://registry.npmjs.org/rollup-plugin-uglify-es/-/rollup-plugin-uglify-es-0.0.1.tgz",
15120− "integrity": "sha1-5FZE8raFpZq9uTY0ByB6A6e1qbc=",
15121− "requires": {
15122− "uglify-es": "3.0.3"
15123− },
15124− "dependencies": {
15125− "commander": {
15126− "version": "2.9.0",
15127− "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
15128− "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
15129− "requires": {
15130− "graceful-readlink": ">= 1.0.0"
15131− }
15132− },
15133− "uglify-es": {
15134− "version": "3.0.3",
15135− "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.0.3.tgz",
15136− "integrity": "sha1-Y8yEqpRos0lzpIh3h8ZMAaiodXY=",
15137− "requires": {
15138− "commander": "~2.9.0",
15139− "source-map": "~0.5.1",
15140− "uglify-to-browserify": "~1.0.0"
15141− }
15142− }
15143− }
15144− },
1514515093 "rsvp": {
1514615094 "version": "4.8.5",
1514715095 "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
@@ -17389,12 +17337,6 @@
1738917337 }
1739017338 }
1739117339 },
17392− "uglify-to-browserify": {
17393− "version": "1.0.2",
17394− "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
17395− "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
17396− "optional": true
17397− },
1739817340 "ultron": {
1739917341 "version": "1.1.1",
1740017342 "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
@@ -17614,6 +17556,37 @@
1761417556 "lodash": "^4.17.11"
1761517557 }
1761617558 },
17559+ "urbit-paper-renderer": {
17560+ "version": "github:urbit/PaperRenderer#4a5dd07e3ff2d225d6a955ef6a2ed822c7369422",
17561+ "from": "github:urbit/PaperRenderer#rc-2.0",
17562+ "requires": {
17563+ "lodash.get": "^4.4.2",
17564+ "prop-types": "^15.7.2",
17565+ "urbit-sigil-js": "^1.3.7"
17566+ },
17567+ "dependencies": {
17568+ "prop-types": {
17569+ "version": "15.7.2",
17570+ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
17571+ "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
17572+ "requires": {
17573+ "loose-envify": "^1.4.0",
17574+ "object-assign": "^4.1.1",
17575+ "react-is": "^16.8.1"
17576+ }
17577+ },
17578+ "urbit-sigil-js": {
17579+ "version": "1.3.7",
17580+ "resolved": "https://registry.npmjs.org/urbit-sigil-js/-/urbit-sigil-js-1.3.7.tgz",
17581+ "integrity": "sha512-s/4sBpzSRX22r39FvNkpaMkt3xI6FJBj79Dp7FtYGR90es4ZLWNY3eA8QVrjHL+pcj4RyX56O62mXrRQ83ZsoQ==",
17582+ "requires": {
17583+ "react": "^16.8.6",
17584+ "svgson": "^4.0.0",
17585+ "transformation-matrix": "^1.14.0"
17586+ }
17587+ }
17588+ }
17589+ },
1761717590 "urbit-sigil-js": {
1761817591 "version": "1.3.5",
1761917592 "resolved": "https://registry.npmjs.org/urbit-sigil-js/-/urbit-sigil-js-1.3.5.tgz",
package.json+2−1
@@ -18,7 +18,7 @@
1818 "@ledgerhq/hw-app-eth": "^4.61.0",
1919 "@ledgerhq/hw-transport-u2f": "^4.61.0",
2020 "@welldone-software/why-did-you-render": "^3.2.3",
21− "PaperCollateralRenderer": "github:urbit/PaperCollateralRenderer#rc-immediate",
21+ "PaperRenderer": "github:urbit/PaperRenderer#rc-2.0",
2222 "async-retry": "^1.2.3",
2323 "azimuth-js": "^0.15.1",
2424 "azimuth-solidity": "^1.2.0",
@@ -51,6 +51,7 @@
5151 "trezor-connect": "^7.0.1",
5252 "urbit-key-generation": "^0.16.0",
5353 "urbit-ob": "^4.0.1",
54+ "urbit-paper-renderer": "github:urbit/PaperRenderer#rc-2.0",
5455 "urbit-sigil-js": "^1.3.5",
5556 "web3": "1.0.0-beta.54",
5657 "web3-utils": "^1.0.0-beta.52"
src/components/PaperBuilder.jsnew file+14
@@ -0,0 +1,14 @@
1+import React from 'react';
2+import PaperRenderer from 'urbit-paper-renderer';
3+
4+export default function PaperBuilder({ point, wallet, callback, ...props }) {
5+ return (
6+ <PaperRenderer
7+ wallet={[wallet]}
8+ callback={callback}
9+ className="super-hidden"
10+ show={false}
11+ debug={false}
12+ />
13+ );
14+}
src/components/PaperRenderer.jsdeleted−13
@@ -1,13 +0,0 @@
1−import React from 'react';
2−import PaperCollateralRenderer from 'PaperCollateralRenderer';
3−
4−export default function PaperRenderer({ point, wallet, callback, ...props }) {
5− return (
6− <PaperCollateralRenderer
7− wallet={{ [point]: wallet }}
8− callback={callback}
9− className="super-hidden"
10− mode="REGISTRATION"
11− />
12− );
13−}
src/views/Activate/PassportDownload.js+2−2
@@ -7,7 +7,7 @@ import { downloadWallet } from 'lib/invite';
77import { useLocalRouter } from 'lib/LocalRouter';
88
99import { DownloadButton, ForwardButton } from 'components/Buttons';
10−import PaperRenderer from 'components/PaperRenderer';
10+import PaperBuilder from 'components/PaperBuilder';
1111
1212import { useActivateFlow } from './ActivateFlow';
1313import PassportView from './PassportView';
@@ -77,7 +77,7 @@ export default function PassportDownload({ className }) {
7777 </Grid.Item>
7878 </Grid>
7979 </PassportView>
80− <PaperRenderer
80+ <PaperBuilder
8181 point={pointAsString}
8282 wallet={wallet}
8383 callback={data => setPaper(Just(data))}
src/views/Admin/AdminRedownload.js+2−2
@@ -5,7 +5,7 @@ import * as need from 'lib/need';
55import { usePointCursor } from 'store/pointCursor';
66
77import { DownloadButton, RestartButton } from 'components/Buttons';
8−import PaperRenderer from 'components/PaperRenderer';
8+import PaperBuilder from 'components/PaperBuilder';
99
1010import { downloadWallet } from 'lib/invite';
1111
@@ -60,7 +60,7 @@ export default function AdminRedownload() {
6060 </Grid.Item>
6161 )}
6262 </Grid>
63− <PaperRenderer
63+ <PaperBuilder
6464 point={point}
6565 wallet={_urbitWallet}
6666 callback={paper => {
src/views/Admin/Reticket/ReticketConfirm.js+2−2
@@ -11,7 +11,7 @@ import { useLocalRouter } from 'lib/LocalRouter';
1111import { isDevelopment } from 'lib/flags';
1212
1313import { ForwardButton } from 'components/Buttons';
14−import PaperRenderer from 'components/PaperRenderer';
14+import PaperBuilder from 'components/PaperBuilder';
1515import WarningBox from 'components/WarningBox';
1616import { blinkIf } from 'components/Blinky';
1717import useCurrentPointName from 'lib/useCurrentPointName';
@@ -54,7 +54,7 @@ export default function ReticketConfirm({ newWallet, setNewWallet }) {
5454 const paperRenderer = generatedWallet.matchWith({
5555 Nothing: () => null,
5656 Just: ({ value: wallet }) => (
57− <PaperRenderer
57+ <PaperBuilder
5858 point={point}
5959 wallet={wallet}
6060 callback={paper => {