Merge pull request #1228 from eordano/feature/fiat

Allow user to select an alternative currency and specify amount of money in a fiat currency

views/includes/sidebar.html

@@ -24,10 +24,9 @@
         class="has-tip"
         data-options="disable_for_touch:true"
         tooltip-popup-delay='500'
-        tooltip="{{totalBalanceBTC |noFractionNumber:8}} BTC"
+        tooltip="{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}"
         tooltip-trigger="mouseenter"
-        tooltip-placement="bottom">{{totalBalance || 0
-        |noFractionNumber}} {{$root.unitName}} 
+        tooltip-placement="bottom">{{totalBalance || 0 |noFractionNumber}} {{$root.unitName}}
       </span>
       <br>
       Locked &nbsp;
@@ -38,7 +37,7 @@
         class="has-tip"
         data-options="disable_for_touch:true"
         tooltip-popup-delay='500'
-        tooltip="{{lockedBalanceBTC |noFractionNumber:8}} BTC"
+        tooltip="{{lockedBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}"
         tooltip-trigger="mouseenter"
         tooltip-placement="bottom">{{lockedBalance || 0|noFractionNumber}} {{$root.unitName}}
       </span> &nbsp;<i class="fi-info medium" tooltip="Balance locked in pending transaction proposals" tooltip-placement="bottom"></i>

views/send.html

@@ -83,6 +83,22 @@
               </div>
             </div>
           </div>
+          <div class="large-6 medium-6 columns">
+            <div class="row collapse">
+              <label for="alternative">Amount in {{ alternativeName }} </label>
+              <div class="small-9 columns">
+                <input type="number" id="alternative_amount"
+                ng-disabled="loading || !isRateAvailable "
+                name="alternative" placeholder="Amount" ng-model="alternative"
+                enough-amount required
+                autocomplete="off"
+                >
+              </div>
+              <div class="small-3 columns">
+                <span class="postfix">{{alternativeIsoCode}}</span>
+              </div>
+            </div>
+          </div>
         </div>
 
         <div class="row" ng-show="wallet.isShared()">
@@ -110,7 +126,7 @@
       </form>
     </div>
 
-    <div class="large-6 columns show-for-large-up">
+    <div class="large-6 columns show-for-large-up" ng-show="!!$root.merchant">
       <div class="send-note">
         <h6>Send to</h6>
         <p class="text-gray" ng-class="{'hidden': sendForm.address.$invalid || !address}">
@@ -119,8 +135,11 @@
         <h6>Total amount for this transaction:</h6>
         <p class="text-gray" ng-class="{'hidden': sendForm.amount.$invalid || !amount > 0}">
         <b>{{amount + defaultFee |noFractionNumber}}</b> {{$root.unitName}}
+        <small ng-if="isRateAvailable">
+          {{ rateService.toFiat((amount + defaultFee) * unitToSatoshi, alternativeIsoCode) | noFractionNumber: 2 }} {{ alternativeIsoCode }}
+        <br>
+        </small>
         <small>
-          {{ ((amount + defaultFee) * unitToBtc)|noFractionNumber:8}} BTC <br/>
           Including fee of {{defaultFee|noFractionNumber}} {{$root.unitName}}
         </small>
         </p>

views/settings.html

@@ -26,6 +26,11 @@
             <select class="form-control" ng-model="selectedUnit" ng-options="o.name for o in unitOpts" required>
             </select>
           </fieldset>
+          <fieldset>
+            <legend>Alternative Currency</legend>
+            <select class="form-control" ng-model="selectedAlternative" ng-options="alternative.name for alternative in alternativeOpts" required>
+            </select>
+          </fieldset>
           <fieldset>
             <legend>Videoconferencing</legend>
             <input id="disableVideo-opt" type="checkbox" ng-model="disableVideo" class="form-control">