merge origin

ethereum · Jan 8, 2016 · b2be459 · b2be459
2 parents a808047 + b10b371
commit b2be459
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/interface/client/templates/popupWindows/sendTransactionConfirmation.js b/interface/client/templates/popupWindows/sendTransactionConfirmation.js
@@ -79,9 +79,10 @@ Template['popupWindows_sendTransactionConfirmation'].onCreated(function(){
 
                         // set the gas to the estimation, if not provided or lower
                         var gas = TemplateVar.get(template, 'providedGas');
-                        if(gas < res) {
-                            TemplateVar.set(template, 'providedGas', res + 10000);
-                            TemplateVar.set(template, 'initialProvidedGas', res + 10000);
+
+                        if(gas == 0) {
+                            TemplateVar.set(template, 'providedGas', res + 100000);
+                            TemplateVar.set(template, 'initialProvidedGas', res + 100000);
                         }
                     });
                 }

diff --git a/main.js b/main.js
@@ -26,7 +26,7 @@ var ipcPath = getIpcPath();
 
 
 global.production = false;
-global.mode = 'mist';
+global.mode = 'wallet';
 
 global.mainWindow = null;
 global.windows = {};