diff --git a/android/app/build.gradle b/android/app/build.gradle index 0e820bc3..0e8324ca 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -101,8 +101,8 @@ android { applicationId "com.chaion.makkii" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 7 - versionName "0.1.0" + versionCode 8 + versionName "0.1.1" ndk { abiFilters "armeabi-v7a", "x86" } diff --git a/components/signed/dapps/launch.js b/components/signed/dapps/launch.js index f6c5e07f..3d1f79f7 100644 --- a/components/signed/dapps/launch.js +++ b/components/signed/dapps/launch.js @@ -55,7 +55,7 @@ class Launch extends HomeComponent{ return ( - + {strings('dapp.unavailable_hint')} ) diff --git a/components/signed/setting/home.js b/components/signed/setting/home.js index 2ed7b1ac..62ad76af 100644 --- a/components/signed/setting/home.js +++ b/components/signed/setting/home.js @@ -94,7 +94,7 @@ class Home extends HomeComponent { title={strings('logout')} onClick={() => { popCustom.show( - '', + strings('alert_title_warning'), strings('setting.confirm_logout'), [ {text: strings('cancel_button'), onPress:()=>{}}, diff --git a/data.js b/data.js index 9a886e3f..2fcb7f61 100644 --- a/data.js +++ b/data.js @@ -11,16 +11,16 @@ dapps.mastery.push({ type:'dapp.type_game', screenShot: require('./assets/apps/app1/app1_screenshot.png') }); -dapps.mainnet.push({ - name: 'Pet Roulette', - logo: require('./assets/apps/app1/app1_logo.png'), - description: '\tWhen 7 bets have been placed - an animal will be randomly selected and a payout will occur.Winners who guessed correctly will split the amount in the AION pool! If no winner, total AION pool will rollover', - // uri: 'http://192.168.50.83:8082' - uri: 'https://www.chaion.net/DApp1/', - author: 'KimCodeashian', - type:'dapp.type_game', - screenShot: require('./assets/apps/app1/app1_screenshot.png') -}); +// dapps.mainnet.push({ +// name: 'Pet Roulette', +// logo: require('./assets/apps/app1/app1_logo.png'), +// description: '\tWhen 7 bets have been placed - an animal will be randomly selected and a payout will occur.Winners who guessed correctly will split the amount in the AION pool! If no winner, total AION pool will rollover', +// // uri: 'http://192.168.50.83:8082' +// uri: 'https://www.chaion.net/DApp1/', +// author: 'KimCodeashian', +// type:'dapp.type_game', +// screenShot: require('./assets/apps/app1/app1_screenshot.png') +// }); export default data = { dapps, diff --git a/locales/en.json b/locales/en.json index 4c0acc3a..e8799561 100644 --- a/locales/en.json +++ b/locales/en.json @@ -222,7 +222,7 @@ "author_label": "By", "type_label": "Type", "type_game": "Game", - "unavailable_hint": "DApp is unavailable in current Aion network. Please change it in settings." + "unavailable_hint": "DApps are coming soon!" }, "dapp_send": { "error_not_set_default": "Please set your default account" diff --git a/locales/zh.json b/locales/zh.json index a38b2a74..0a9b4692 100644 --- a/locales/zh.json +++ b/locales/zh.json @@ -219,7 +219,7 @@ "author_label": "作者", "type_label": "类别", "type_game": "游戏", - "unavailable_hint": "DApp在當前Aion网络中不可用,请在设置中更改网络" + "unavailable_hint": "应用正在路上,敬请期待!" }, "dapp_send": { "error_not_set_default": "请先设置一个默认账户。" diff --git a/reducers/setting.js b/reducers/setting.js index 5455393f..034e0828 100644 --- a/reducers/setting.js +++ b/reducers/setting.js @@ -6,7 +6,7 @@ import DeviceInfo from 'react-native-device-info'; const init = { lang: 'auto', - version: '0.1.0', + version: '0.1.1', theme: 'white', default_account_name: 'Aion Account', login_session_timeout: '30',