Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update version to 1.1.44-0 on staging #8209

Merged
merged 51 commits into from
Mar 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
b66a976
Make sure to use the login of the PR author
mountiny Mar 11, 2022
b36c291
Refactor the getMergedPullRequest step into a separate job
mountiny Mar 11, 2022
67ebf69
Include author input in getMergedPullRequest
mountiny Mar 11, 2022
2cd34af
remove character counter
Tushu17 Mar 14, 2022
1574792
add semicolon
Tushu17 Mar 14, 2022
52a5f32
Remove dead code associated with AuthenticateWithAccountID
marcaaron Mar 15, 2022
86ef870
Update .github/workflows/preDeploy.yml
mountiny Mar 15, 2022
4113d7d
remove condition
Tushu17 Mar 15, 2022
678c226
Add working button conditional
Mar 15, 2022
4be8e2b
Get rid of formLabel
Mar 15, 2022
5ca609e
Swap out with TextInput
Mar 15, 2022
4e9d148
Fix spacing + style
Mar 15, 2022
0e1f2d1
Adjust input spacing
Mar 15, 2022
6df8839
Add lowercase styel and use plain Text component
Mar 15, 2022
ddd9980
Line height spacing
Mar 15, 2022
66fe8ae
Get rid of unnecessary views
Mar 15, 2022
7919e24
Merge pull request #8149 from Expensify/marcaaron-removeAuthenticateW…
cead22 Mar 16, 2022
7e77dbc
disable future dates for DOB date picker
thesahindia Mar 16, 2022
eaeba0e
remove default prop
Tushu17 Mar 16, 2022
0852a2d
Review comments, rname variables
Mar 16, 2022
5852d1e
update PR checklist
marcochavezf Mar 16, 2022
47e4ac6
Merge branch 'main' into vit-fixIsExpensifyEmployee
mountiny Mar 16, 2022
c8ac032
Make the other jobs in preDeploy dependent directly on getMergedPullR…
mountiny Mar 16, 2022
602b76e
Merge branch 'vit-fixIsExpensifyEmployee' of github.com:Expensify/App…
mountiny Mar 16, 2022
b1ccf26
update Avatars
thesahindia Mar 16, 2022
c30e95f
Merge pull request #8145 from Tushu17/remove-max-length
mountiny Mar 16, 2022
7dab243
rm unnecessary checks
rushatgabhane Mar 16, 2022
4b54cb3
fix extra space
marcochavezf Mar 16, 2022
622aa0f
Update visibility label too
Mar 16, 2022
1f4ccf2
Merge pull request #8184 from Expensify/marco-updatePRChecklist
aldo-expensify Mar 16, 2022
dcce4ce
Merge pull request #8176 from thesahindia/thesahindia/disable-future-…
mountiny Mar 16, 2022
50518d8
Fix autoComplete crash
roryabraham Mar 16, 2022
ace1836
Merge pull request #8186 from Expensify/Rory-FixAutocompleteCrash
chiragsalian Mar 16, 2022
b8d1bdd
add text style
luacmartins Mar 16, 2022
ca9695b
Merge pull request #8082 from Expensify/vit-fixIsExpensifyEmployee
roryabraham Mar 16, 2022
1c7cb32
Update version to 1.1.43-2
OSBotify Mar 16, 2022
ce28525
Merge pull request #8188 from Expensify/version-BUILD-ca9695b1a59e485…
OSBotify Mar 16, 2022
ddf2323
add comment
luacmartins Mar 16, 2022
f58eabb
Revert "[NoQA] Fix the new contributor PR comment"
roryabraham Mar 16, 2022
98640ec
fix styles
luacmartins Mar 16, 2022
a6c2cf6
Merge pull request #8191 from Expensify/revert-8082-vit-fixIsExpensif…
chiragsalian Mar 16, 2022
6381caa
Merge pull request #8190 from Expensify/cmartins-textAlign
Mar 16, 2022
2c7c82c
Merge pull request #8164 from Expensify/nmurray-update-room-settings-…
shawnborton Mar 16, 2022
8df2d22
rename admins room avatar
thesahindia Mar 17, 2022
adb80db
rename function
thesahindia Mar 17, 2022
47edb6f
Merge branch 'main' of github.com:thesahindia/App into thesahindia/up…
thesahindia Mar 17, 2022
6bbda7e
Merge pull request #8194 from rushatgabhane/cleanup
mountiny Mar 17, 2022
31492d7
Merge pull request #8187 from thesahindia/thesahindia/update-icon
stitesExpensify Mar 17, 2022
98776f8
Update version to 1.1.44-0
OSBotify Mar 17, 2022
ef48b11
Merge pull request #8208 from Expensify/version-PATCH-31492d7f9340c2b…
OSBotify Mar 17, 2022
94e86e4
Merge branch 'main' into update-staging-from-main
OSBotify Mar 17, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 46 additions & 24 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,33 +40,44 @@ This is a checklist for PR authors & reviewers. Please make sure to complete all
- [ ] I wrote clear testing steps that cover the changes made in this PR
- [ ] I added steps for local testing in the `Tests` section
- [ ] I added steps for Staging and/or Production testing in the `QA steps` section
- [ ] I added steps to cover failure scenarios (if applicable, i.e. verify an input displays the correct error message if the entered data is not correct)
- [ ] I added steps to cover offline scenarios (if applicable, i.e. verify the default avatar icon is displayed if app is offline)
- [ ] I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- [ ] I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- [ ] I included screenshots or videos for tests on [all platforms](https://github.com/Expensify/App/blob/main/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms)
- [ ] I ran the tests & verified they passed on:
- [ ] I ran the tests on **all platforms** & verified they passed on:
- [ ] iOS / native
- [ ] Android / native
- [ ] iOS / Safari
- [ ] Android / Chrome
- [ ] MacOS / Chrome
- [ ] MacOS / Desktop
- [ ] I verified there are no console errors related to changes in this PR
- [ ] I verified there are no console errors (if there’s a console error not related to the PR, report it or open an issue for it to be fixed)
- [ ] I followed proper code patterns (see [Reviewing the code](https://github.com/Expensify/App/blob/main/PR_REVIEW_GUIDELINES.md#reviewing-the-code))
- [ ] I added comments when the code was not self explanatory
- [ ] I put all copy / text shown in the product in all `src/languages/*` files (if applicable)
- [ ] I followed proper naming convention for platform-specific files (if applicable)
- [ ] I followed style guidelines (in [`Styling.md`](https://github.com/Expensify/App/blob/main/STYLING.md)) for all style edits I made
- [ ] I followed the JSDocs style guidelines (in [`STYLE.md`](https://github.com/Expensify/App/blob/main/STYLE.md#jsdocs))
- [ ] I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. “toggleReport” and not “onIconClick”)
- [ ] I verified that comments were added to code that is not self explanatory
- [ ] I verified that any new or modified comments were clear, correct english, and explained “why” the code was doing something instead of only explaining “what” the code was doing.
- [ ] I verified any copy / text shown in the product was added in all `src/languages/*` files
- [ ] I verified any copy / text that was added to the app is correct english and approved by marketing by tagging the marketing team on the original GH to get the correct copy.
- [ ] I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named “index.js”. All platform-specific files are named for the platform the code supports as outlined in the README.
- [ ] I verified the JSDocs style guidelines (in [`STYLE.md`](https://github.com/Expensify/App/blob/main/STYLE.md#jsdocs)) were followed
- [ ] If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
- [ ] I followed the guidelines as stated in the [Review Guidelines](https://github.com/Expensify/App/blob/main/PR_REVIEW_GUIDELINES.md)
- [ ] I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like `Avatar`, I verified the components using `Avatar` are working as expected)
- [ ] I verified all code is DRY
- [ ] I verified any variables that can be defined as constants (ie. in CONST.js) are defined as such
- [ ] If a new component is created I verified that:
- [ ] A similar component doesn't exist in the codebase
- [ ] Has the `displayName` property if it’s a Functional Component
- [ ] Has Storybook stories (optional)
- [ ] Has Unit tests (optional)
- [ ] All props are defined accurately and each prop has a `/** comment above it */`
- [ ] Any functional components have the `displayName` property
- [ ] The file is named correctly
- [ ] The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- [ ] The only data being stored in the state is data necessary for rendering and nothing else
- [ ] Any internal methods are bound to “this” properly so there are no scoping issues
- [ ] Any internal methods bound to “this” are necessary to be bound
- [ ] All JSX used for rendering exists in the render method
- [ ] The component has the minimum amount of code necessary for its purpose and it is
- [ ] If a new CSS style is added I verified that:
- [ ] A similar style doesn’t already exist
- [ ] The style can’t be created with a [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function
- [ ] The style can’t be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function
(i.e. `StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG`)


Expand All @@ -76,8 +87,8 @@ This is a checklist for PR authors & reviewers. Please make sure to complete all
- [ ] I verified testing steps are clear and they cover the changes made in this PR
- [ ] I verified the steps for local testing are in the `Tests` section
- [ ] I verified the steps for Staging and/or Production testing are in the `QA steps` section
- [ ] I verified the steps cover failure scenarios (if applicable, i.e. verify an input displays the correct error message if the entered data is not correct)
- [ ] I verified steps cover offline scenarios (if applicable, i.e. verify the default avatar icon is displayed if app is offline)
- [ ] I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- [ ] I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- [ ] I checked that screenshots or videos are included for tests on [all platforms](https://github.com/Expensify/App/blob/main/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms)
- [ ] I verified tests pass on **all platforms** & I tested again on:
- [ ] iOS / native
Expand All @@ -86,23 +97,34 @@ This is a checklist for PR authors & reviewers. Please make sure to complete all
- [ ] Android / Chrome
- [ ] MacOS / Chrome
- [ ] MacOS / Desktop
- [ ] I verified there are no console errors related to changes in this PR
- [ ] I verified there are no console errors (if there’s a console error not related to the PR, report it or open an issue for it to be fixed)
- [ ] I verified proper code patterns were followed (see [Reviewing the code](https://github.com/Expensify/App/blob/main/PR_REVIEW_GUIDELINES.md#reviewing-the-code))
- [ ] I verified comments were added when the code was not self explanatory
- [ ] I verified any copy / text shown in the product was added in all `src/languages/*` files (if applicable)
- [ ] I verified proper naming convention for platform-specific files was followed (if applicable)
- [ ] I verified [style guidelines](https://github.com/Expensify/App/blob/main/STYLING.md) were followed
- [ ] I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. “toggleReport” and not “onIconClick”).
- [ ] I verified that comments were added to code that is not self explanatory
- [ ] I verified that any new or modified comments were clear, correct english, and explained “why” the code was doing something instead of only explaining “what” the code was doing.
- [ ] I verified any copy / text shown in the product was added in all `src/languages/*` files
- [ ] I verified any copy / text that was added to the app is correct english and approved by marketing by tagging the marketing team on the original GH to get the correct copy.
- [ ] I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named “index.js”. All platform-specific files are named for the platform the code supports as outlined in the README.
- [ ] I verified the JSDocs style guidelines (in [`STYLE.md`](https://github.com/Expensify/App/blob/main/STYLE.md#jsdocs)) were followed
- [ ] If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
- [ ] I verified that this PR follows the guidelines as stated in the [Review Guidelines](https://github.com/Expensify/App/blob/main/PR_REVIEW_GUIDELINES.md)
- [ ] I verified other components are not impacted by changes in this PR (i.e. if the PR modifies a shared library or component like `Avatar`, I verified the components using `Avatar` are working as expected)
- [ ] I verified all code is DRY
- [ ] I verified any variables that can be defined as constants (ie. in CONST.js) are defined as such
- [ ] If a new component is created I verified that:
- [ ] A similar component doesn't exist in the codebase
- [ ] Has the `displayName` property if it’s a Functional Component
- [ ] Has Storybook stories (optional)
- [ ] Has Unit tests (optional)
- [ ] All props are defined accurately and each prop has a `/** comment above it */`
- [ ] Any functional components have the `displayName` property
- [ ] The file is named correctly
- [ ] The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- [ ] The only data being stored in the state is data necessary for rendering and nothing else
- [ ] Any internal methods are bound to “this” properly so there are no scoping issues
- [ ] Any internal methods bound to “this” are necessary to be bound
- [ ] All JSX used for rendering exists in the render method
- [ ] The component has the minimum amount of code necessary for its purpose and it is broken down into smaller components in order to separate concerns and functions
- [ ] If a new CSS style is added I verified that:
- [ ] A similar style doesn’t already exist
- [ ] The style can’t be created with a [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function
- [ ] The style can’t be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function
(i.e. `StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG`)

### QA Steps
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001014302
versionName "1.1.43-2"
versionCode 1001014400
versionName "1.1.44-0"
}
splits {
abi {
Expand Down
15 changes: 15 additions & 0 deletions assets/images/avatars/admin-room.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions assets/images/avatars/announce-room.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/images/avatars/deleted-room.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/images/avatars/room.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.43</string>
<string>1.1.44</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -31,7 +31,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.1.43.2</string>
<string>1.1.44.0</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
4 changes: 2 additions & 2 deletions ios/NewExpensifyTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.43</string>
<string>1.1.44</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.1.43.2</string>
<string>1.1.44.0</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "1.1.43-2",
"version": "1.1.44-0",
"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.",
Expand Down
8 changes: 3 additions & 5 deletions src/components/CheckboxWithLabel.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,9 @@ const CheckboxWithLabel = React.forwardRef((props, ref) => {
{LabelComponent && (<LabelComponent />)}
</TouchableOpacity>
</View>
{!_.isEmpty(props.errorText) && (
<InlineErrorText styles={[styles.ml8]}>
{props.errorText}
</InlineErrorText>
)}
<InlineErrorText styles={[styles.ml8]}>
{props.errorText}
</InlineErrorText>
</>
);
});
Expand Down
4 changes: 4 additions & 0 deletions src/components/Icon/Expensicons.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,14 @@ import Wallet from '../../../assets/images/wallet.svg';
import Workspace from '../../../assets/images/workspace-default-avatar.svg';
import ActiveRoomAvatar from '../../../assets/images/avatars/room.svg';
import DeletedRoomAvatar from '../../../assets/images/avatars/deleted-room.svg';
import AdminRoomAvatar from '../../../assets/images/avatars/admin-room.svg';
import AnnounceRoomAvatar from '../../../assets/images/avatars/announce-room.svg';

export {
ActiveRoomAvatar,
AdminRoomAvatar,
Android,
AnnounceRoomAvatar,
Apple,
ArrowRight,
BackArrow,
Expand Down
3 changes: 1 addition & 2 deletions src/components/InlineErrorText.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@ import Text from './Text';

const propTypes = {
/** Text to display */
children: PropTypes.string,
children: PropTypes.string.isRequired,

/** Styling for inline error text */
styles: PropTypes.arrayOf(PropTypes.object),
};

const defaultProps = {
children: 'Error',
styles: [],
};

Expand Down
8 changes: 3 additions & 5 deletions src/components/Picker/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,9 @@ class Picker extends PureComponent {
{...pickerProps}
/>
</View>
{!_.isEmpty(this.props.errorText) && (
<InlineErrorText>
{this.props.errorText}
</InlineErrorText>
)}
<InlineErrorText>
{this.props.errorText}
</InlineErrorText>
</>
);
}
Expand Down
8 changes: 3 additions & 5 deletions src/components/RadioButtonWithLabel.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,9 @@ const RadioButtonWithLabel = (props) => {
{LabelComponent && (<LabelComponent />)}
</TouchableOpacity>
</View>
{!_.isEmpty(props.errorText) && (
<InlineErrorText>
{props.errorText}
</InlineErrorText>
)}
<InlineErrorText>
{props.errorText}
</InlineErrorText>
</>
);
};
Expand Down
Loading