diff --git a/public/views/modals/search.html b/public/views/modals/search.html index 0f9bd863a..497061603 100644 --- a/public/views/modals/search.html +++ b/public/views/modals/search.html @@ -1,11 +1,11 @@ - - - - Close - + + + Close + + + Search Transactions - Search Transactions @@ -18,14 +18,33 @@ - - - - - - + - + + + + + - + + (possible double spend) + + + {{btx.amountStr}} + + + + {{btx.time * 1000 | amTimeAgo}} + + Unconfirmed + + + + + + + + + {{btx.note.body}} @@ -49,31 +68,8 @@ Invalid - + - - - + - - - - (possible double spend) - - - {{btx.amountStr}} - - - - {{btx.time * 1000 | amTimeAgo}} - - Unconfirmed - - - - - - - {{filteredTxHistory.length - txHistorySearchResults.length}} more diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 48a92f8c6..3052c391d 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -1,163 +1,159 @@ - - - - Close - + + + Close + + + Transaction - Transaction - - - - - - - Received - - - - Sent - - - - Moved - - - - {{btx.amountStr}} - - - - {{alternativeAmountStr}} - - - {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}}) - - + + + + + + Received - - - + + + Sent + + + + Moved + + + + {{btx.amountStr}} + + + + {{alternativeAmountStr}} + + + {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}}) + + + - + + - Details - - - - To - - - {{btx.merchant.domain}} - {{btx.merchant.domain}} - - - {{btx.labelTo}} - - + + Details + + To + + + {{btx.merchant.domain}} + {{btx.merchant.domain}} - - - - Recipients - {{btx.recipientCount}} - - + + {{btx.labelTo}} + - + + - - + + Recipients + {{btx.recipientCount}} + + + + - - - This transaction has become invalid; possibly due to a double spend attempt. - - - - - Date - - {{ btx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}} - ({{ btx.time * 1000 | amTimeAgo}}) - - - - - Fee - {{btx.feeStr}} - - - - Description - {{btx.message}} - - - - Merchant message - - {{btx.merchant.pr.pd.memo}} - - - - - Confirmations - - - Unconfirmed - - - {{btx.confirmations}} - - - {{btx.safeConfirmed}} - - - - - - Comment - {{btx.note.body}} - - Edited by {{btx.note.editedByName}}, - {{btx.note.editedOn * 1000 | amTimeAgo}} - - - - - - Participants - - - - - - - - {{c.copayerName}} ({{'Me'|translate}}) - - + - - - - See it on the blockchain - - - Add comment - Edit comment - - + + + This transaction has become invalid; possibly due to a double spend attempt. + + + + + Date + + {{ btx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}} + ({{ btx.time * 1000 | amTimeAgo}}) + + + + + Fee + {{btx.feeStr}} + + + + Description + {{btx.message}} + + + + Merchant message + + {{btx.merchant.pr.pd.memo}} + + + + + Confirmations + + + Unconfirmed + + + {{btx.confirmations}} + + + {{btx.safeConfirmed}} + + + + + + Comment + {{btx.note.body}} + + Edited by {{btx.note.editedByName}}, + {{btx.note.editedOn * 1000 | amTimeAgo}} + + + + + + Participants + + + + + + {{c.copayerName}} ({{'Me'|translate}}) + + + + + + + See it on the blockchain + + + + + Add comment + Edit comment + diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html index af12277a0..c04b0a380 100644 --- a/public/views/modals/txp-details.html +++ b/public/views/modals/txp-details.html @@ -1,118 +1,102 @@ - - - - Close - + + + Close + + + Payment Proposal - Payment Proposal - - - - + {{tx.amountStr}} {{tx.alternativeAmountStr}} - + - Multiple recipients - - - - - The payment was removed by creator - + + + The payment was removed by creator - - + - - - - Reject - - - - Accept + + + + Reject + + + + Accept + + + + + + + Payment accepted, but not yet broadcasted + + + + Broadcast Payment - - - - - - - Payment accepted, but not yet broadcasted - - - - Broadcast Payment - - - - Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created. - - Payment Sent - Payment Rejected + + Payment accepted. It will be broadcasted by Glidera. In case there is a problem, it can be deleted 6 hours after it was created. - - - Details + Payment Sent + Payment Rejected + - - + + Details + Description {{tx.message}} - + Recipients {{tx.recipientCount}} - - + + - - + Fee {{tx.feeStr}} - + Time {{ (tx.ts || tx.createdOn ) * 1000 | amTimeAgo}} - + Created by {{tx.creatorName}} - - - Warning: this transaction has unconfirmed inputs - - - + + Warning: this transaction has unconfirmed inputs + - - Payment details - - + + Payment details + To @@ -122,56 +106,48 @@ - + Expired {{tx.paypro.expires * 1000 | amTimeAgo }} - + Expires {{expires}} - + Merchant Message {{tx.paypro.pr.pd.memo}} - - + - - - - - {{tx.requiredSignatures}}/{{tx.walletN}} + + + + {{tx.requiredSignatures}}/{{tx.walletN}} + + Participants - Participants - - - - - - - + + + + {{ac.copayerName}} ({{'Me'|translate}}) - - - - - - - * A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created. - - - Delete Payment Proposal - - - + + + + * A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created. + + + + Delete Payment Proposal + diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html index f7d2942a1..92276b712 100644 --- a/public/views/tab-settings.html +++ b/public/views/tab-settings.html @@ -6,10 +6,9 @@ - + Address Book - Preferences diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html index 0bef1c79b..3bd314da6 100644 --- a/public/views/walletDetails.html +++ b/public/views/walletDetails.html @@ -84,29 +84,23 @@ - - Payment Proposals - Unsent transactions - - - - - - - - - Total Locked Balance: - {{lockedBalanceStr}} - {{lockedBalanceAlternative}} {{alternativeIsoCode}} - + + + Payment Proposals + Unsent transactions + + + + + - - Activity - - - - - - - - - - - - - {{btx.note.body}} - Received - - - - - - {{btx.message}} - {{btx.note.body}} - {{wallet.addressbook[btx.addressTo]}} - Sent - - - - - - {{btx.note.body}} - Moved - - - Invalid - - - + + + + - @@ -191,11 +153,37 @@ Unconfirmed - + + + + + + + + + {{btx.note.body}} + Received + + + + + + {{btx.message}} + {{btx.note.body}} + {{wallet.addressbook[btx.addressTo]}} + Sent + + + + + + {{btx.note.body}} + Moved + + + Invalid + - - -
+ {{btx.time * 1000 | amTimeAgo}} + + Unconfirmed + +
- {{btx.time * 1000 | amTimeAgo}} - - Unconfirmed - -
Received
Sent
Moved