From 8ee7e1aec9b7d732f897f5a84922956c6e79a0a7 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Wed, 15 Sep 2021 11:51:23 -0700 Subject: [PATCH 1/2] Merge pull request #5272 from Expensify/version-BUILD-09dd0bfd7390da2cc8c4a63be1685ec55f0b19c6 (cherry picked from commit 0991dfa6c12575426b2d0e7e0a2edfd946b2f6c8) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 1482c4532566..9192e14a4f5e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -150,8 +150,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001009800 - versionName "1.0.98-0" + versionCode 1001009801 + versionName "1.0.98-1" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index e84724b275d3..60c4f20b97aa 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.0.98.0 + 1.0.98.1 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 33f547a33afa..755510c7a081 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.98.0 + 1.0.98.1 diff --git a/package-lock.json b/package-lock.json index ce2b76c42413..3eaf63959fc7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.0.98-0", + "version": "1.0.98-1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 311348bf1671..f87f5c9b0dc2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.0.98-0", + "version": "1.0.98-1", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", From 171c40833fae1d0830b50519e69251efdc50b156 Mon Sep 17 00:00:00 2001 From: Francois Laithier Date: Wed, 15 Sep 2021 11:49:07 -0700 Subject: [PATCH 2/2] Merge pull request #5243 from akshayasalvi/iou-amt-maxlength [Deploy Blocker] Changed max length to 11 for alignment issues (cherry picked from commit 09dd0bfd7390da2cc8c4a63be1685ec55f0b19c6) --- src/CONST.js | 2 +- src/pages/iou/steps/IOUAmountPage.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CONST.js b/src/CONST.js index a2c4e09004e3..c865038c1455 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -364,7 +364,7 @@ const CONST = { PAYPAL_ME: 'PayPal.me', VENMO: 'Venmo', }, - AMOUNT_MAX_LENGTH: 14, + AMOUNT_MAX_LENGTH: 10, }, GROWL: { diff --git a/src/pages/iou/steps/IOUAmountPage.js b/src/pages/iou/steps/IOUAmountPage.js index b3b7b8655a87..da49f58e0284 100755 --- a/src/pages/iou/steps/IOUAmountPage.js +++ b/src/pages/iou/steps/IOUAmountPage.js @@ -101,7 +101,7 @@ class IOUAmountPage extends React.Component { */ validateAmount(amount) { const decimalNumberRegex = new RegExp(/^\d+(,\d+)*(\.\d{0,3})?$/, 'i'); - return amount === '' || (decimalNumberRegex.test(amount) && amount.length <= CONST.IOU.AMOUNT_MAX_LENGTH); + return amount === '' || (decimalNumberRegex.test(amount) && ((parseFloat(amount) * 100).toString().length <= CONST.IOU.AMOUNT_MAX_LENGTH)); } /**