Skip to content

Commit

Permalink
Merge branch 'master' into feat/helper-text
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanswrt committed Aug 13, 2020
2 parents 78e07d2 + 61469e7 commit 98ed4fd
Show file tree
Hide file tree
Showing 31 changed files with 4,156 additions and 2,934 deletions.
61 changes: 31 additions & 30 deletions .firebase/hosting.YnVpbGQ.cache
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,34 @@ favicon-32x32.png,1592403823012,d7a3562003c7c09f3259863189ff9f2be2a721bbb3e3b4ea
favicon.ico,1592403823013,773d6aadf32d7cfed9e7fa00d51181b8ecef17aa1a755f4326e289c996f62116
manifest.json,1592403823014,9ec5451db81c07e494fc2d56edb4a5479820bb10bf3fd05021d3fa705c4ed717
robots.txt,1592403823014,53d2dcecb15666b4f7db4041361d3b6ea115483937dd38b66216deda98adaa4a
asset-manifest.json,1593034273750,6f129f286e6406f6bd5e77810ef57e690bdc2db6c07bf5dfb89368062de43878
index.html,1593034273608,6bd5b790c1e39d26e240acd7dbdaa767a3db8ce261831bf8cd80345ed6b7aa0b
precache-manifest.c4a4a1bdc134d7b123090a1cf1621c5a.js,1593034273608,ac48d8af578081f35cf6b9a2f3e15952b856c0e88105cef18a845d764c1fc628
service-worker.js,1593034273608,9e71397d510cbc36951388906f2cb722906c53a221f6fdc6694f7bdc6f11963f
static/css/main.b2c8d011.chunk.css,1593034273608,c621eec6fedde28d4f678a3b7732cbd551f65408a764a2f5b5ec5a3ea166e699
static/css/main.b2c8d011.chunk.css.map,1593034273750,2cfc8ac9f22a91d0b1af5aa55b8e24f83fd829bb15fb6e5119684b3de1a07c13
static/js/runtime~main.d32a1adf.js,1593034273750,ff2229ea3af92f4e9fd0949a27ec40a4b343043804d6fe93dc2c0d08eb94cb0d
static/media/back-arrow.809191e8.svg,1593034273606,6c24e74fea7f4b5909f157fa6cd9879d42b43f5ed798ad0136d6b62f8326d58d
static/js/runtime~main.d32a1adf.js.map,1593034273750,2f597b10b743d7f96dd6040d7bae5139b4c444196d924d338df577b77e3b696c
static/media/github.7e04ba23.svg,1593034273592,7e24f004cce136c56493d885115001c2b2b5fccaf7ed7b14a0ada399bd43e9d4
static/media/dai.42d0a1b9.png,1593034273606,bb6604913f1a0e80c640f8345d04b2de55c7604ffdd260f8f561b4dd177871fb
static/media/eth.86976a92.png,1593034273606,98b7c21d528bd80ef031b0ce777568b184a1610bc60b5e42687ca250051d9687
static/media/reddit.af8eec7c.svg,1593034273608,0d16ebe83fc27775e3eb81ada94d70e1ce25c7923a95c3fd2103f741d8e7ba87
static/media/renBCH.150b101d.svg,1593034273606,dc57a38913068df38170ab7cff963ff55da48fff231aa174eb94556e57192d59
static/media/renBTC.c3f431ce.svg,1593034273606,bd139f377fd44461a8d40e1ae4f616b514779e98856ca817d1bf9616c4052f1d
static/media/renZEC.c6902a6d.svg,1593034273606,39dc342855754a40f5e15a247d74d75b59b53945de152053358d9a87511bddd4
static/media/telegram.a8dcefe3.svg,1593034273608,68ba57dd370da47a72e11b6c2cefee5675a4bcb0fd5e0e1d34e176474e18803e
static/media/twitter.bae469b5.svg,1593034273607,1fcccde255e0713be3ac976c024f06783309bec8c8ec4a507bcd509e91a8752c
static/media/ren-logo-black.f21486a1.svg,1593034273606,96e428cc06bee262dd4440ce603bd6bfe2094b01f2bdaa15ec9c223c44f6d5a4
static/media/wallet-icon.38831795.svg,1593034273598,88d3e6faf680c24e6f5d9f79d24075a569e45eae73bd8690df0075612529c5f9
static/media/metamask-intro.20c115c4.svg,1593034273607,64a6a3604416965b9db064a316ee32ed837218cbd99823970e3ca6275ac5ed5c
static/media/zec.16097588.svg,1593034273606,389decb7a4f705c5183c2227f0d1280581811b2b18600fa762dec9b4238a8dc8
static/media/bch.b44c8392.png,1593034273606,e3ebf92f9ab2b9f9c8f2b9a68fb27dffdc42db4a915dbb1c899b978f04f5524e
static/media/btc.ae796dc4.png,1593034273606,05040d8d65eca110885d0ddf2e534d0a1ff9f3c10373228e04d51a06ae77cfe9
static/js/main.3cdcf925.chunk.js,1593034273608,877843ed1f1e06893ca6ccf37c5313c1778d8f64a0e7fd489c32a79193b8cf31
static/media/wbtc.af995ef6.png,1593034273606,b1a8e3c3ff504925e283b9c1d6d4bc8f1aff7596adf229299cf55d55760ed940
static/js/main.3cdcf925.chunk.js.map,1593034273750,ed50a026421e9faeef466901bbeca246018973368a59af3e349f6e0bb759774f
static/media/scrypt.98a78870.node,1593034273750,8fd3306298eb03850881057280d7339eac351db880ad2e8bbc569f847caf99c3
static/js/2.1e8230b9.chunk.js,1593034273753,8ca0a8d90db2d7cac68be7a7a4d4f8d1e7ac663657f7005361e2caed77f0c19f
static/js/2.1e8230b9.chunk.js.map,1593034273791,fa0b2c716d0b9bc7a1bf0bbfbdb978d33236890df05f230ae16e99ecccd69c1e
asset-manifest.json,1594243886387,3a35cbd8d514d0e8d22ebb97201b93b9b6fd7416e562a2b1bd253659b03ceadf
index.html,1594243886285,e43f4701980ed3b823dbf64e0407afac0e19139d7e83c6bd4ec2057705f763bc
precache-manifest.f20609d742a84641fd7d96968e68e934.js,1594243886306,65e592be5c9e6cb8f47ced9fdad56ea91b38e108c576206d795b9e06bc23235c
service-worker.js,1594243886385,1de1feef8a417e43d739d7e422f95733f8c73cab4c061d0a7f8792ebee041ad6
static/css/main.b2c8d011.chunk.css,1594243886306,c621eec6fedde28d4f678a3b7732cbd551f65408a764a2f5b5ec5a3ea166e699
static/css/main.b2c8d011.chunk.css.map,1594243886386,2cfc8ac9f22a91d0b1af5aa55b8e24f83fd829bb15fb6e5119684b3de1a07c13
static/js/runtime~main.d32a1adf.js,1594243886385,ff2229ea3af92f4e9fd0949a27ec40a4b343043804d6fe93dc2c0d08eb94cb0d
static/js/runtime~main.d32a1adf.js.map,1594243886386,2f597b10b743d7f96dd6040d7bae5139b4c444196d924d338df577b77e3b696c
static/media/back-arrow.809191e8.svg,1594243886283,6c24e74fea7f4b5909f157fa6cd9879d42b43f5ed798ad0136d6b62f8326d58d
static/media/dai.42d0a1b9.png,1594243886283,bb6604913f1a0e80c640f8345d04b2de55c7604ffdd260f8f561b4dd177871fb
static/media/github.7e04ba23.svg,1594243886285,7e24f004cce136c56493d885115001c2b2b5fccaf7ed7b14a0ada399bd43e9d4
static/media/eth.86976a92.png,1594243886283,98b7c21d528bd80ef031b0ce777568b184a1610bc60b5e42687ca250051d9687
static/media/reddit.af8eec7c.svg,1594243886386,0d16ebe83fc27775e3eb81ada94d70e1ce25c7923a95c3fd2103f741d8e7ba87
static/media/renBCH.150b101d.svg,1594243886283,dc57a38913068df38170ab7cff963ff55da48fff231aa174eb94556e57192d59
static/media/mew.62749210.svg,1594243886284,902912b8a5f9f9946a7458dcb55b7cf794342714e1680f863b26031cde6fdfcd
static/media/renBTC.c3f431ce.svg,1594243886283,bd139f377fd44461a8d40e1ae4f616b514779e98856ca817d1bf9616c4052f1d
static/media/renZEC.c6902a6d.svg,1594243886283,39dc342855754a40f5e15a247d74d75b59b53945de152053358d9a87511bddd4
static/media/ren-logo-black.f21486a1.svg,1594243886284,96e428cc06bee262dd4440ce603bd6bfe2094b01f2bdaa15ec9c223c44f6d5a4
static/media/telegram.a8dcefe3.svg,1594243886386,68ba57dd370da47a72e11b6c2cefee5675a4bcb0fd5e0e1d34e176474e18803e
static/media/twitter.bae469b5.svg,1594243886284,1fcccde255e0713be3ac976c024f06783309bec8c8ec4a507bcd509e91a8752c
static/media/wallet-icon.38831795.svg,1594243886281,88d3e6faf680c24e6f5d9f79d24075a569e45eae73bd8690df0075612529c5f9
static/media/zec.16097588.svg,1594243886283,389decb7a4f705c5183c2227f0d1280581811b2b18600fa762dec9b4238a8dc8
static/media/metamask-fox.549efeda.svg,1594243886284,b414afa2e8ef99976af330b426f24af5d4404973eaad99e9d68710a12c3d698e
static/media/bch.b44c8392.png,1594243886283,e3ebf92f9ab2b9f9c8f2b9a68fb27dffdc42db4a915dbb1c899b978f04f5524e
static/media/btc.ae796dc4.png,1594243886283,05040d8d65eca110885d0ddf2e534d0a1ff9f3c10373228e04d51a06ae77cfe9
static/js/main.f35917ad.chunk.js,1594243886306,91b6d3ee0ab3e36acdd4b74352670853f5ce1115ecf5fb8bbafc666ad3404be2
static/media/wbtc.af995ef6.png,1594243886283,b1a8e3c3ff504925e283b9c1d6d4bc8f1aff7596adf229299cf55d55760ed940
static/js/main.f35917ad.chunk.js.map,1594243886386,068ff808048c7a16c38c92f570795ea2234485ae37c4684a757e39f1c58d2ec9
static/media/scrypt.6e3a9c85.node,1594243886386,71897db82f69d0e72c486ab677de2f4828bb6b761663c878428428d44ca8dabe
static/js/2.1c34ac02.chunk.js,1594243886389,81f8313aca173c6b6956a3c80af3834d19cb8ea1eb8bc0976fc7335baedfe3aa
static/js/2.1c34ac02.chunk.js.map,1594243886402,8c40d7000d4b0bb4f32e0643189e581beeb6609683fc37c5e984c3cdf54a7e26
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install dependencies
run: yarn --network-concurrency 1
- name: Lint
run: yarn eslint ./src
run: yarn lint
test:
runs-on: ubuntu-latest
steps:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# RenBridge
11 changes: 7 additions & 4 deletions _headers
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
/*
# Not allowed in iframes
X-Frame-Options: DENY
# this is disabled to allow gateway-js to work. we should investigate fixing
# https://stackoverflow.com/questions/25098021/securityerror-blocked-a-frame-with-origin-from-accessing-a-cross-origin-frame
# X-Frame-Options: DENY
# Helps prevent loding external scripts if inline scripting is allwoed
X-XSS-Protection: 1; mode=block
# Also seems to dislike gateway-js
# X-XSS-Protection: 1; mode=block
# Restrict js scripts to only load from the same host
# unsafe-inline largely makes this moot,
# but is required for metamask to work in Firefox,
# this should be tracked until resolved
Content-Security-Policy: script-src 'self' 'unsafe-inline'
Content-Security-Policy: script-src 'self' 'unsafe-inline' 'unsafe-eval' blob:
# Always follow mime-types provided from server
X-Content-Type-Options: "nosniff" always
# Don't include referrer headers to external links
Referrer-Policy: no-referrer
# Referrer-Policy: no-referrer
6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"@material-ui/core": "^4.3.2",
"@material-ui/icons": "^4.2.1",
"@material-ui/lab": "^4.0.0-alpha.25",
"@myetherwallet/mewconnect-web-client": "2.1.1-RC.4.6",
"@portis/web3": "^2.0.0-beta.38",
"@renproject/gateway": "^1.0.2",
"@spyna/react-store": "^1.4.0",
Expand All @@ -31,6 +32,7 @@
"is-incognito": "^1.0.0",
"material-ui": "^0.20.2",
"numeral": "^2.0.6",
"platform": "^1.3.5",
"query-string": "^6.12.1",
"react": "^16.9.0",
"react-apollo": "^3.1.4",
Expand All @@ -52,6 +54,7 @@
"build": "react-scripts --max_old_space_size=4096 build",
"predeploy": " ",
"deploy": "gh-pages -d build",
"lint": "eslint ./src && prettier -c './src/**/*.js'",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
Expand All @@ -69,5 +72,8 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"prettier": "^2.0.5"
}
}
Loading

0 comments on commit 98ed4fd

Please sign in to comment.