From 2e9ff96d40eb29d2f5f489da25c0db70c26c3f99 Mon Sep 17 00:00:00 2001 From: "Ng Wing Tat, David" Date: Thu, 16 Jan 2020 15:56:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=94=96=20Bump=20version=20to=200.13.2?= =?UTF-8?q?(157)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 4 ++-- android/app/build.gradle | 4 ++-- ios/LikeCoinApp.xcodeproj/project.pbxproj | 8 ++++---- package.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.env b/.env index 9c78cc69..fa04b962 100644 --- a/.env +++ b/.env @@ -5,10 +5,10 @@ # import { API_URL } from 'react-native-dotenv' # Same as MARKETING_VERSION in iOS / version in Android -APP_MARKETING_VERSION=0.13.1 +APP_MARKETING_VERSION=0.13.2 # Same as CURRENT_PROJECT_VERSION in iOS / version code in Android -APP_VERSION=156 +APP_VERSION=157 # APP_VERSION must be greater or equal to the this value # without forcing user to update the app diff --git a/android/app/build.gradle b/android/app/build.gradle index a0d4a803..5bc6092e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -138,8 +138,8 @@ android { applicationId "com.oice" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 156 - versionName "0.13.1" + versionCode 157 + versionName "0.13.2" missingDimensionStrategy 'react-native-camera', 'general' } splits { diff --git a/ios/LikeCoinApp.xcodeproj/project.pbxproj b/ios/LikeCoinApp.xcodeproj/project.pbxproj index bd3cbf6f..2c6bb1cc 100644 --- a/ios/LikeCoinApp.xcodeproj/project.pbxproj +++ b/ios/LikeCoinApp.xcodeproj/project.pbxproj @@ -703,12 +703,12 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = LikeCoinApp/LikeCoinApp.entitlements; - CURRENT_PROJECT_VERSION = 156; + CURRENT_PROJECT_VERSION = 157; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = 76UMR894HH; INFOPLIST_FILE = LikeCoinApp/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.13.1; + MARKETING_VERSION = 0.13.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -727,11 +727,11 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = LikeCoinApp/LikeCoinApp.entitlements; - CURRENT_PROJECT_VERSION = 156; + CURRENT_PROJECT_VERSION = 157; DEVELOPMENT_TEAM = 76UMR894HH; INFOPLIST_FILE = LikeCoinApp/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.13.1; + MARKETING_VERSION = 0.13.2; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/package.json b/package.json index 7e35f406..a7842392 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "likecoin-app", - "version": "0.13.1", + "version": "0.13.2", "private": true, "scripts": { "start": "react-native start", From 31a85394821157f127dfad230c47941d405ee57d Mon Sep 17 00:00:00 2001 From: "Ng Wing Tat, David" Date: Wed, 15 Jan 2020 18:13:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=8D=8F=20Increase=20redirect=20timer?= =?UTF-8?q?=20to=204s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/screens/likerland-oauth-screen/likerland-oauth-screen.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/screens/likerland-oauth-screen/likerland-oauth-screen.tsx b/app/screens/likerland-oauth-screen/likerland-oauth-screen.tsx index b97f5ea8..1b4c56f2 100644 --- a/app/screens/likerland-oauth-screen/likerland-oauth-screen.tsx +++ b/app/screens/likerland-oauth-screen/likerland-oauth-screen.tsx @@ -65,7 +65,7 @@ export class LikerLandOAuthScreen extends React.Component Date: Thu, 16 Jan 2020 16:01:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=90=9B=20Fix=20invalid=20amount=20che?= =?UTF-8?q?ck=20for=20undelegation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../staking-unbonding-delegation-amount-input-screen.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/screens/staking-unbonding-delegation-amount-input-screen/staking-unbonding-delegation-amount-input-screen.tsx b/app/screens/staking-unbonding-delegation-amount-input-screen/staking-unbonding-delegation-amount-input-screen.tsx index eb185ba2..76546dbd 100644 --- a/app/screens/staking-unbonding-delegation-amount-input-screen/staking-unbonding-delegation-amount-input-screen.tsx +++ b/app/screens/staking-unbonding-delegation-amount-input-screen/staking-unbonding-delegation-amount-input-screen.tsx @@ -45,10 +45,11 @@ export class StakingUnbondingDelegationAmountInputScreen extends React.Component */ private createTransactionForSigning = async () => { try { - const { address, availableBalance } = this.props.chain.wallet + const { address } = this.props.chain.wallet await this.props.txStore.createUnbondingDelegateTx(address) - const { totalAmount } = this.props.txStore - if (totalAmount.isGreaterThan(availableBalance)) { + const { target, totalAmount } = this.props.txStore + const delegatedAmount = this.props.chain.wallet.getDelegation(target).shares + if (totalAmount.isGreaterThan(delegatedAmount)) { throw new Error("UNSTAKE_NOT_ENOUGH_FEE") } return true