Merge pull request #94 from ultiledger/dev

Dev

README.md

@@ -48,6 +48,7 @@ cordova plugin add cordova-plugin-android-permissions
 cordova plugin add cordova-plugin-file-opener2
 cordova plugin add cordova-plugin-device
 cordova plugin add cordova-plugin-file-transfer
+cordova plugin add cordova-plugin-statusbar
 cordova build android
 ```
 

src/main.js

@@ -141,6 +141,10 @@ router.router.instance.afterEach(() => {
   backbuttonHandler.clearLayer();
 });
 document.addEventListener('deviceready', function () {
+  // 需要配合cordova-plugin-statusbar使用
+  if (window.StatusBar) {
+    window.StatusBar.styleDefault();
+  }
   // 需要deviceready之后
   document.addEventListener('backbutton', backbuttonHandler.handleBackbuttonEvent, false);
   loadData(() => {

src/pages/assets/popup/assets-add-ripple-pop.vue

@@ -112,7 +112,7 @@
         let configAssets = this.getConfigAssets(type);
         let configAssetsArray=[];
         configAssets.forEach(item => {
-          if (item.issuer && item.issuer === this.$store.state.account.address && item.code === this.$store.state.account.type ){
+          if (item.issuer && item.issuer === this.$store.state.account.address){
             return;
           }
           configAssetsArray.push({

src/pages/find/find.vue

@@ -58,6 +58,13 @@
             link: 'https://wipple.devnull.network/live/accounts',
             imgUrl: 'static/img/[email protected]'
           },
+          {
+            title: this.$t('find.xrpTitle'),
+            subTitle: this.$t('find.xrpSubTitle'),
+            desc: this.$t('find.xrpDesc'),
+            link: 'https://xrpscan.com',
+            imgUrl: 'static/img/[email protected]'
+          },
           {
             title: this.$t('find.xmlTitle'),
             subTitle: this.$t('find.xmlSubTitle'),

src/pages/history/tx-history-ripple.vue

@@ -37,6 +37,7 @@
 <script>
   import moment from 'moment';
   import history from './mixns/history';
+  import coins from 'src/wallet/coins';
   export default{
     mixins: [history],
     data () {
@@ -112,16 +113,15 @@
           console.info(err);
         });
       },
+      shortType (type) {
+        return coins[type].symbol || type;
+      },
       filterHistory () {
         if (this.normalHistory && this.normalHistory.length > 0) {
           let address = this.$store.state.account.address;
           let acctType = this.$store.state.account.type;
           this.normalHistory = this.normalHistory.filter(item => {
-            if (this.asset.issuer) {
-              return item.assetCode === this.asset.code && item.assetIssuer === this.asset.issuer && item.address === address && item.acctType === acctType;
-            } else {
-              return item.assetCode === this.asset.code && item.address === address && item.acctType === acctType;
-            }
+            return item.assetCode === this.asset.code && item.address === address && item.acctType === acctType;
           });
         }
       },
@@ -145,12 +145,16 @@
         let amount = data.meta.delivered_amount;
         if (data.meta.delivered_amount instanceof Object) {
           amount = data.meta.delivered_amount.value;
-          assetIssuer = data.meta.delivered_amount.issuer;
+          if (toAddress === data.meta.delivered_amount.issuer && this.$store.state.account.address === data.meta.delivered_amount.issuer) {
+            assetIssuer = fromAddress;
+          } else {
+            assetIssuer = data.meta.delivered_amount.issuer;
+          }
           assetCode = data.meta.delivered_amount.currency;
-          fromAddress = data.meta.delivered_amount.issuer;
+          // fromAddress = data.meta.delivered_amount.issuer;
         } else {
           amount = data.meta.delivered_amount / 1000000;
-          assetCode = this.asset.code;
+          assetCode = this.shortType(this.$store.state.account.type);
         }
         let history = {
           address: this.$store.state.account.address,