[NoQA] Feat/44307 card system messages #46281

koko57 · 2024-07-26T12:12:43Z

Details

To test UI I've implemented a bit hacky ;) way to test - you need to type a certain message to see the report action you want. CARDISSUED, CARDISSUEDVIRTUAL, CARDMISSINGADDRESS are the actual action names that will be handled, I also added two more for testing convenience NOMAILINGADDRESS and ADDRESSADDED - they will work regardless you have your mailing address added or not.

Fixed Issues

$ #44307
PROPOSAL: -

Tests

Go to any chat.
Type in CARDISSUED or CARDISSUEDVIRTUAL or CARDMISSINGADDRESS or ADDRESSADDED or NOMAILINGADDRESS (the last two are not action types, added them for testing purposes and convenience)
Verify that the messages look like in design and have a proper copies (copies here)
note: for now the mention will be green as your profile is mentioned
Verify that for CARDMISSINGADDRESS when you don't have the address added or for NOMAILINGADDRESS (when you have address added) a button linking to /settings/address is displayed and clicking it navigate to this page
Verify that for CARDISSUEDVIRTUAL "Expensify Card" in text is a link to /settings/wallet.

Verify that no errors appear in the JS console

Offline tests

QA Steps

n/a

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-07-26.at.14.09.06.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-07-26.at.14.10.31.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-07-26.at.13.46.44.mp4

MacOS: Desktop

Screen.Recording.2024-07-26.at.14.06.44.mp4

melvin-bot · 2024-07-26T12:44:32Z

@ahmedGaber93 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

allgandalf · 2024-07-29T04:10:41Z

@ahmedGaber93 , sorry for the ping, you can ignore it, this PR is a part of project.

allgandalf · 2024-07-29T04:11:25Z

@koko57 can you try and fix typescript failure?, let's try to get it approved today 🚀

allgandalf · 2024-07-29T04:14:09Z

I guess merging main will solve the type failure, lets try that

allgandalf · 2024-07-29T05:46:35Z

I asked chatGPT about the error, it says to check the type of the message:

const prevActionResolution = usePrevious(
  isActionableWhisper &&
  originalMessage != null &&
  typeof originalMessage === 'object' &&
  'resolution' in originalMessage
    ? originalMessage.resolution
    : null
);

Can you make changes and run the typecheck locally

koko57 · 2024-07-29T06:16:06Z

@allgandalf I've found a fix for that, will push it in a minute, if running typecheck locally passes

allgandalf · 2024-07-29T06:18:21Z

@koko57 , can you request a review from me please? Not able to keep track of this PR as this is not in my K2 (idk if you have that access)

koko57 · 2024-07-29T06:22:58Z

@allgandalf no, unfortunately I cannot do that - I don't have access

koko57 · 2024-07-29T06:36:54Z

@allgandalf fixed

allgandalf · 2024-07-29T09:42:52Z

@koko57 can you remove the QA testing steps and mark this No QA, there will be several cases like new account/ no workspace / free trail expired which will exist as we are testing this hardcoded, don't want the QA to fill up with deploy blocker related to these cases

src/components/ReportActionItem/IssueCardMessage.tsx

allgandalf · 2024-07-29T09:47:29Z

src/languages/es.ts

@@ -2759,6 +2760,11 @@ export default {
                `Si cambias el tipo de límite de esta tarjeta a Límite inteligente, las nuevas transacciones serán rechazadas porque ya se ha alcanzado el límite de ${limit} no aprobado.`,
            changeCardMonthlyLimitTypeWarning: (limit: string) =>
                `Si cambias el tipo de límite de esta tarjeta a Mensual, las nuevas transacciones serán rechazadas porque ya se ha alcanzado el límite de ${limit} mensual.`,
+            addMailingAddress: 'Añadir dirección postal',


Suggested change

addMailingAddress: 'Añadir dirección postal',

addMailingAddress: 'Añadir dirección de postal',

According to design doc this is:

allgandalf · 2024-07-29T09:48:37Z

src/languages/en.ts

@@ -2707,6 +2708,11 @@ export default {
                `If you change this card's limit type to Smart Limit, new transactions will be declined because the ${limit} unapproved limit has already been reached.`,
            changeCardMonthlyLimitTypeWarning: (limit: string) =>
                `If you change this card's limit type to Monthly, new transactions will be declined because the ${limit} monthly limit has already been reached.`,
+            addMailingAddress: 'Add mailing address',
+            issuedCard: (assignee: string) => `issued ${assignee} an Expensify Card! The card will arrive in 2-3 business days.`,


I see that in design doc, we mentioned the name of the admin as well, was it left out on purpose?

we don't have the Admin's name in the message in Figma https://www.figma.com/design/9J4v6CzMVLQbzXMnXC5Izq/%23wave-collect%3A-Workspace-Card-Feeds?node-id=2565-32040&t=p5sUZgAYMIDW3Lsb-0

Odd :) If we are matching with the figma mocks, I'm okay with the current state, thanks for mentioning

allgandalf · 2024-07-29T10:03:15Z

src/languages/en.ts

+            addMailingAddress: 'Add mailing address',
+            issuedCard: (assignee: string) => `issued ${assignee} an Expensify Card! The card will arrive in 2-3 business days.`,
+            issuedCardNoMailingAddress: (assignee: string) => `issued ${assignee} an Expensify Card! The card will be shipped once a mailing address is added.`,
+            issuedCardVirtual: ({assignee, link}: IssueVirtualCardParams) => `issued ${assignee} a virtual ${link}! The card can be used right away.`,


Okay i ready the convo #44307 (comment), I'll mark this as resolved

allgandalf · 2024-07-29T10:03:33Z

src/languages/en.ts

+            issuedCard: (assignee: string) => `issued ${assignee} an Expensify Card! The card will arrive in 2-3 business days.`,
+            issuedCardNoMailingAddress: (assignee: string) => `issued ${assignee} an Expensify Card! The card will be shipped once a mailing address is added.`,
+            issuedCardVirtual: ({assignee, link}: IssueVirtualCardParams) => `issued ${assignee} a virtual ${link}! The card can be used right away.`,
+            addedAddress: (assignee: string) => `${assignee} added the address. Expensify Card will arrive in 2-3 business days.`,


Okay i ready the convo #44307 (comment), I'll mark this as resolved

allgandalf · 2024-07-29T10:04:42Z

src/languages/en.ts

@@ -2707,6 +2708,11 @@ export default {
                `If you change this card's limit type to Smart Limit, new transactions will be declined because the ${limit} unapproved limit has already been reached.`,
            changeCardMonthlyLimitTypeWarning: (limit: string) =>
                `If you change this card's limit type to Monthly, new transactions will be declined because the ${limit} monthly limit has already been reached.`,
+            addMailingAddress: 'Add mailing address',
+            issuedCard: (assignee: string) => `issued ${assignee} an Expensify Card! The card will arrive in 2-3 business days.`,
+            issuedCardNoMailingAddress: (assignee: string) => `issued ${assignee} an Expensify Card! The card will be shipped once a mailing address is added.`,


Okay i ready the convo #44307 (comment), I'll mark this as resolved

allgandalf

The changes suggested above are majorly about the text and not related to functionality, so I will start with the testing, but will approve after the comments are addressed

allgandalf · 2024-07-29T09:57:17Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
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 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 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
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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 is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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) 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
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- 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
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- 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 any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Screen.Recording.2024-07-29.at.4.59.06.PM.mov

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

allgandalf · 2024-07-29T10:07:40Z

At the moment, we can type the hardcoded words CARDISSUED on any chat, self dm/ 1:1 / admins room. From the convo i read we only want the messages to go to workspace chat. Will that be automatically resolved when we remove the hardcoded part or do we have to put logic for that @koko57 ? if yes then lets try to put that logic in this PR itself

Screen.Recording.2024-07-29.at.3.35.50.PM.mov

koko57 · 2024-07-29T10:09:56Z

At the moment, we can type the hardcoded words CARDISSUED on any chat, self dm/ 1:1 / admins room. From the convo i read we only want the messages to go to workspace chat. Will that be automatically resolved when we remove the hardcoded part or do we have to put logic for that @koko57 ? if yes then lets try to put that logic in this PR itself

Screen.Recording.2024-07-29.at.3.35.50.PM.mov

@allgandalf no, for now you can type in any chat - I don't wanted to add unnecessary extra logic that will be removed later

allgandalf · 2024-07-29T10:10:48Z

@allgandalf no, for now you can type in any chat - I don't wanted to add unnecessary extra logic that will be removed later

Works for me thanks 👍

allgandalf · 2024-07-29T10:56:36Z

src/components/ReportActionItem/IssueCardMessage.tsx

+            case CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS:
+                return translate(`workspace.expensifyCard.${noMailingAddress ? 'issuedCardNoMailingAddress' : 'addedAddress'}`, assignee);


Bug

Wrong system message for CARD_MISSING_ADDRESS it says the card will be delivered in few days instead of missing address message c.c @koko57

Screen.Recording.2024-07-29.at.4.25.24.PM.mov

That's because you have your address added - if you wouldn't have it a proper message with button to add an address would be displayed. After you add the address it is displayed like this - that's why I added two additional cases to test regardless you have it added or not

You can try to log into a new account that doesn't have address added to test it

let me give it a try

This occurs with new accounts as well:

Screen.Recording.2024-07-29.at.4.32.02.PM.mov

IMO noMailingAddress is always returning false here. can you please take a look

@allgandalf fixed! I forgot that I changed action?.originalMessage.html for action?.actionName (the proper condition). I added an extra check that will be removed later

allgandalf · 2024-07-29T11:18:53Z

can you check this too @koko57 , and also mark this no QA

koko57 · 2024-07-29T11:26:10Z

can you check this too @koko57 , and also mark this no QA

@allgandalf without it it opens in a new tab. We also have it implemented this way in getMemberChangeMessageFragment in ReportActionUtils

allgandalf

This looks good to go into staging, we have only implemented the skeleton in here, still waiting for BE implementation for integration. thanks for addressing the issues @koko57 !

Good start to the week!

mountiny

Nice, thanks!

OSBotify · 2024-07-29T20:56:52Z

✋ 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 · 2024-07-31T19:32:24Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.0.15-0 🚀

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

OSBotify · 2024-08-02T02:20:34Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.0.15-9 🚀

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

koko57 added 5 commits July 26, 2024 09:39

feat: add new card action types

614518e

feat: create IssueCardMessage component

36661fb

fix: minor fix

e4284d2

fix: add 2 cases for testing

018e939

fix: use useEnvironment

3137495

koko57 marked this pull request as ready for review July 26, 2024 12:44

koko57 requested a review from a team as a code owner July 26, 2024 12:44

melvin-bot bot requested review from ahmedGaber93 and removed request for a team July 26, 2024 12:44

Merge branch 'main' into feat/44307-card-system-messages

f0283e4

fix: typecheck

e74c3cf

allgandalf reviewed Jul 29, 2024

View reviewed changes

src/components/ReportActionItem/IssueCardMessage.tsx Show resolved Hide resolved

allgandalf reviewed Jul 29, 2024

View reviewed changes

src/components/ReportActionItem/IssueCardMessage.tsx Show resolved Hide resolved

allgandalf reviewed Jul 29, 2024

View reviewed changes

koko57 added 2 commits July 29, 2024 12:26

fix: spanish translation

93a771b

Merge branch 'main' into feat/44307-card-system-messages

b7d963e

koko57 requested a review from allgandalf July 29, 2024 10:39

allgandalf reviewed Jul 29, 2024

View reviewed changes

koko57 added 2 commits July 29, 2024 13:16

fix: minor fix

9ecee55

fix: remove console log

2346f07

allgandalf approved these changes Jul 29, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny July 29, 2024 11:35

chore: remove testing cases

fcb3cef

trjExpensify removed the request for review from ahmedGaber93 July 29, 2024 15:39

mountiny assigned koko57 Jul 29, 2024

mountiny changed the title ~~Feat/44307 card system messages~~ [NoQa] Feat/44307 card system messages Jul 29, 2024

mountiny changed the title ~~[NoQa] Feat/44307 card system messages~~ [NoQA] Feat/44307 card system messages Jul 29, 2024

mountiny approved these changes Jul 29, 2024

View reviewed changes

mountiny merged commit d6784e2 into Expensify:main Jul 29, 2024
16 checks passed

github-actions bot mentioned this pull request Jul 31, 2024

Deploy Checklist: New Expensify 2024-07-31 #46607

Closed

melvin-bot bot mentioned this pull request Aug 2, 2024

[HOLD for payment 2024-08-09] [Workspace Feeds] [External] Add a support for new system messages #44307

Closed

jjcoffee mentioned this pull request Oct 18, 2024

[HOLD for payment 2024-10-16] [$250] Expensify card - Expensify card link navigates to wallet instead of virtual card details #49804

Closed

6 tasks

rojiphil mentioned this pull request Nov 4, 2024

Fix: Expensify Card - issued starts with a lowercase i on shipping address message #51941

Closed

49 tasks

	addMailingAddress: 'Añadir dirección postal',
	addMailingAddress: 'Añadir dirección de postal',

		case CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS:
		return translate(`workspace.expensifyCard.${noMailingAddress ? 'issuedCardNoMailingAddress' : 'addedAddress'}`, assignee);

[NoQA] Feat/44307 card system messages #46281

[NoQA] Feat/44307 card system messages #46281

Conversation

koko57 commented Jul 26, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 26, 2024

allgandalf commented Jul 29, 2024

allgandalf commented Jul 29, 2024

allgandalf commented Jul 29, 2024

allgandalf commented Jul 29, 2024 • edited Loading

koko57 commented Jul 29, 2024

allgandalf commented Jul 29, 2024 • edited Loading

koko57 commented Jul 29, 2024

koko57 commented Jul 29, 2024

allgandalf commented Jul 29, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as resolved.

This comment was marked as resolved.

Choose a reason for hiding this comment

This comment was marked as resolved.

Choose a reason for hiding this comment

This comment was marked as resolved.

Choose a reason for hiding this comment

allgandalf left a comment

Choose a reason for hiding this comment

allgandalf commented Jul 29, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

allgandalf commented Jul 29, 2024 • edited Loading

koko57 commented Jul 29, 2024

allgandalf commented Jul 29, 2024

Choose a reason for hiding this comment

Bug

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

allgandalf commented Jul 29, 2024 • edited Loading

koko57 commented Jul 29, 2024

allgandalf left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Jul 29, 2024

OSBotify commented Jul 31, 2024

OSBotify commented Aug 2, 2024

koko57 commented Jul 26, 2024 •

edited

Loading

allgandalf commented Jul 29, 2024 •

edited

Loading

allgandalf commented Jul 29, 2024 •

edited

Loading

allgandalf commented Jul 29, 2024 •

edited

Loading

allgandalf commented Jul 29, 2024 •

edited

Loading

allgandalf commented Jul 29, 2024 •

edited

Loading