Skip to content

Commit

Permalink
Merge pull request #1180 from aeternity/release/v0.10.1
Browse files Browse the repository at this point in the history
Release 0.10.1
  • Loading branch information
davidyuk authored Sep 9, 2019
2 parents 6df9fdf + 358cffc commit cf8681e
Show file tree
Hide file tree
Showing 25 changed files with 409 additions and 499 deletions.
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.aeternity.base" version="0.10.0" 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.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">
<name>Base æpp</name>
<author href="https://aeternity.com">
aeternity developers
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aepp-base",
"version": "0.10.0",
"version": "0.10.1",
"author": "Sascha Hanse <[email protected]>",
"private": true,
"scripts": {
Expand Down
89 changes: 25 additions & 64 deletions src/assets/onboarding/aepps.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
138 changes: 72 additions & 66 deletions src/assets/onboarding/phones.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
235 changes: 127 additions & 108 deletions src/assets/onboarding/send.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
180 changes: 109 additions & 71 deletions src/assets/onboarding/subaccounts.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions src/components/ListItemTransaction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,11 @@ export default {
time: { type: Date, default: null },
peerId: { type: String, default: '' },
tx: { type: Object, required: true },
type: { type: String, required: true },
convertedAmount: { type: String, default: '' },
},
computed: mapState('names', {
peerName(state, { get }) {
if (!this.peerId) return this.type;
if (!this.peerId) return this.$t('transfer.transaction.type')[this.tx.type];
return get(this.peerId);
},
}),
Expand Down
3 changes: 2 additions & 1 deletion src/components/mobile/ConfirmTransactionSignModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
import { mapState } from 'vuex';
import { Crypto } from '@aeternity/aepp-sdk/es';
import { OBJECT_ID_TX_TYPE, TX_TYPE } from '@aeternity/aepp-sdk/es/tx/builder/schema';
import { AENS_DOMAIN } from '../../lib/constants';
import MobilePage from './Page.vue';
import Guide from '../Guide.vue';
import AeFraction from '../AeFraction.vue';
Expand Down Expand Up @@ -165,7 +166,7 @@ export default {
render: (createElement, { props: { value } }) => createElement(DetailsField, {
attrs: {
name: 'Name',
value: Crypto.decodeBase58Check(Crypto.assertedType(value, 'nm')).toString(),
value: Crypto.decodeBase58Check(Crypto.assertedType(value, 'nm')).toString().replace(AENS_DOMAIN, ''),
},
}),
},
Expand Down
49 changes: 0 additions & 49 deletions src/components/mobile/IntroModal.vue

This file was deleted.

2 changes: 1 addition & 1 deletion src/lib/appsRegistry.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export { default as DEFAULT_ICON } from '../assets/icons/aepps/default.svg';
const showGraffitiApp = new Date('2019-09-04T22:00:00.000Z').getTime() <= Date.now();

export const aeternityApps = [...showGraffitiApp ? [{
name: 'Graffiti Aepp',
name: 'Graffiti',
path: 'graffiti.aeternity.com',
icon: graffitiAeppIcon,
}] : [], {
Expand Down
2 changes: 2 additions & 0 deletions src/lib/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ const toMicro = value => value.shiftedBy(-MAGNITUDE_MICRO).toFixed();

export const MIN_SPEND_TX_FEE_MICRO = toMicro(MIN_SPEND_TX_FEE);
export const MAX_REASONABLE_FEE_MICRO = toMicro(MAX_REASONABLE_FEE);

export const AENS_DOMAIN = '.test';
2 changes: 1 addition & 1 deletion src/lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { get } from 'lodash-es';

export const toUrl = url => new URL((/^\w+:\//.test(url) ? '' : 'http://') + url);

export const isAensName = value => value.endsWith('.test');
export const isAensName = value => !value.includes('.');

// eslint-disable-next-line no-console
export const handleUnknownError = error => console.warn('Unknown rejection', error);
Expand Down
36 changes: 13 additions & 23 deletions src/locales/cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"mnemonic": "无效助记词",
"url_http": "该字段不是有效的HTTP(S) URL",
"air_gap_response_url": "这不是有效的同步代码。",
"aens_name": "必须以.test结尾",
"aens_name": "This field must not contain dots",
"aens_name_unregistered": "这个名称已被注册",
"account": "Invalid AE address or AENS name"
},
Expand Down Expand Up @@ -90,7 +90,7 @@
},

"aepps": {
"guide": "探索æpps",
"guide": "探索æternity",
"note": "让æternity区块链为您的日常生活增添活力。"
},

Expand All @@ -114,22 +114,17 @@
},

"app": {
"title": "æpps",

"intro": [{
"header": "欢迎来到æpps浏览器!",
"body": "æpps是由æternity区块链提供支持的去中心化应用程序。"
}],
"title": "Browse",

"list": {
"featured-guide": "<primary>精选æpps</primary>",
"browse-guide": "浏览æpps",
"bookmarked-guide": "我的æpps",
"featured-guide": "<primary>精选</primary>",
"browse-guide": "浏览",
"bookmarked-guide": "Bookmarks",
"guide": "æpps <primary>浏览器</primary> (beta)",
"note": "将运行在æternity区块链上的æpps添加到这里"
},

"url-form-placeholder": "输入æpps链接",
"url-form-placeholder": "输入链接",

"browser": {
"refresh": "更新",
Expand All @@ -150,11 +145,11 @@
},

"settings": {
"title": "Aepp帐户访问权限",
"count": "没有aepps,有帐户访问权限| {n} aepp有帐户访问权限| {n} aepps有帐户访问权限",
"title": "帐户访问权限",
"count": "没有,有帐户访问权限| {n} 有帐户访问权限",

"list": {
"note": "管理哪些æpps可以访问您的(子)帐户",
"note": "管理哪些可以访问您的(子)帐户",
"subtitle": "| 可访问 {n} 账户 | 可访问 {n} 账户(子)"
}
}
Expand All @@ -172,8 +167,8 @@
"content": "确认哪个帐户是活动的.帐户和子帐户具有唯一的标识符."
}, {
"selector": ".transfer .tab-bar .button-plain",
"header": "æpps",
"content": "æpps浏览器探索æternity区块链."
"header": "Browse",
"content": "浏览器探索æternity区块链."
}, {
"selector": ".transfer .tab-bar .button-plain:nth-child(3)",
"header": "切换账户",
Expand Down Expand Up @@ -412,11 +407,6 @@
"name": {
"title": "Names",

"intro": [{
"header": "欢迎来到 æternity 命名系统(AENS)!",
"body": "AENS允许用户申请一个名称,并与一个或多个æternity帐户关联. 您成功申请后,它会与您的帐户关联. At that point anyone can send tokens by typing the name instead of the account address."
}],

"list": {
"note": "为您的账户申请一个名称!",
"explanation": "点击“+”按钮来申请并与您的帐号关联.",
Expand Down Expand Up @@ -449,7 +439,7 @@
"guide": "为 <inlineAccount /><primary>申请一个新名称</primary> ",
"unknown-error": "未知错误",
"name": "名称",
"name-placeholder": "Name.test",
"name-placeholder": "Name",
"register": "注册",

"notification":{
Expand Down
36 changes: 13 additions & 23 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"mnemonic": "Invalid recovery phrase",
"url_http": "This field is not a valid HTTP(S) URL",
"air_gap_response_url": "This is not a valid sync code.",
"aens_name": "This field must ends with .test",
"aens_name": "This field must not contain dots",
"aens_name_unregistered": "This name is already registered",
"account": "Invalid AE address or AENS name"
},
Expand Down Expand Up @@ -90,7 +90,7 @@
},

"aepps": {
"guide": "Explore æpps",
"guide": "Explore æternity",
"note": "Bring the power of æternity blockchain to your daily life."
},

Expand All @@ -114,22 +114,17 @@
},

"app": {
"title": "æpps",

"intro": [{
"header": "Welcome to the æpps browser!",
"body": "æpps are decentralized applications powered by the æternity blockchain."
}],
"title": "Browse",

"list": {
"featured-guide": "<primary>Featured æpps</primary>",
"browse-guide": "Browse æpps",
"bookmarked-guide": "My æpps",
"featured-guide": "<primary>Featured</primary>",
"browse-guide": "Browse",
"bookmarked-guide": "Bookmarks",
"guide": "æpps <primary>browser</primary> (beta)",
"note": "æpps running on the æternity blockchain will be added below."
},

"url-form-placeholder": "Enter æpp URL",
"url-form-placeholder": "Enter URL",

"browser": {
"refresh": "Refresh",
Expand All @@ -150,11 +145,11 @@
},

"settings": {
"title": "Aepp account access",
"count": "No aepps have account access | {n} aepp have account access | {n} aepps have account access",
"title": "Account access",
"count": "No one have account access | {n} have account access",

"list": {
"note": "Manage which æpps can access your (sub)accounts",
"note": "Manage who can access your (sub)accounts",
"subtitle": "| can access {n} account | can access {n} accounts"
}
}
Expand All @@ -172,8 +167,8 @@
"content": "Recognize which account is active. Accounts & subaccounts have unique identicons."
}, {
"selector": ".transfer .tab-bar .button-plain",
"header": "æpps",
"content": "Explore æpps powered by the æternity blockchain."
"header": "Browse",
"content": "Browse æternity blockchain."
}, {
"selector": ".transfer .tab-bar .button-plain:nth-child(3)",
"header": "Account Switcher",
Expand Down Expand Up @@ -412,11 +407,6 @@
"name": {
"title": "Names",

"intro": [{
"header": "Welcome to the æternity Naming System (AENS)!",
"body": "The AENS allows users to claim names and associate them with one or more æternity accounts. After you have successfully claimed a name it is associated with one of your accounts. At that point anyone can send tokens by typing the name instead of the account address."
}],

"list": {
"note": "Claim a name for your account!",
"explanation": "Tap the “+” button below to claim a name and associate it with one of your accounts.",
Expand Down Expand Up @@ -449,7 +439,7 @@
"guide": "<primary>Claim a name</primary> for <inlineAccount />",
"unknown-error": "Unknown error",
"name": "Name",
"name-placeholder": "Name.test",
"name-placeholder": "Name",
"register": "Register",

"notification":{
Expand Down
Loading

0 comments on commit cf8681e

Please sign in to comment.