Updates to master (#430)

* Updating production wallet (#407) * added @frozeman's fix (#328) * added @frozeman's fix (#328) (#329) * updates for gh-pages (#331) * updates for gh-pages (#332) * added @frozeman's fix (#328) * updates for gh-pages (#331) * Update README (#335) Changes wall to wallet * Set placeholder contract's pragma version using Mist-API (#337) * Set placeholder contract's pragma version using Mist-API * add comment * improvements * add further conditions * added missing 0x * build * Merge Develop (#338) * added @frozeman's fix (#328) * updates for gh-pages (#331) * Update README (#335) Changes wall to wallet * Set placeholder contract's pragma version using Mist-API (#337) * Set placeholder contract's pragma version using Mist-API * add comment * improvements * add further conditions * added missing 0x * build * reverted network id storage on accounts package * re-build * Error handling for previous versions of Mist (#342) * Error handling for previous versions of Mist * Better checking of Mist object * rebuild * remove amount param from coinbase widget (#347) * sticky bar is failing to stick. terrible sticky bar, fake sticky (#348) * Warning when trying to transfer a token to an empty recipient (#346) * authorize accounts callback fix * Add caret operator to contract example (#345) * Addresses need quotes (#351) I'm inferring from #118 that address parameters need quotes. * [i18n] add missing meteor package; improve error message (#357) * fix russian translation (#356) * fix renaming bug (#358) * update token contract link (#360) * minor typo and other text corrections (#359) * fixes token selection when sending via the zebra-token-list (#361) * fix * update deployContract * fix (#362) * initialize send view correctly when switching from deploy view (#363) * update TX link: testnet.etherscan.io -> ropsten.etherscan.io (#364) * numeral.js: console.warn instead of console.error (#366) * Add ES6 support; correction to fr translation (#365) * make correction to fr translation * meteor: add ES6 support * update i18n string 'accountNote' (#372) * remove whitespaces from address on token.add() (#370) * fix packages (#369) * Adding out of sync warning (#374) * Adding out of sync warning to EN and PT * Adding etherscan button on sidebar * Translations * added german * Changed http:// to https:// on one link (#384) Changed http:// to https:// on one link in README.md * update 'allow-deny' package to avert download timeout (#383) * build wallet * Darken network info font (#388) * Quick wallet fixes (#389) * fix contract ordering * check if function payable * remove console log * some typo fixes; adjust some of the supporting text (#385) * Adding two more currencies to price ticker (#387) * Adding two more currencies to price ticker * updating ethereum:tools package to 0.7.0 * Update coinbase success message (#390) * Updating coinbase success message Signed-off-by: Everton Fraga <ev@ethereum.org> * Updating coinbase success message * Removed disabled wallets (#393) * remove disabled wallets * removed disabled wallets * Temporarily removing ES6 support: fixing indexeddb driver bug (#395) * Including file to prevent 404 error (#394) * add reactive (#396) * add ens support to input fields (#398) * add ens support * make regex case insensitive * Creating travis file (#402) * Creating travis file * renaming travis file * Specifying node version * Debug 1 * Adding sudo: meteor installation * Updating ethereum-elements; building for production (#405) * Adding travis badge * reverse ENS lookup (#403) * add ens support * make regex case insensitive * fix dbissue * update files * do not pull etherscan or show currencies if on testnet * fix block watch * parenthesis * remove amount param from coinbase widget (#347) * sticky bar is failing to stick. terrible sticky bar, fake sticky (#348) * Warning when trying to transfer a token to an empty recipient (#346) * authorize accounts callback fix * Addresses need quotes (#351) I'm inferring from #118 that address parameters need quotes. * Add caret operator to contract example (#345) * [i18n] add missing meteor package; improve error message (#357) * fix russian translation (#356) * minor typo and other text corrections (#359) * fix renaming bug (#358) * update token contract link (#360) * fixes token selection when sending via the zebra-token-list (#361) * fix * update deployContract * fix (#362) * initialize send view correctly when switching from deploy view (#363) * update TX link: testnet.etherscan.io -> ropsten.etherscan.io (#364) * numeral.js: console.warn instead of console.error (#366) * Add ES6 support; correction to fr translation (#365) * make correction to fr translation * meteor: add ES6 support * update i18n string 'accountNote' (#372) * remove whitespaces from address on token.add() (#370) * fix packages (#369) * Adding out of sync warning (#374) * Adding out of sync warning to EN and PT * Adding etherscan button on sidebar * Translations * added german * update 'allow-deny' package to avert download timeout (#383) * build wallet * Changed http:// to https:// on one link (#384) Changed http:// to https:// on one link in README.md * Darken network info font (#388) * Quick wallet fixes (#389) * fix contract ordering * check if function payable * remove console log * some typo fixes; adjust some of the supporting text (#385) * Adding two more currencies to price ticker (#387) * Adding two more currencies to price ticker * updating ethereum:tools package to 0.7.0 * Update coinbase success message (#390) * Updating coinbase success message Signed-off-by: Everton Fraga <ev@ethereum.org> * Updating coinbase success message * Removed disabled wallets (#393) * remove disabled wallets * removed disabled wallets * Temporarily removing ES6 support: fixing indexeddb driver bug (#395) * Including file to prevent 404 error (#394) * add reactive (#396) * add ens support to input fields (#398) * add ens support * make regex case insensitive * Creating travis file (#402) * Creating travis file * renaming travis file * Specifying node version * Debug 1 * Adding sudo: meteor installation * Updating ethereum-elements; building for production (#405) * Adding travis badge * reverse ENS lookup (#403) * add ens support * make regex case insensitive * fix dbissue * update files * do not pull etherscan or show currencies if on testnet * fix block watch * parenthesis * Release fixes (#408) * fixes from the PR407 review * makes header work in mist properly * makes wallet header work in mist properly, only is small now in the wallet #2 * remove not existing reactiveData template helper * Editor formatting * Fixing token selection bug * fixes token switching * Release fixes (#409) * fixes from the PR407 review * makes header work in mist properly * makes wallet header work in mist properly, only is small now in the wallet #2 * remove not existing reactiveData template helper * Editor formatting * Fixing token selection bug * fixes token switching * build files * fixing grammar/whitespace on token transfer (#413) * Catalan language support. (#423) * Changed placeholder text for Token Symbol input from $ to Token Symbol on the AddToken.html modal (#420) * Fix stuck creating wallets on LES (#427) * Code legibility * Catching up wallets stuck in creating stage * Updating package version * Reverting package version * Complete Albanian translation (#424) * Add Albanian language code * Add app.sq.i18n.json * Backup * backup * completed wallet.sq translation * corrections * Adds method visibility in placeholder contract (#429) * Fixing JSON syntax error * Up to date built wallet * Reverting package update
ethereum · Nov 20, 2017 · 3afdb7f · 3afdb7f
1 parent 6cc2808
commit 3afdb7f
Show file tree

Hide file tree

Showing 15 changed files with 786 additions and 507 deletions.
diff --git a/app/client/lib/ethereum/observeBlocks.js b/app/client/lib/ethereum/observeBlocks.js
@@ -48,14 +48,32 @@ updateBalances = function() {
                 }, 1000);
             }
         }
-
     });
 
 
+    // WALLETS STUCK IN CREATE STATE
+    // issue found when using the light client mode on Mist 0.9.1 and 0.9.2
+    var creatingWallets = Wallets.find({
+      transactionHash: {$exists: true},
+      address: {$exists: false}
+    }).fetch();
+
+    _.each(creatingWallets, function(wallet){
+      // Fetches transactionReceipt looking for contractAddress
+      web3.eth.getTransactionReceipt(wallet.transactionHash, function(error, receipt) {
+        if (receipt.contractAddress !== null) {
+          // Updates the wallet
+          var r = Wallets.update(wallet._id, {$set: {
+            address: receipt.contractAddress
+          }});
+        }
+      });
+    });
+
     // UPDATE ENS
     var allAccounts = EthAccounts.find().fetch().concat(walletsAndContracts);
     _.each(allAccounts, function(account){
-        
+
         // Only check ENS names every N minutes
         var now = Date.now();
         if (!account.ensCheck || (account.ensCheck && now - account.ensCheck > 10*60*1000)) {
@@ -98,7 +116,6 @@ updateBalances = function() {
                         set['balances.'+ account._id] = '';
                         Tokens.update(token._id, {$unset: set});
                     }
-
                 }
             });
         });
@@ -132,4 +149,4 @@ observeLatestBlocks = function(){
     peerCountIntervalId = setInterval(function() {
         getPeerCount()
     }, 1000);
-};
+};
diff --git a/app/client/lib/helpers/helperFunctions.js b/app/client/lib/helpers/helperFunctions.js
@@ -18,7 +18,7 @@ Get the default contract example
 @method getDefaultContractExample
 **/
 Helpers.getDefaultContractExample = function(withoutPragma) {
-    var source = 'contract MyContract {\n    /* Constructor */\n    function MyContract() {\n\n    }\n}';
+    var source = 'contract MyContract {\n    /* Constructor */\n    function MyContract() public {\n\n    }\n}';
 
     if (withoutPragma) {
         return source;

diff --git a/app/client/templates/elements/account.js b/app/client/templates/elements/account.js
@@ -93,7 +93,12 @@ Template['elements_account'].helpers({
     @method (creating)
     */
     'creating': function(){
-        return (!this.address || this.imported || (blocksForConfirmation >= EthBlocks.latest.number - (this.creationBlock - 1) && EthBlocks.latest.number - (this.creationBlock - 1) >= 0));
+        var noAddress = !this.address;
+        var isImported = this.imported;
+        var belowReorgThreshold = (blocksForConfirmation >= EthBlocks.latest.number - (this.creationBlock - 1));
+        var blockNumberCheck = EthBlocks.latest.number - (this.creationBlock - 1) >= 0;
+
+        return (noAddress || isImported || (belowReorgThreshold && blockNumberCheck));
     },
     /**
     Returns the confirmations
@@ -138,7 +143,7 @@ Template['elements_account'].helpers({
 Template['elements_account'].events({
     /**
     Field test the speed wallet is rendered
-    
+
     @event click button.show-data
     */
     'click .wallet-box': function(e){

diff --git a/app/client/templates/views/modals/addToken.html b/app/client/templates/views/modals/addToken.html
@@ -13,9 +13,9 @@ <h3>{{i18n "wallet.modals.addToken.tokenName"}}</h3>
     <input type="string" value="{{name}}" name="name" placeholder="Token name" class="name">
 
     <h3>{{i18n "wallet.modals.addToken.tokenSymbol"}}</h3>
-    <input type="string" value="{{symbol}}" name="symbol" placeholder="$" class="symbol">
+    <input type="string" value="{{symbol}}" name="symbol" placeholder="Token symbol" class="symbol">
+
 
-
     <h3>{{i18n "wallet.modals.addToken.decimalPlaces"}}</h3>
     <input type="number" min="0" step="1" name="division" value="{{decimals}}" placeholder="2" class="decimals">
 
@@ -24,4 +24,4 @@ <h3>{{i18n "wallet.modals.addToken.preview"}}</h3>
 
     {{> elements_tokenBox previewToken}}
 
-</template>
+</template>
diff --git a/app/i18n/app.ca.i18n.json b/app/i18n/app.ca.i18n.json
@@ -0,0 +1,33 @@
+{
+    "app": {
+        "loading": "Carregant...",
+        "offline": "No s'ha pogut connectar, estàs desconectat?",
+        "logginIn": "Iniciant sessió.."
+    },
+    "error": {
+        "insufficientRights": "No tens prous drets per aquesta acció."
+    },
+    "buttons": {
+        "ok": "OK",
+        "cancel": "Cancel·lar",
+        "save": "Desa",
+        "edit": "edita",
+        "send": "Envia",
+        "sending": "Enviant...",
+        "create": "Crea",
+        "select": "Selecciona",
+        "tryToReconnect": "Intenta reconnectar"
+    },
+    "commonWords": {
+        "you": "Tu",
+        "send": "Envia",
+        "or": "o",
+        "of": "de",
+        "with": "amb",
+        "and": "i",
+        "on": "a",
+        "per": "per",
+        "total":"total",
+        "at": "a"
+    }
+}
diff --git a/app/i18n/app.sq.i18n.json b/app/i18n/app.sq.i18n.json
@@ -0,0 +1,33 @@
+{
+    "app": {
+        "loading": "Duke u ngarkuar...",
+        "offline": "Nuk mund të lidhet. Mos nuk jeni të lidhur me internetin?",
+        "logginIn": "Duke u kyçur..."
+    },
+    "error": {
+        "insufficientRights": "Nuk keni të drejta të mjaftueshme për të kryer këtë veprim."
+    },
+    "buttons": {
+        "ok": "OK",
+        "cancel": "Anulo",
+        "save": "Ruaj",
+        "edit": "redakto",
+        "send": "Dërgo",
+        "sending": "Duke dërguar...",
+        "create": "Krijo",
+        "select": "Përzgjidh",
+        "tryToReconnect": "Provo të rilidhesh"
+    },
+    "commonWords": {
+        "you": "Ju",
+        "send": "Dërgo",
+        "or": "ose",
+        "of": "nga",
+        "with": "me",
+        "and": "dhe",
+        "on": "në",
+        "per": "për",
+        "total":"total",
+        "at": "te"
+    }
+}