Merge branch 'develop' of github.com:LedgerHQ/ledger-wallet-chrome in…

…to develop
LedgerHQ · Oct 5, 2016 · 9094335 · 9094335
2 parents 3f27b88 + 2a60835
commit 9094335
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/app/assets/css/wallet/send/index.less b/app/assets/css/wallet/send/index.less
@@ -6,6 +6,10 @@ section#send_index_dialog {
     width: 300px;
   }
 
+  #data_input {
+    width: 300px;
+  }
+
   #max_button {
     margin-left: 8px;
     margin-top: -20px;

diff --git a/app/locales/en/messages.properties b/app/locales/en/messages.properties
@@ -68,6 +68,7 @@ common.errors.network_error = Network error.
  # %s is replaced by the coin name (i.e. bitcoin, litecoin)
 common.errors.invalid_receiver_address = The recipient %s address is incorrect.
 common.errors.invalid_amount = The amount to send is invalid.
+common.errors.invalid_op_return_data = The OP_RETURN data is invalid (must be HEX)
 common.errors.unknown = An unknown error occured.
 common.errors.unable_to_validate = Unable to validate transaction.
 common.errors.secure_screen_cancelled_transaction = The smartphone cancelled the transaction.
@@ -371,6 +372,7 @@ wallet.defaults.operations.countervalue = Countervalue
 wallet.defaults.operations.status = Status
 wallet.defaults.operations.identifier = Identifier
 wallet.defaults.operations.transaction_fees = Transaction fees
+wallet.defaults.operations.data = DATA (OP_RETURN)
 
 # Wallet Dialog Add Account
 wallet.dialogs.addaccount.add_an_account = Add an account

diff --git a/app/src/controllers/wallet/send/wallet_send_index_dialog_view_controller.coffee b/app/src/controllers/wallet/send/wallet_send_index_dialog_view_controller.coffee
@@ -27,7 +27,7 @@ class @WalletSendIndexDialogViewController extends ledger.common.DialogViewContr
       @view.amountInput.val @params.amount
     if @params.address?
       @view.receiverInput.val @params.address
-    if @params.data?
+    if @params.data? && @params.data.length > 0
       @view.dataInput.val @params.data
       @view.dataRow.show()
 
@@ -148,12 +148,18 @@ class @WalletSendIndexDialogViewController extends ledger.common.DialogViewContr
   _dataValue: ->
     @view.dataInput.val()
 
+  _isDataValid: ->
+    s = @_dataValue()
+    s.match(/^[a-f0-9]+$/i) != null && s.length % 2 == 0 && s.length <= 160
+
   _nextFormError: ->
     # check amount
     if @_transactionAmount().length == 0 or not ledger.Amount.fromSatoshi(@_transactionAmount()).gt(0)
       return t 'common.errors.invalid_amount'
     else if not Bitcoin.Address.validate @_receiverBitcoinAddress()
       return _.str.sprintf(t('common.errors.invalid_receiver_address'), ledger.config.network.name)
+    else if @_dataValue().length > 0 && not @_isDataValid()
+      return t 'common.errors.invalid_op_return_data'
     undefined
 
   _updateFeesSelect: ->

diff --git a/app/views/wallet/send/index.eco b/app/views/wallet/send/index.eco
@@ -22,7 +22,7 @@
         </td>
       </tr>
       <tr id="data_row">
-        <td class="row-title">DATA (OP_RETURN)</td>
+        <td class="row-title"><%= t 'wallet.defaults.operations.data' %></td>
         <td class="align-right">
           <input class="text-input" id="data_input" value=""/>
         </td>