diff --git a/android/app/build.gradle b/android/app/build.gradle index 4b3fda8f0..f019e0a03 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -6,8 +6,8 @@ apply plugin: "com.google.firebase.crashlytics" import com.android.build.OutputFile -def canonicalVersionName = "4.0.0" -def canonicalVersionCode = 85 +def canonicalVersionName = "4.0.1" +def canonicalVersionCode = 86 // NOTE: DO NOT change postFixSize value, this is for handling legacy method for handling the versioning in android def postFixSize = 30_000 diff --git a/ios/Xaman.xcodeproj/project.pbxproj b/ios/Xaman.xcodeproj/project.pbxproj index f02176e56..33333c888 100644 --- a/ios/Xaman.xcodeproj/project.pbxproj +++ b/ios/Xaman.xcodeproj/project.pbxproj @@ -1183,7 +1183,7 @@ CODE_SIGN_ENTITLEMENTS = Xaman/Xaman.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 85; + CURRENT_PROJECT_VERSION = 86; DEVELOPMENT_TEAM = LK5BBJNJZ6; ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; @@ -1219,7 +1219,7 @@ CODE_SIGN_ENTITLEMENTS = Xaman/Xaman.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 85; + CURRENT_PROJECT_VERSION = 86; DEVELOPMENT_TEAM = LK5BBJNJZ6; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; INFOPLIST_FILE = Xaman/Info.plist; diff --git a/ios/Xaman/Info.plist b/ios/Xaman/Info.plist index cc53d8563..939c3e1a4 100644 --- a/ios/Xaman/Info.plist +++ b/ios/Xaman/Info.plist @@ -54,7 +54,7 @@ CFBundleVersion - 85 + 86 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/XamanTests/Info.plist b/ios/XamanTests/Info.plist index 7e11935ee..10d23a03b 100644 --- a/ios/XamanTests/Info.plist +++ b/ios/XamanTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 85 + 86 diff --git a/package-lock.json b/package-lock.json index e599bbd94..7f9b9c262 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "xaman", - "version": "4.0.0", + "version": "4.0.1", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package.json b/package.json index c8c27476d..04f379c86 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xaman", - "version": "4.0.0", + "version": "4.0.1", "license": "SEE LICENSE IN ", "scripts": { "start": "node node_modules/react-native/cli.js start", diff --git a/src/components/Modules/EventsList/EventsList.tsx b/src/components/Modules/EventsList/EventsList.tsx index 9b6ba81e3..67c7bfdde 100644 --- a/src/components/Modules/EventsList/EventsList.tsx +++ b/src/components/Modules/EventsList/EventsList.tsx @@ -277,7 +277,7 @@ class EventsList extends PureComponent { {' '} - {Localize.t('events.fetchingTransactionsFromNetwork')} + {Localize.t('events.fetchingTransactionsFromNetwork')} {' '} } diff --git a/src/components/Modules/MutationWidgets/ReserveChange.tsx b/src/components/Modules/MutationWidgets/ReserveChange.tsx index adf17251d..072eb8b6b 100644 --- a/src/components/Modules/MutationWidgets/ReserveChange.tsx +++ b/src/components/Modules/MutationWidgets/ReserveChange.tsx @@ -93,6 +93,11 @@ class ReserveChange extends PureComponent { return undefined; } + if (item.Type === LedgerEntryTypes.Escrow || item.Type === LedgerEntryTypes.Check) { + if (item.Account !== account.address) { + return undefined; + } + } // ledger objects always have reserve change increase return { address: account.address, diff --git a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CheckCash.tsx b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CheckCash.tsx index 7c5585e40..e2e6595bf 100644 --- a/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CheckCash.tsx +++ b/src/screens/Modal/ReviewTransaction/Steps/Review/Templates/genuine/CheckCash.tsx @@ -61,6 +61,7 @@ class CheckCashTemplate extends Component { fetchCheckObject = () => { const { transaction } = this.props; + const { cashAmount } = this.state; // assign actual check object to the CashCheck tx LedgerService.getLedgerEntry({ index: transaction.CheckID }) @@ -81,6 +82,12 @@ class CheckCashTemplate extends Component { }, () => { transaction.Check = checkObject; + if ( + checkObject?.SendMax?.value && + (cashAmount === '' || cashAmount === '0' || cashAmount === undefined) + ) { + this.onAmountChange(checkObject?.SendMax?.value); + } }, ); } else { @@ -175,7 +182,7 @@ class CheckCashTemplate extends Component {