Merge pull request #172 from paytaca/release/v0.17.0

Release/v0.17.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "paytaca",
-  "version": "0.16.8",
+  "version": "0.17.0",
   "description": "Secure and convenient Bitcoin Cash wallet app",
   "productName": "Paytaca",
   "author": "[email protected]",
@@ -75,7 +75,7 @@
     "vuex": "^4.0.2",
     "vuex-persist": "^3.1.3",
     "vuex-persistedstate": "^4.0.0-beta.2",
-    "watchtower-cash-js": "^0.1.44"
+    "watchtower-cash-js": "^0.1.46"
   },
   "overrides": {
     "@generalprotocols/[email protected]": {

src-capacitor/android/app/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 72
-        versionName "v0.16.8"
+        versionName "v0.17.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

src-capacitor/ios/App/App.xcodeproj/project.pbxproj

@@ -359,12 +359,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 76;
+				CURRENT_PROJECT_VERSION = 79;
 				DEVELOPMENT_TEAM = 89X576BZBF;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.16.8;
+				MARKETING_VERSION = 0.17.0;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.paytaca.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -381,12 +381,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/AppRelease.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 76;
+				CURRENT_PROJECT_VERSION = 79;
 				DEVELOPMENT_TEAM = 89X576BZBF;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.16.8;
+				MARKETING_VERSION = 0.17.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.paytaca.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";

src-capacitor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paytaca",
-  "version": "0.16.8",
+  "version": "0.17.0",
   "description": "Secure and convenient Bitcoin Cash wallet app",
   "author": "[email protected]",
   "private": true,

src/components/AssetFilter.vue

@@ -6,17 +6,17 @@
     :style="{color: darkMode ? 'white' : 'black'}"
   >
     <template v-slot:label>
-      <TokenTypeBadge :assetId="assetId" />
+      <TokenTypeBadge :assetId="assetId" :currentCountry="currentCountry" />
     </template>
     <q-list>
       <q-item clickable v-close-popup @click="filterTokens('ct')">
         <q-item-section>
-          <q-item-label>{{ $t('CashTokens') }}</q-item-label>
+          <q-item-label>{{ $t(this.isHongKong() ? 'CashPoints' : 'CashTokens') }}</q-item-label>
         </q-item-section>
       </q-item>
       <q-item clickable v-close-popup @click="filterTokens('slp')">
         <q-item-section>
-          <q-item-label>{{ $t('SLPTokens') }}</q-item-label>
+          <q-item-label>{{ $t(this.isHongKong() ? 'SLPPoints' : 'SLPTokens') }}</q-item-label>
         </q-item-section>
       </q-item>
     </q-list>
@@ -33,13 +33,17 @@ export default {
   data () {
     return {
       assetId: 'ct',
-      darkMode: this.$store.getters['darkmode/getStatus']
+      darkMode: this.$store.getters['darkmode/getStatus'],
+      currentCountry: this.$store.getters['global/country'].code
     }
   },
   methods: {
     filterTokens (tokenType) {
       this.assetId = tokenType
       this.$emit('filterTokens', tokenType === 'ct')
+    },
+    isHongKong () {
+      return this.currentCountry === 'HK'
     }
   },
   computed: {

src/components/TokenSuggestionsDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <q-dialog v-model="val" persistent @hide="onClose()">
-    <q-card class="q-dialog-plugin br-15 pt-card" :class="getDarkModeClass()">
+    <q-card class="q-dialog-plugin br-15 pt-card" :class="getDarkModeClass(darkMode)">
       <div class="row items-center no-wrap q-pb-sm">
         <div :class="['q-ml-md', darkMode ? 'text-white' : 'text-black']">
           <template v-if="loading">{{ $t('FindingUnlistedAssets') }}</template>
@@ -18,15 +18,15 @@
 
       <q-btn
         v-if="!loading"
-        :label="$t('ViewIgnoredTokens')"
+        :label="$t(isHongKong(currentCountry) ? 'ViewIgnoredPoints' : 'ViewIgnoredTokens')"
         no-caps
         flat
         padding="none"
         size="sm"
         icon="mdi-eye"
         class="q-mx-md button button-text-primary"
         :text-color="darkMode ? 'blue-5' : 'blue-9'"
-        :class="getDarkModeClass()"
+        :class="getDarkModeClass(darkMode)"
         style="margin-top:-1.5rem;"
         :to="{
           path: '/apps/settings/ignored-tokens',
@@ -41,26 +41,26 @@
             class="col-12 q-px-sm q-pb-md"
             v-model="selectedNetwork"
             style="padding-bottom: 16px;"
-            :indicator-color="isDefaultTheme && 'transparent'"
+            :indicator-color="isDefaultTheme(theme) && 'transparent'"
           >
             <q-tab
               name="BCH"
               class="network-selection-tab"
-              :class="getDarkModeClass()"
+              :class="getDarkModeClass(darkMode)"
               :label="'BCH' + (parsedMainchainTokens.length ? ` (${parsedMainchainTokens.length})` : '')"
             />
             <q-tab
               name="sBCH"
               class="network-selection-tab"
-              :class="getDarkModeClass()"
+              :class="getDarkModeClass(darkMode)"
               :label="'SmartBCH' + (parsedSmartchainTokens.length ? ` (${parsedSmartchainTokens.length})` : '')"
             />
           </q-tabs>
           <q-list style="max-height:45vh;overflow-y:auto;">
             <template v-for="(token, index) in parsedTokens"  :key="index">
               <q-item
                 :class="[
-                  isAssetInIgnoredList(token.id) ? 'text-grey' : getDarkModeClass('text-white', 'text-black'),
+                  isAssetInIgnoredList(token.id) ? 'text-grey' : darkMode ? 'text-white' : 'text-black',
                 ]"
               >
                 <q-item-section v-if="token.logo" side>
@@ -104,7 +104,7 @@
           </q-list>
         </template>
         <div v-else-if="loading" class="column items-center justify-center">
-          <ProgressLoader :color="isDefaultTheme ? theme : 'pink'"/>
+          <ProgressLoader :color="isDefaultTheme(theme) ? theme : 'pink'"/>
           <div :class="darkMode ? 'text-white' : 'text-grey'">
             {{ $t('SearchingForOtherAssets') }}
           </div>
@@ -117,7 +117,7 @@
             'text-center',
           ]"
         >
-          {{ $t('NoTokensFound') }}
+          {{ $t(isHongKong(currentCountry) ? 'NoPointsFound' : 'NoTokensFound') }}
         </div>
       </q-card-section>
       <q-card-section class="row q-gutter-sm justify-around">
@@ -136,6 +136,8 @@
 <script>
 import ProgressLoader from './ProgressLoader.vue'
 import TokenTypeBadge from './TokenTypeBadge.vue'
+import { getDarkModeClass, isDefaultTheme, isHongKong } from 'src/utils/theme-darkmode-utils'
+
 
 export default {
   name: 'TokenSuggestionsDialog',
@@ -171,12 +173,21 @@ export default {
     darkMode () {
       return this.$store.getters['darkmode/getStatus']
     },
+    currentCountry () {
+      return this.$store.getters['global/country'].code
+    },
+    denomination () {
+      return this.$store.getters['global/denomination']
+    },
+    theme () {
+      return this.$store.getters['global/theme']
+    },
     enableSmartBCH () {
       return this.$store.getters['global/enableSmartBCH']
     },
     parsedTokens () {
-      if (this.selectedNetwork === 'BCH') return this.parsedMainchainTokens
-      if (this.selectedNetwork === 'sBCH') return this.parsedSmartchainTokens
+      if (this.selectedNetwork === 'BCH') return this.parseTokenName(this.parsedMainchainTokens)
+      if (this.selectedNetwork === 'sBCH') return this.parseTokenName(this.parsedSmartchainTokens)
       return []
     },
     parsedMainchainTokens () {
@@ -214,15 +225,12 @@ export default {
           }
         })
         .filter(Boolean)
-    },
-    isDefaultTheme () {
-      return this.$store.getters['global/theme'] !== 'default'
-    },
-    theme () {
-      return this.$store.getters['global/theme']
     }
   },
   methods: {
+    getDarkModeClass,
+    isDefaultTheme,
+    isHongKong,
     isMainchainAsset (assetId) {
       if (Array.isArray(this.$store.getters['assets/getAssets'])) {
         return this.$store.getters['assets/getAssets'].some(asset => asset && asset.id === assetId)
@@ -322,7 +330,7 @@ export default {
               handler: () => { /* ... */ }
             },
             {
-              label: this.$t('ViewTokens'),
+              label: this.$t(this.isHongKong(this.currentCountry) ? 'ViewPoints' : 'ViewTokens'),
               color: 'white',
               handler: () => {
                 this.val = true
@@ -339,6 +347,16 @@ export default {
     },
     getDarkModeClass (darkModeClass = '', lightModeClass = '') {
       return this.darkMode ? `dark ${darkModeClass}` : `light ${lightModeClass}`
+    },
+    parseTokenName (ignoredList) {
+      // copy to remove binding from state
+      const ignoredListCopy = JSON.parse(JSON.stringify(ignoredList))
+      if (ignoredListCopy.length > 0 && this.isHongKong(this.currentCountry)) {
+        ignoredListCopy.forEach(token => {
+          token.name = token.name.replace('Token', 'Point')
+        })
+      }
+      return ignoredListCopy
     }
   },
   watch: {

src/components/TokenTypeBadge.vue

@@ -14,7 +14,8 @@ export default {
     abbreviate: {
       type: Boolean,
       default: false
-    }
+    },
+    currentCountry: { type: String }
   },
   computed: {
     labelStyle () {
@@ -26,20 +27,25 @@ export default {
     tokenType () {
       const assetId = this.assetId.split('/')[0].toUpperCase()
       if (assetId === 'CT') {
-        if (!this.abbreviate) return this.$t('CashTokens')
+        if (!this.abbreviate) return this.$t(this.isHongKong() ? 'CashPoints' : 'CashTokens')
       }
       if (assetId === 'SLP') {
         if (this.abbreviate) return 'SLP'
-        return this.$t('SLPTokens')
+        return this.$t(this.isHongKong() ? 'SLPPoints' : 'SLPTokens')
       }
       return assetId
     },
     color () {
       const type = this.tokenType
-      if ([this.$t('CashTokens'), 'CT'].includes(type))
+      if ([this.$t(this.isHongKong() ? 'CashPoints' : 'CashTokens'), 'CT'].includes(type))
         return 'green-7'
       return 'blue-5'
     },
+  },
+  methods: {
+    isHongKong () {
+      return this.currentCountry === 'HK'
+    }
   }
 }
 </script>

src/components/anyhedge/AddLiquidityForm.vue

@@ -12,7 +12,7 @@
       outlined
       dense
       label="Allowance"
-      suffix="BCH"
+      :suffix="denomination"
       :disable="loading"
       inputmode="decimal"
       v-model="addLiquidityForm.approvedAmount"
@@ -75,6 +75,7 @@ import DurationField from './DurationField.vue';
 // misc
 const $store = useStore()
 const darkMode = computed(() => $store.getters['darkmode/getStatus'])
+const denomination = computed(() => $store.getters['global/denomination'])
 
 const $emit = defineEmits(['cancel', 'new-long-account', 'update-long-account'])