Merge pull request #2377 from bechi/bugs/locked

Bugs/locked

cordova/config.xml

@@ -18,7 +18,7 @@
     <preference name="SplashScreenDelay" value="10000" />
     <preference name="BackgroundColor" value="#2C3E50" />
     <preference name="StatusBarOverlaysWebView" value="false" />
-    <preference name="StatusBarBackgroundColor" value="#3C4E60" />
+    <preference name="StatusBarBackgroundColor" value="#2C3E50" />
     <preference name="StatusBarStyle" value="lightcontent" />
     <preference name="BackupWebStorage" value="none"/>
     <preference name="windows-target-version" value="8.1"/>

css/src/main.css

@@ -4,6 +4,11 @@
  *
  */
 
+
+.panel h1, .panel h2, .panel h3, .panel h4, .panel h5, .panel h6, .panel p {
+  color: #2C3E50;
+}
+
 body, div, .row {
   -webkit-overflow-scrolling: touch;
 };

css/src/mobile.css

@@ -103,7 +103,7 @@
     position: fixed;
     width: 100%;
     z-index: 5;
-    background: #3C4E60;
+    background: #2C3E50;
   }
 
   .bottom-bar {

views/send.html

@@ -1,4 +1,16 @@
 <div class="send" ng-controller="SendController" ng-init="init()">
+  <div class="columns" ng-show="$root.wallet.balanceInfo.lockedBalance && !walletSelection">
+    <div class="panel">
+      <div class="left">
+        <i class="fi-info size-42 m10r"></i>
+      </div>
+      <div>
+        <p class="m0 size-14 text-bold">Available Balance: {{$root.wallet.balanceInfo.availableBalance}} {{$root.wallet.settings.unitName}}</p>
+        <span class="size-12 text-gray">{{$root.wallet.balanceInfo.lockedBalance}} {{$root.wallet.settings.unitName}} in pending transactions</span>
+      </div>
+    </div>
+  </div>
+
   <div class="row show-for-large-up">
     <div class="large-8 large-centered columns">
       <h1>{{$root.title}}</h1>
@@ -164,17 +176,6 @@
           </div>
         </div>
       </form>
-      <div class="locked m10b" ng-show="$root.wallet.balanceInfo.lockedBalance && !walletSelection">
-        <i class="fi-lock"></i>
-        <span>
-          {{'Locked'|translate}} &nbsp;
-        </span>
-        <span ng-if="$root.wallet.balanceInfo.updatingBalance"><i class="fi-bitcoin-circle icon-rotate spinner"></i></span>
-        <span ng-if="$root.wallet && !$root.wallet.balanceInfo.updatingBalance">
-          <b>{{$root.wallet.balanceInfo.lockedBalance}} {{$root.wallet.settings.unitName}} </b> 
-          - {{$root.wallet.balanceInfo.lockedBalanceAlternative}} {{$root.wallet.balanceInfo.alternativeIsoCode}}
-        </span>
-      </div>
     </div>
   </div>
   <!--  end of row -->