diff --git a/cordova/build.sh b/cordova/build.sh index 6a99d667b..a39271a78 100755 --- a/cordova/build.sh +++ b/cordova/build.sh @@ -155,6 +155,8 @@ if [ ! -d $PROJECT ]; then cordova plugin add cordova-plugin-disable-bitcode checkOK + ## Fix plugin android-fingerprint + rm -rf $PROJECT/platforms/android/res/values-es cordova plugin add cordova-plugin-android-fingerprint-auth checkOK diff --git a/public/views/includes/transaction.html b/public/views/includes/transaction.html index 4b3fa3fcb..b294a855b 100644 --- a/public/views/includes/transaction.html +++ b/public/views/includes/transaction.html @@ -1,4 +1,4 @@ -
@@ -7,19 +7,21 @@ sync
- - {{index.addressbook[tx.toAddress]}} - - {{tx.message}} +
+ + {{index.addressbook[tx.toAddress]}} - - Sending + + {{tx.message}} - - + + Sending + +
+
{{tx.merchant.domain}} {{tx.merchant.domain}} - +
diff --git a/public/views/walletHome.html b/public/views/walletHome.html index d74f7919b..ae0d527a5 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -34,8 +34,9 @@ --> - - +
+
-
+
@@ -117,12 +118,11 @@ {{newRelease}}
-
+

Payment Proposals

Unsent transactions

-
-
+
-
- {{index.completeHistory.length - index.txHistory.length}} more -   - -
-
- +