Merge branch 'development' into 117-add-routing-functionality

LiskArchive · Apr 28, 2017 · aa96947 · aa96947
2 parents f7128d5 + 3ca9112
commit aa96947
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/src/app/components/send/send.js b/src/app/components/send/send.js
@@ -69,7 +69,7 @@ app.component('send', {
             },
           });
         } else {
-          resolve();
+          resolve(null);
         }
       });
     }
@@ -122,10 +122,3 @@ app.component('send', {
     }
   },
 });
-
-app.directive('ignoreMouseWheel', () => ({
-  restrict: 'A',
-  link: (scope, element) => {
-    element.bind('mousewheel', () => element.blur());
-  },
-}));
diff --git a/src/app/components/send/send.pug b/src/app/components/send/send.pug
@@ -22,12 +22,12 @@ md-dialog.dialog-send(aria-label='Transfering', style='width: 700px; max-width:
               div(ng-message='pattern') Invalid
           md-input-container.md-block
             label Transaction Amount
-            input(type='number', name='amount', ng-model='$ctrl.amount.value', required, ng-pattern='$ctrl.amount.regexp', ng-disabled='$ctrl.loading', ng-max='$ctrl.amount.max', ignore-mouse-wheel)
+            input(type='text', name='amount', ng-model='$ctrl.amount.value', required, ng-pattern='$ctrl.amount.regexp', ng-disabled='$ctrl.loading', ng-max='$ctrl.amount.max')
             div.fee(ng-show='$ctrl.amount.value') Fee: 0.1 LSK
             div(ng-messages='$ctrl.sendForm.amount.$error')
               div(ng-message='required') Required
               div(ng-message='pattern') Invalid
               div(ng-message='max') Insufficient funds
       md-content(layout='row', layout-align='center center')
         md-button.md-raised.md-secondary(ng-disabled='$ctrl.loading', ng-click='$ctrl.cancel()') {{ 'Cancel' }}
-        md-button.md-raised.md-primary(ng-disabled='!$ctrl.sendForm.$valid || $ctrl.loading', ng-click='$ctrl.go()') {{ $ctrl.loading ? 'Sending...' : 'Send' }}
+        md-button.md-raised.md-primary(ng-disabled='!$ctrl.sendForm.$valid || $ctrl.loading', ng-click='$ctrl.go()') {{ $ctrl.loading ? 'Sending...' : 'Send' }}
diff --git a/src/app/components/transactions/transactions.js b/src/app/components/transactions/transactions.js
@@ -18,8 +18,8 @@ app.component('transactions', {
       this.pendingTransactions = [];
 
       this.$rootScope.$on('transaction-sent', (event, transaction) => {
-        this.pendingTransactions.push(transaction);
-        this.transactions = this.pendingTransactions.concat(this.transactions);
+        this.pendingTransactions.unshift(transaction);
+        this.transactions.unshift(transaction);
       });
 
       if (this.account.get().address) {