From b338461689317bf07eb12b6a2593189a59433887 Mon Sep 17 00:00:00 2001 From: emizzle Date: Tue, 10 Jul 2018 13:31:39 +1000 Subject: [PATCH] added text underline back for nav links removed from address for sending txs as this was sometimes not getting properly updated by react (i think) disabled user profile update without first modifying the data --- app/css/dapp.css | 55 +++++---------------------------- app/js/components/CreateUser.js | 2 +- app/js/components/DoTweet.js | 2 +- chains.json | 18 ++++++++--- 4 files changed, 23 insertions(+), 54 deletions(-) diff --git a/app/css/dapp.css b/app/css/dapp.css index 770ed7f..332e649 100644 --- a/app/css/dapp.css +++ b/app/css/dapp.css @@ -35,54 +35,15 @@ nav .sk-spinner.pacman{ vertical-align: middle; margin: 10px 0 10px 30px; } +nav .navbar-text a { + text-decoration:underline; +} +nav .navbar-text a:hover, nav .navbar-text a:focus { + text-decoration:none; +} .tweets .tweet .list-group-item-text { white-space: pre-line; } -.logs { - background-color: black; - font-size: 14px; - color: white; - font-weight: bold; - padding: 10px; - border-radius: 8px; -} - -.tab-content { - border-left: 1px solid #ddd; - border-right: 1px solid #ddd; - border-bottom: 1px solid #ddd; - padding: 10px; - margin: 0px; -} - -.nav-tabs { - margin-bottom: 0; -} - -.status-offline { - vertical-align: middle; - margin-left: 5px; - margin-top: 4px; - width: 12px; - height: 12px; - background: red; - -moz-border-radius: 10px; - -webkit-border-radius: 10px; - border-radius: 10px; -} - -.status-online { - vertical-align: middle; - margin-left: 5px; - margin-top: 4px; - width: 12px; - height: 12px; - background: mediumseagreen; - -moz-border-radius: 10px; - -webkit-border-radius: 10px; - border-radius: 10px; -} - -input.form-control { - margin-right: 5px; +.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { + background-color: rgba(221, 221, 221, 0.4); } \ No newline at end of file diff --git a/app/js/components/CreateUser.js b/app/js/components/CreateUser.js index aa88968..6df2e8d 100644 --- a/app/js/components/CreateUser.js +++ b/app/js/components/CreateUser.js @@ -48,7 +48,7 @@ class CreateUser extends Component { // send the transaction to create an account with our gas estimate // (plus a little bit more in case the contract state has changed). - const result = await createAccount.send({ from: this.props.account, gas: gasEstimate + 1000 }); + const result = await createAccount.send({ gas: gasEstimate + 1000 }); // check result status. if status is false or '0x0', show user the tx details to debug error if (result.status && !Boolean(result.status.toString().replace('0x', ''))) { // possible result values: '0x0', '0x1', or false, true diff --git a/app/js/components/DoTweet.js b/app/js/components/DoTweet.js index 69257dc..c4c7ee4 100644 --- a/app/js/components/DoTweet.js +++ b/app/js/components/DoTweet.js @@ -54,7 +54,7 @@ class DoTweet extends Component{ // send the tweet transaction plus a little extra gas in case the contract state // has changed since we've done our gas estimate - await tweet.send({ from: account, gas: gasEstimate + 1000 }); + await tweet.send({ gas: gasEstimate + 1000 }); // remove loading state this.setState({ isLoading: false }); diff --git a/chains.json b/chains.json index 7a5dd66..7fc9c03 100644 --- a/chains.json +++ b/chains.json @@ -1,17 +1,25 @@ { - "0xdde6a9192954f4d6501ce98ad7bce3b8b83b1d69192248d408697e9aa49d9ecf": { + "0x4788220cd8213be02253e757532d0a33ca4ca33e194e9fb5ead0797712e451db": { "contracts": { "0x7cdafd8b713a2a137aa482400094d5148196dd4ed9e0b885613558758ba63ee5": { "name": "DTwitter", - "address": "0x748B1e003370a5EdAf965a89BeBf0Bf19472f170" + "address": "0x02778106a1E4FbAe35456b80a259Ac4F9d6EcD44" }, "0x1797453304e4b69b44fb7d649a72ca80394a8b4e1d14c2cc530f5dc3ae1f0ea3": { "name": "ENSRegistry", - "address": "0x698dA658e9363A619C738146e3a2267b2487C008" + "address": "0x8C4E61644201d6b953e6a77279da0063C77C0C17" }, - "0x0d8e129365403cec9d931fb5043084577c03d24d23a11aa5dae6ef1473e3d5d5": { + "0x4f2ec8bd9f20c23734df1765a6234f490d6f6d20c8a2579240c5c21fc1e3fd13": { "name": "FIFSRegistrar", - "address": "0x340B33717a1F84A1d997598Ba16Ed68A10b14e16" + "address": "0xB90e14eE00CC417974452f6276915cB3f4eeA4c1" + }, + "0x9d71e0b1b6484d3ddf809d358f71ae0535166e8290c103f08d4f96f06570c6f3": { + "name": "FIFSRegistrar", + "address": "0x1fD75c07f3Ec72a99D682eCD380c6Ec03E8D19b0" + }, + "0x972f980bf47614636adba4a6f14f7cacefc4713736d728a0e8582569335cea59": { + "name": "FIFSRegistrar", + "address": "0xF1182Fd6cE18D8665dCe54E1fcd820A6827E2215" } } }