From 43a747b96d00f395136630a6f4a46ad424f5dcd9 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 6 May 2015 11:16:19 -0300
Subject: [PATCH] Fix slide up/down for txp and tx

---
 public/views/includes/transaction.html |  2 +-
 src/css/mobile.css                     | 14 +++++++++-----
 src/js/controllers/walletHome.js       |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html
index 4edeb0d78..4b0a2b47a 100644
--- a/public/views/includes/transaction.html
+++ b/public/views/includes/transaction.html
@@ -1,6 +1,6 @@
 <div class="ng-animate-disabled row collapse last-transactions-content line-b"
   ng-class="{'text-gray':!tx.pendingForUs}"
-  ng-click="openTxModal(tx, index.copayers)">
+  ng-click="home.openTxpModal(tx, index.copayers)">
   <div class="small-1 columns text-center" >
     <i class="icon-circle-active size-10" ng-show="tx.pendingForUs" ng-style="{'color':index.backgroundColor}" style="margin-top:8px;"></i>
     &nbsp;
diff --git a/src/css/mobile.css b/src/css/mobile.css
index 57667b8ae..50a95453f 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -552,12 +552,11 @@ a.pin-button:active {
 }
 
 .reveal-modal {
+  opacity: 0;
   padding: 0;
   border: none;
   border-radius: 0;
-  top: 0;
-  height: 100%;
-  overflow: auto;
+  overflow-y: auto;
   padding-bottom: 20px;
   -webkit-animation-duration: 0.3s;
   animation-duration: 0.3s;
@@ -591,9 +590,10 @@ a.pin-button:active {
   }
 }
 
-.reveal-modal.fade { 
+.reveal-modal.ng-animate.in-remove { 
   -webkit-animation-name: slideOutDown;
   animation-name: slideOutDown;
+  opacity: 1;
 }
 
 @-webkit-keyframes slideInUp {
@@ -622,11 +622,15 @@ a.pin-button:active {
   }
 }
 
-.reveal-modal.fade.in {
+.reveal-modal.ng-animate.in-add.in.in-add-active {
   -webkit-animation-name: slideInUp;
   animation-name: slideInUp;
 }
 
+.reveal-modal.fade.in {
+  opacity: 1;
+}
+
 input[type="color"],
 input[type="date"],
 input[type="datetime-local"],
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 317d99aeb..49f6528c5 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -106,7 +106,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
     });
   };
 
-  $scope.openTxModal = function(tx, copayers) {
+  this.openTxpModal = function(tx, copayers) {
     var fc = profileService.focusedClient;
     var ModalInstanceCtrl = function($scope, $modalInstance) {
       $scope.error = null;