upstream merge fix

8 years ago · f223ad2f0c
3 changed files with 4117 additions and 24 deletions
--- a/assets/scripts/dashboard.js
+++ b/assets/scripts/dashboard.js
--- a/assets/scripts/iguana_api.js
+++ b/assets/scripts/iguana_api.js
--- a/index.html
+++ b/index.html
@ -983,11 +983,11 @@
            <div class="panel-body container-fluid">
              <form class="edexcoin-send-form" data-edexcoin="COIN" method="post" role="form" autocomplete="off" onsubmit="return false;">
                <div class="row">
-                  <!--<div class="col-xlg-12 form-group form-material">
+                  <div class="col-xlg-12 form-group form-material edexcoin_send_from_for_basilisk">
                    <label class="control-label" data-edexcoin="COIN" for="edexcoin_send_from">Send From</label>
                    <select class="form-control form-material showedexcoinaddrs show-tick" data-edexcoin="COIN" id="edexcoin_send_from" title="Select Transparent or Private Address" data-size="5">
                    </select>
-                  </div>-->
+                  </div>
                  <div class="col-xlg-12 form-group form-material">
                    <label class="control-label" data-edexcoin="COIN" for="edexcoin_sendto">Send To</label>
                    <input type="text" class="form-control" data-edexcoin="COIN" id="edexcoin_sendto" name="edexcoin_sendto" placeholder="Enter address" autocomplete="off" required/>