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.

Sign up for GitHub

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

Jump to bottom

add settlement frequency link complete #8050

Merged
merged 7 commits into from
Mar 21, 2022
Merged

add settlement frequency link complete #8050

merged 7 commits into from
Mar 21, 2022

Conversation

Justicea83
Copy link
Contributor

@Justicea83 Justicea83 commented Mar 9, 2022 •
edited by Stutikuls
Loading

Details

This PR needs this https://github.com/Expensify/Web-Expensify/pull/33250 to be merged before it works.

Fixed Issues

$https://github.com/Expensify/Expensify/issues/199498

Tests

  1. Click on your profile picture
  2. Go to your workspace
  3. Go to issue cards
  4. Click on Settlement Frequency
  5. It should redirect you to olddot settings tab with this picture

Screenshot 2022-03-09 at 9 21 03 AM

For example:

  1. Click on the text input to bring it into focus
  2. Upload an image via copy paste
  3. Verify a modal appears displaying a preview of that image
    --->
  • Verify that no errors appear in the JS console

PR Review Checklist

Contributor (PR Author) Checklist

  • I verified the PR has a small number of commits behind main
  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I clearly indicated the environment tests should be run in (Staging vs Production)
  • I wrote testing steps that cover success & fail scenarios (if applicable)
  • I included screenshots or videos for tests on all platforms
  • I ran the tests & veryfy 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 followed proper code patterns (see 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) for all style edits I made
    • I followed the JSDocs style guidelines (in STYLE.md)
  • I followed the guidelines as stated in the Review Guidelines
  • 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 corroborated the UI performance was not affected (the performance is the same than main branch)
  • If I created a new component I verified that a similar component doesn't exist in the codebase

PR Reviewer Checklist

  • I verified the PR has a small number of commits behind main
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the testing environment is mentioned in the test steps
  • I verified testing steps cover success & fail scenarios (if applicable)
  • I checked that screenshots or videos are included for tests on all platforms
  • I verified tests pass on all platforms & I tested again 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 proper code patterns were followed (see 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 were followed
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • 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 the UI performance was not affected (the performance is the same than main branch)
  • If a new component is created I verified that a similar component doesn't exist in the codebase

QA Steps

  • Verify that no errors appear in the JS console

Screenshots

Web

Mobile Web

Desktop

iOS

Android

@Justicea83 Justicea83 requested a review from a team as a code owner March 9, 2022 10:06
@github-actions
Copy link
Contributor

github-actions bot commented Mar 9, 2022 •
edited
Loading

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

@MelvinBot MelvinBot requested review from nkuoch and removed request for a team March 9, 2022 10:06
@nkuoch nkuoch changed the title add settlement frequency link complete [HOLD] add settlement frequency link complete Mar 9, 2022
@Justicea83 Justicea83 changed the title [HOLD] add settlement frequency link complete add settlement frequency link complete Mar 9, 2022
madmax330
madmax330 reviewed Mar 11, 2022
View reviewed changes
src/pages/workspace/card/WorkspaceCardVBAWithECardView.js Outdated
@@ -32,6 +32,13 @@ const WorkspaceCardVBAWithECardView = props => (
shouldShowRightIcon: true,
iconRight: Expensicons.NewWindow,
},
{
title: props.translate('workspace.common.settlementFrequency'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be behind the monthlySettlement beta

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have been researching and found an SO but all the info is about how to implement Beta in Web-Expensify
You know how i can do same in newdot?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure myself, I don't really work in newDot. But if you search the codebase you should be able to find some examples. Alternatively you can ask in #eng-chat

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check Permissions.canUseWallet(props.betas) and you can do something similar

@Justicea83
Copy link
Contributor Author

updated and waiting for another review

@nkuoch
Copy link
Contributor

nkuoch commented Mar 17, 2022

hmm I think you hid it behind the wrong beta.

madmax330
madmax330 reviewed Mar 18, 2022
View reviewed changes
src/pages/workspace/card/WorkspaceCardVBAWithECardView.js Outdated
iconRight: Expensicons.NewWindow,
},
];
if (Permissions.canUseWallet(props.betas)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't the right beta. It should be monthlySettlements but the beta isn't on newDot. So you have to add that in

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated and awaiting another review

@Justicea83
Copy link
Contributor Author

updated and awaiting another review

madmax330
madmax330 reviewed Mar 18, 2022
View reviewed changes
src/libs/Permissions.js
* @param {Array<String>} betas
* @returns {Boolean}
*/
function canUseMonthlySettlements(betas) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to export this

@Justicea83
Copy link
Contributor Author

updated and awaiting another review

@Justicea83
Copy link
Contributor Author

Gentle bump @madmax330

@Justicea83 Justicea83 merged commit 1e43356 into main Mar 21, 2022
@Justicea83 Justicea83 deleted the justice_add-settlement-frequency-link branch March 21, 2022 09:02
@OSBotify
Copy link
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.

@OSBotify OSBotify mentioned this pull request Mar 24, 2022
Closed
69 tasks
@OSBotify
Copy link
Contributor

🚀 Deployed to staging by @Justicea83 in version: 1.1.46-0 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

@OSBotify
Copy link
Contributor

🚀 Deployed to production by @timszot in version: 1.1.46-3 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 web 🕸 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@madmax330 madmax330 madmax330 left review comments

@nkuoch nkuoch nkuoch approved these changes

Assignees

@Justicea83 Justicea83

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Justicea83 @nkuoch @OSBotify @madmax330