Merge pull request #1195 from aeternity/release/v0.10.2

Release 0.10.2
aeternity · Sep 19, 2019 · b607048 · b607048
2 parents cf8681e + a80086e
commit b607048
Show file tree

Hide file tree

Showing 18 changed files with 576 additions and 1,238 deletions.
diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.aeternity.base" version="0.10.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.aeternity.base" version="0.10.2" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Base æpp</name>
     <author href="https://aeternity.com">
         aeternity developers

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aepp-base",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "author": "Sascha Hanse <[email protected]>",
   "private": true,
   "scripts": {
@@ -21,12 +21,12 @@
     "i18n:report": "vue-i18n-extract report --vueFiles './src/**/*.?(js|vue)' --languageFiles './src/locales/**/*.json'"
   },
   "dependencies": {
-    "@aeternity/aepp-sdk": "^4.6.0",
+    "@aeternity/aepp-sdk": "^4.7.0",
     "@aeternity/bip39": "^0.1.0",
     "@aeternity/hd-wallet": "^0.2.0",
     "@aeternity/ledger-app-api": "0.1.0",
     "@download/blockies": "^1.0.3",
-    "@ledgerhq/hw-transport-u2f": "^4.68.4",
+    "@ledgerhq/hw-transport-u2f": "^4.70.0",
     "@zxing/library": "^0.15.1",
     "bignumber.js": "^9.0.0",
     "bluebird": "^3.5.5",
@@ -37,16 +37,16 @@
     "lodash-es": "^4.17.15",
     "normalize.css": "^8.0.1",
     "register-service-worker": "^1.6.2",
-    "rxjs": "^6.5.2",
+    "rxjs": "^6.5.3",
     "rxjs-etc": "^9.6.2",
     "socket.io-client": "^2.2.0",
     "vee-validate": "^2.2.15",
     "vue": "^2.6.10",
     "vue-clickaway": "^2.2.2",
     "vue-focus": "^2.1.0",
-    "vue-i18n": "^8.14.0",
+    "vue-i18n": "^8.14.1",
     "vue-matomo": "^3.9.1-2",
-    "vue-router": "^3.1.2",
+    "vue-router": "^3.1.3",
     "vue-rx": "^6.2.0",
     "vuex": "^3.1.1",
     "vuex-persistedstate": "^2.5.4",
@@ -81,7 +81,7 @@
     "sass-loader": "^7.3.1",
     "serve": "^11.1.0",
     "sharp": "^0.22.1",
-    "svg-url-loader": "^3.0.0",
+    "svg-url-loader": "^3.0.2",
     "svgo": "^1.3.0",
     "svgo-loader": "^2.2.1",
     "vue-cli-plugin-i18n": "^0.6.0",

diff --git a/src/assets/icons/aepps/pay-me-customer-aepp.png b/src/assets/icons/aepps/pay-me-customer-aepp.png
diff --git a/src/assets/icons/aepps/pay-me-merchant-aepp.png b/src/assets/icons/aepps/pay-me-merchant-aepp.png
diff --git a/src/components/mobile/ConfirmSignModal.vue b/src/components/mobile/ConfirmSignModal.vue
@@ -16,7 +16,7 @@
     </Guide>
 
     <DetailsRawData
-      name="Data to sign"
+      :name="$t('modal.confirm-sign.data')"
       :data="data"
     />
 

diff --git a/src/components/mobile/ConfirmTransactionSignModal.vue b/src/components/mobile/ConfirmTransactionSignModal.vue
@@ -165,7 +165,7 @@ export default {
           functional: true,
           render: (createElement, { props: { value } }) => createElement(DetailsField, {
             attrs: {
-              name: 'Name',
+              name: this.$t('name.details.name'),
               value: Crypto.decodeBase58Check(Crypto.assertedType(value, 'nm')).toString().replace(AENS_DOMAIN, ''),
             },
           }),
@@ -184,10 +184,7 @@ export default {
       if (!this.isEnoughFounds) {
         await this.$store.dispatch('modals/open', {
           name: 'confirm',
-          text: `
-            Looks like you don't have enough funds to make this transaction.
-            Are you sure want to continue?
-          `,
+          text: this.$t('modal.confirm-transaction-sign.confirm-message'),
         });
       }
       this.resolve(this.newFee);

diff --git a/src/components/mobile/TabBar.vue b/src/components/mobile/TabBar.vue
@@ -3,7 +3,10 @@
     <ConnectionStatus />
 
     <div class="wrapper">
-      <ButtonPlain :to="browserPath || { name: 'apps' }">
+      <ButtonPlain
+        v-if="!$globals.DISABLED_BROWSER"
+        :to="browserPath || { name: 'apps' }"
+      >
         <Grid />
         <div>{{ $t('app.title') }}</div>
       </ButtonPlain>
@@ -13,6 +16,14 @@
         <div>{{ $t('transfer.title') }}</div>
       </ButtonPlain>
 
+      <ButtonPlain
+        v-if="$globals.DISABLED_BROWSER"
+        :to="{ name: 'transaction-list' }"
+      >
+        <List />
+        <div>{{ $t('transfer.transaction.title') }}</div>
+      </ButtonPlain>
+
       <ButtonPlain
         :class="showAccountSwitcher ? 'router-link-active' : ''"
         @click="accountSwitcher"
@@ -37,7 +48,7 @@
 import { mapState, mapGetters } from 'vuex';
 import ButtonPlain from '../ButtonPlain.vue';
 import {
-  Grid, Transfer, Contacts, Settings,
+  Grid, Transfer, List, Contacts, Settings,
 } from '../icons';
 import AeIdenticon from '../AeIdenticon.vue';
 import ConnectionStatus from '../ConnectionStatus.vue';
@@ -49,6 +60,7 @@ export default {
     ButtonPlain,
     Grid,
     Transfer,
+    List,
     Contacts,
     Settings,
     ConnectionStatus,

diff --git a/src/lib/appsRegistry.js b/src/lib/appsRegistry.js
@@ -1,15 +1,25 @@
 import blockchainExplorerIcon from '../assets/icons/aepps/blockchain-explorer.svg';
 import tokenMigrationIcon from '../assets/icons/aepps/token-migration.jpg';
 import graffitiAeppIcon from '../assets/icons/aepps/graffiti-aepp.svg';
+import payMeCustomerAeppIcon from '../assets/icons/aepps/pay-me-customer-aepp.png';
+import payMeMerchantAeppIcon from '../assets/icons/aepps/pay-me-merchant-aepp.png';
 
 export { default as DEFAULT_ICON } from '../assets/icons/aepps/default.svg';
 
-const showGraffitiApp = new Date('2019-09-04T22:00:00.000Z').getTime() <= Date.now();
+const showPaymentApp = new Date('2019-09-24T22:00:00.000Z').getTime() >= Date.now();
 
-export const aeternityApps = [...showGraffitiApp ? [{
+export const aeternityApps = [{
   name: 'Graffiti',
   path: 'graffiti.aeternity.com',
   icon: graffitiAeppIcon,
+}, ...showPaymentApp ? [{
+  name: 'Pæy.me Customer',
+  path: 'customer.aehub.coinfabrik.com',
+  icon: payMeCustomerAeppIcon,
+}, {
+  name: 'Pæy.me Merchant',
+  path: 'merchant.aehub.coinfabrik.com',
+  icon: payMeMerchantAeppIcon,
 }] : [], {
   name: 'æternity Voting',
   path: 'aeternity.com/aepp-hybrid-voting',

diff --git a/src/lib/initEnv.js b/src/lib/initEnv.js
@@ -18,3 +18,9 @@ Object.assign(process.env, {
     RUNNING_IN_POPUP: !!window.opener && window.name === 'popup',
   },
 });
+
+Object.assign(process.env, {
+  ...process.env.DISABLED_BROWSER === undefined && {
+    DISABLED_BROWSER: process.env.IS_CORDOVA && process.env.IS_IOS,
+  },
+});
diff --git a/src/locales/cn.json b/src/locales/cn.json
@@ -161,19 +161,20 @@
     "amount": "量",
     "fee": "Fee",
 
-    "tooltips": [{
-      "selector": ".transfer .ae-account .ae-identicon",
-      "header": "相同",
-      "content": "确认哪个帐户是活动的.帐户和子帐户具有唯一的标识符."
-    }, {
-      "selector": ".transfer .tab-bar .button-plain",
-      "header": "Browse",
-      "content": "浏览器探索æternity区块链."
-    }, {
-      "selector": ".transfer .tab-bar .button-plain:nth-child(3)",
-      "header": "切换账户",
-      "content": "点击切换帐户或创建子帐户."
-    }],
+    "tooltips": {
+      "identicon": {
+        "header": "相同",
+        "content": "确认哪个帐户是活动的.帐户和子帐户具有唯一的标识符."
+      },
+      "browser": {
+        "header": "Browse",
+        "content": "浏览器探索æternity区块链."
+      },
+      "account-switcher": {
+        "header": "切换账户",
+        "content": "点击切换帐户或创建子帐户."
+      }
+    },
 
     "send": {
       "title": "发送",
@@ -452,7 +453,8 @@
 
   "modal": {
     "confirm-sign": {
-      "guide": "<primary>签署原始交易</primary><br />by <address />"
+      "guide": "<primary>签署原始交易</primary><br />by <address />",
+      "data": "Data to sign"
     },
 
     "confirm-transaction-sign": {
@@ -475,6 +477,7 @@
       "name-claim": "确定取名",
       "name-update": "更新名称",
       "name-transfer": "Transfer name",
+      "confirm-message": "Looks like you don't have enough funds to make this transaction. Are you sure want to continue?",
 
       "details-fee-input": {
         "title": "交易费用",

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -161,19 +161,20 @@
     "amount": "Amount",
     "fee": "Fee",
 
-    "tooltips": [{
-      "selector": ".transfer .ae-account .ae-identicon",
-      "header": "Identicon",
-      "content": "Recognize which account is active. Accounts & subaccounts have unique identicons."
-    }, {
-      "selector": ".transfer .tab-bar .button-plain",
-      "header": "Browse",
-      "content": "Browse æternity blockchain."
-    }, {
-      "selector": ".transfer .tab-bar .button-plain:nth-child(3)",
-      "header": "Account Switcher",
-      "content": "Tap to switch accounts or create subaccounts."
-    }],
+    "tooltips": {
+      "identicon": {
+        "header": "Identicon",
+        "content": "Recognize which account is active. Accounts & subaccounts have unique identicons."
+      },
+      "browser": {
+        "header": "Browse",
+        "content": "Browse æternity blockchain."
+      },
+      "account-switcher": {
+        "header": "Account Switcher",
+        "content": "Tap to switch accounts or create subaccounts."
+      }
+    },
 
     "send": {
       "title": "Send",
@@ -452,7 +453,8 @@
 
   "modal": {
     "confirm-sign": {
-      "guide": "<primary>Sign raw transaction</primary><br />by <address />"
+      "guide": "<primary>Sign raw transaction</primary><br />by <address />",
+      "data": "Data to sign"
     },
 
     "confirm-transaction-sign": {
@@ -475,6 +477,7 @@
       "name-claim": "Claim name",
       "name-update": "Update name",
       "name-transfer": "Transfer name",
+      "confirm-message": "Looks like you don't have enough funds to make this transaction. Are you sure want to continue?",
 
       "details-fee-input": {
         "title": "Transaction fee",

diff --git a/src/locales/ru.json b/src/locales/ru.json
@@ -161,19 +161,20 @@
     "amount": "Сумма",
     "fee": "Комиссия",
 
-    "tooltips": [{
-      "selector": ".transfer .ae-account .ae-identicon",
-      "header": "Иконка аккаунта",
-      "content": "Позволяет определить какой аккаунт активен. Аккаунты и субаккаунты имеют уникальные иконки."
-    }, {
-      "selector": ".transfer .tab-bar .button-plain",
-      "header": "Браузер",
-      "content": "Браузер, работающий с блокчейном æternity."
-    }, {
-      "selector": ".transfer .tab-bar .button-plain:nth-child(3)",
-      "header": "Переключатель аккаунтов",
-      "content": "Нажмите, чтобы переключаться между аккаунтами или создавать дополнительные аккаунты."
-    }],
+    "tooltips": {
+      "identicon": {
+        "header": "Иконка аккаунта",
+        "content": "Позволяет определить какой аккаунт активен. Аккаунты и субаккаунты имеют уникальные иконки."
+      },
+      "browser": {
+        "header": "Браузер",
+        "content": "Браузер, работающий с блокчейном æternity."
+      },
+      "account-switcher": {
+        "header": "Переключатель аккаунтов",
+        "content": "Нажмите, чтобы переключаться между аккаунтами или создавать дополнительные аккаунты."
+      }
+    },
 
     "send": {
       "title": "Отправить",
@@ -452,7 +453,8 @@
 
   "modal": {
     "confirm-sign": {
-      "guide": "<primary>Подписать необработанную транзакцию</primary><br />с помощью <address />"
+      "guide": "<primary>Подписать необработанную транзакцию</primary><br />с помощью <address />",
+      "data": "Данные для подписи"
     },
 
     "confirm-transaction-sign": {
@@ -475,6 +477,7 @@
       "name-claim": "Запрос имени",
       "name-update": "Обновить имя",
       "name-transfer": "Передать имя",
+      "confirm-message": "Похоже, у вас недостаточно средств для совершения транзакции. Вы уверены, что хотите продолжить?",
 
       "details-fee-input": {
         "title": "Плата за транзакцию",

diff --git a/src/pages/mobile/Onboarding.vue b/src/pages/mobile/Onboarding.vue
@@ -46,7 +46,7 @@ export default {
     stepRouteNames: [
       'onboarding',
       'onboarding-send',
-      'onboarding-aepps',
+      ...process.env.DISABLED_BROWSER ? [] : ['onboarding-aepps'],
       'onboarding-subaccounts',
     ],
   }),

diff --git a/src/pages/mobile/Settings.vue b/src/pages/mobile/Settings.vue
@@ -41,6 +41,7 @@
         <LeftMore slot="right" />
       </ListItem>
       <ListItem
+        v-if="!$globals.DISABLED_BROWSER"
         :to="{ name: 'settings-app-list' }"
         :title="$t('app.settings.title')"
         :subtitle="$tc('app.settings.count', appsAccountAccessCount)"

diff --git a/src/pages/mobile/Transfer.vue b/src/pages/mobile/Transfer.vue
@@ -37,6 +37,7 @@
       <LeftMore slot="right" />
     </ListItem>
     <ListItem
+      v-if="!$globals.DISABLED_BROWSER"
       :to="{ name: 'transaction-list' }"
       :title="$t('transfer.transaction.title')"
       :subtitle="$t('transfer.transaction.subtitle')"
@@ -100,7 +101,16 @@ export default {
       this.tooltipsVisible = true;
       await this.open({
         name: 'showTooltips',
-        tooltips: this.$t('transfer.tooltips'),
+        tooltips: [{
+          selector: '.transfer .ae-account .ae-identicon',
+          ...this.$t('transfer.tooltips.identicon'),
+        }, ...!process.env.DISABLED_BROWSER ? [{
+          selector: '.transfer .tab-bar .button-plain',
+          ...this.$t('transfer.tooltips.browser'),
+        }] : [], {
+          selector: '.transfer .tab-bar .button-plain:nth-child(3)',
+          ...this.$t('transfer.tooltips.account-switcher'),
+        }],
       });
       this.tooltipsVisible = false;
     },

diff --git a/src/router/routes/mobile.js b/src/router/routes/mobile.js
@@ -190,13 +190,13 @@ export default [{
   props: true,
 }, {
   name: 'transaction-list',
-  path: '/transfer/transactions/:direction?',
+  path: `${process.env.DISABLED_BROWSER ? '' : '/transfer'}/transactions/:direction?`,
   component: TransactionList,
   beforeEnter: ensureLoggedIn,
   props: true,
 }, {
   name: 'transaction-details',
-  path: '/transfer/transactions/details/:hash',
+  path: `${process.env.DISABLED_BROWSER ? '' : '/transfer'}/transactions/details/:hash`,
   component: TransactionDetails,
   beforeEnter: ensureLoggedIn,
   props: true,

diff --git a/src/ui-common.js b/src/ui-common.js
@@ -10,4 +10,5 @@ Vue.prototype.$globals = {
   IS_IOS: process.env.IS_IOS,
   UNFINISHED_FEATURES: process.env.UNFINISHED_FEATURES,
   IS_CORDOVA: process.env.IS_CORDOVA,
+  DISABLED_BROWSER: process.env.DISABLED_BROWSER,
 };