merge workspace/reimburse pages#8879
Merged
Merged
Conversation
melvin-bot
Bot
requested review from
Julesssss and
parasharrajat
and removed request for
a team
parasharrajat
suggested changes
May 5, 2022
parasharrajat
left a comment
parasharrajat
left a comment
Member
There was a problem hiding this comment.
In QA steps, add another tests to test NoVBA views.
Comment on lines
+214
to
+232
| : ( | ||
| <Section | ||
| title={this.props.translate('workspace.reimburse.fastReimbursementsHappyMembers')} | ||
| icon={Illustrations.BankUserGreen} | ||
| menuItems={[ | ||
| { | ||
| title: this.props.translate('workspace.reimburse.reimburseReceipts'), | ||
| onPress: () => Link.openOldDotLink(`reports?policyID=${this.props.policyID}&from=all&type=expense&showStates=Archived&isAdvancedFilterMode=true`), | ||
| icon: Expensicons.Bank, | ||
| shouldShowRightIcon: true, | ||
| iconRight: Expensicons.NewWindow, | ||
| }, | ||
| ]} | ||
| > | ||
| <View style={[styles.mv4]}> | ||
| <Text>{this.props.translate('workspace.reimburse.fastReimbursementsVBACopy')}</Text> | ||
| </View> | ||
| </Section> | ||
| )} |
Member
There was a problem hiding this comment.
Let's break this ternary into two like this
Suggested change
| : ( | |
| <Section | |
| title={this.props.translate('workspace.reimburse.fastReimbursementsHappyMembers')} | |
| icon={Illustrations.BankUserGreen} | |
| menuItems={[ | |
| { | |
| title: this.props.translate('workspace.reimburse.reimburseReceipts'), | |
| onPress: () => Link.openOldDotLink(`reports?policyID=${this.props.policyID}&from=all&type=expense&showStates=Archived&isAdvancedFilterMode=true`), | |
| icon: Expensicons.Bank, | |
| shouldShowRightIcon: true, | |
| iconRight: Expensicons.NewWindow, | |
| }, | |
| ]} | |
| > | |
| <View style={[styles.mv4]}> | |
| <Text>{this.props.translate('workspace.reimburse.fastReimbursementsVBACopy')}</Text> | |
| </View> | |
| </Section> | |
| )} | |
| {Boolean(this.props.hasVBA) && ( | |
| <Section | |
| title={this.props.translate('workspace.reimburse.fastReimbursementsHappyMembers')} | |
| icon={Illustrations.BankUserGreen} | |
| menuItems={[ | |
| { | |
| title: this.props.translate('workspace.reimburse.reimburseReceipts'), | |
| onPress: () => Link.openOldDotLink(`reports?policyID=${this.props.policyID}&from=all&type=expense&showStates=Archived&isAdvancedFilterMode=true`), | |
| icon: Expensicons.Bank, | |
| shouldShowRightIcon: true, | |
| iconRight: Expensicons.NewWindow, | |
| }, | |
| ]} | |
| > | |
| <View style={[styles.mv4]}> | |
| <Text>{this.props.translate('workspace.reimburse.fastReimbursementsVBACopy')}</Text> | |
| </View> | |
| </Section> | |
| )} |
Comment on lines
+194
to
+213
| {!this.props.hasVBA ? ( | ||
| <Section | ||
| title={this.props.translate('workspace.reimburse.unlockNextDayReimbursements')} | ||
| icon={Illustrations.JewelBoxGreen} | ||
| > | ||
| <View style={[styles.mv4]}> | ||
| <Text>{this.props.translate('workspace.reimburse.unlockNoVBACopy')}</Text> | ||
| </View> | ||
| <Button | ||
| text={this.props.translate('workspace.common.bankAccount')} | ||
| onPress={() => Navigation.navigate(ROUTES.getWorkspaceBankAccountRoute(this.props.policyID))} | ||
| icon={Expensicons.Bank} | ||
| style={[styles.mt4]} | ||
| iconStyles={[styles.mr5]} | ||
| shouldShowRightIcon | ||
| extraLarge | ||
| success | ||
| /> | ||
| </Section> | ||
| ) |
Member
There was a problem hiding this comment.
Suggested change
| {!this.props.hasVBA ? ( | |
| <Section | |
| title={this.props.translate('workspace.reimburse.unlockNextDayReimbursements')} | |
| icon={Illustrations.JewelBoxGreen} | |
| > | |
| <View style={[styles.mv4]}> | |
| <Text>{this.props.translate('workspace.reimburse.unlockNoVBACopy')}</Text> | |
| </View> | |
| <Button | |
| text={this.props.translate('workspace.common.bankAccount')} | |
| onPress={() => Navigation.navigate(ROUTES.getWorkspaceBankAccountRoute(this.props.policyID))} | |
| icon={Expensicons.Bank} | |
| style={[styles.mt4]} | |
| iconStyles={[styles.mr5]} | |
| shouldShowRightIcon | |
| extraLarge | |
| success | |
| /> | |
| </Section> | |
| ) | |
| {!this.props.hasVBA && ( | |
| <Section | |
| title={this.props.translate('workspace.reimburse.unlockNextDayReimbursements')} | |
| icon={Illustrations.JewelBoxGreen} | |
| > | |
| <View style={[styles.mv4]}> | |
| <Text>{this.props.translate('workspace.reimburse.unlockNoVBACopy')}</Text> | |
| </View> | |
| <Button | |
| text={this.props.translate('workspace.common.bankAccount')} | |
| onPress={() => Navigation.navigate(ROUTES.getWorkspaceBankAccountRoute(this.props.policyID))} | |
| icon={Expensicons.Bank} | |
| style={[styles.mt4]} | |
| iconStyles={[styles.mr5]} | |
| shouldShowRightIcon | |
| extraLarge | |
| success | |
| /> | |
| </Section> | |
| )} |
| success | ||
| /> | ||
| </Section> | ||
| {Boolean(!this.props.hasVBA) && ( |
Member
There was a problem hiding this comment.
!this.props.hasVBA is already boolean.
Contributor
Author
There was a problem hiding this comment.
doesn't this.props.hasVBA also is already boolean?
We get it from:
If so, I think we won't need to cast it to boolean in:
{Boolean(this.props.hasVBA) && (
Contributor
Author
|
Added tests for VBA and noVBA views |
parasharrajat
approved these changes
May 5, 2022
Julesssss
approved these changes
May 5, 2022
Julesssss
left a comment
Julesssss
left a comment
Contributor
There was a problem hiding this comment.
Nice refactor and fix 👍
Contributor
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
Contributor
|
🚀 Cherry-picked to staging by @sketchydroide in version: 1.1.57-8 🚀
@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes. |
Contributor
|
🚀 Deployed to production by @chiragsalian in version: 1.1.57-17 🚀
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Details
Merge reimburse expenses NoVBA + VBA pages.
Fixed Issues
$ #7573
Tests
Tests with VBA:
mWeb,Web,Desktop:
Track Distanceis shown when user has VBA enabled.Android/iOS native:
Track Distanceis shown when user has VBA enabled.Tests with no VBA:
mWeb,Web,Desktop:
Track Distanceis shown when user has no VBA enabled.Android/iOS native:
Track Distanceis shown when user has no VBA enabled.Note: The difference between VBA and no VBA views is the bottom of the component:
PR Review Checklist
Contributor (PR Author) Checklist
### Fixed Issuessection aboveTestssectionQA stepssectiontoggleReportand notonIconClick)src/languages/*filesSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)/** comment above it */displayNamepropertythisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor)thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)Avataris modified, I verified thatAvataris working as expected in all cases)PR Reviewer Checklist
### Fixed Issuessection aboveTestssectionQA stepssectiontoggleReportand notonIconClick).src/languages/*filesSTYLE.md) were followed/** comment above it */displayNamepropertythisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor)thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)Avataris modified, I verified thatAvataris working as expected in all cases)QA Steps
Tests with VBA:
mWeb,Web,Desktop:
Track Distanceis shown when user has VBA enabled.Android/iOS native:
Track Distanceis shown when user has VBA enabled.Tests with no VBA:
mWeb,Web,Desktop:
Track Distanceis shown when user has no VBA enabled.Android/iOS native:
Track Distanceis shown when user has no VBA enabled.Note: The difference between VBA and no VBA views is the bottom of the component:
Screenshots
Web
MacOs-Chrome.mov
Mobile Web
iOS-Safari.mov
Android-Chrome.mp4
Desktop
MacOs-Desktop.mov
iOS
Android