Skip to content

Commit

Permalink
🔀 Merge hotfix on undelegation
Browse files Browse the repository at this point in the history
  • Loading branch information
nwingt authored Jan 16, 2020
2 parents e286b3b + ce3c80a commit 8ab2685
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export class LikerLandOAuthScreen extends React.Component<LikerLandOAuthScreenPr
this.handlePostSignIn()
} else if (url.includes("/oauth/redirect")) {
// Fallback to use timer if the above case not working
this.redirectTimer = setTimeout(this.handlePostSignIn, 2000)
this.redirectTimer = setTimeout(this.handlePostSignIn, 4000)
} else if (url.includes("/in/register")) {
this.handleError()
logError("Error when signing in to liker.land, like.co shows register page")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ios/LikeCoinApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "likecoin-app",
"version": "0.13.1",
"version": "0.13.2",
"private": true,
"scripts": {
"start": "react-native start",
Expand Down

0 comments on commit 8ab2685

Please sign in to comment.