Add inactive pill to cardlist, show frozen card #82961
Conversation
|
🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here. |
🦜 Polyglot Parrot! 🦜Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues: View the translation diffdiff --git a/src/languages/de.ts b/src/languages/de.ts
index 11e31ae8..0e7d47d1 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -2120,7 +2120,7 @@ const translations: TranslationDeepObject<typeof en> = {
enableWallet: 'Wallet aktivieren',
addBankAccountToSendAndReceive: 'Füge ein Bankkonto hinzu, um Zahlungen zu senden oder zu empfangen.',
addDebitOrCreditCard: 'Debit- oder Kreditkarte hinzufügen',
- cardInactive: 'Inactive',
+ cardInactive: 'Inaktiv',
assignedCards: 'Zugewiesene Karten',
assignedCardsDescription: 'Transaktionen von diesen Karten werden automatisch synchronisiert.',
expensifyCard: 'Expensify Card',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 9fc53305..ab135485 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -2126,7 +2126,7 @@ const translations: TranslationDeepObject<typeof en> = {
enableWallet: 'Activer le portefeuille',
addBankAccountToSendAndReceive: 'Ajoutez un compte bancaire pour effectuer ou recevoir des paiements.',
addDebitOrCreditCard: 'Ajouter une carte de débit ou de crédit',
- cardInactive: 'Inactive',
+ cardInactive: 'Inactif',
assignedCards: 'Cartes assignées',
assignedCardsDescription: 'Les transactions de ces cartes se synchronisent automatiquement.',
expensifyCard: 'Carte Expensify',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 0f48192f..3d5ee2b2 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -2116,7 +2116,7 @@ const translations: TranslationDeepObject<typeof en> = {
enableWallet: 'Abilita portafoglio',
addBankAccountToSendAndReceive: 'Aggiungi un conto bancario per effettuare o ricevere pagamenti.',
addDebitOrCreditCard: 'Aggiungi carta di debito o di credito',
- cardInactive: 'Inactive',
+ cardInactive: 'Inattivo',
assignedCards: 'Carte assegnate',
assignedCardsDescription: 'Le transazioni di queste carte si sincronizzano automaticamente.',
expensifyCard: 'Carta Expensify',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index fb193cb9..e1b8a429 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -2107,7 +2107,7 @@ const translations: TranslationDeepObject<typeof en> = {
enableWallet: 'ウォレットを有効にする',
addBankAccountToSendAndReceive: '支払いや入金を行うには銀行口座を追加してください。',
addDebitOrCreditCard: 'デビットカードまたはクレジットカードを追加',
- cardInactive: 'Inactive',
+ cardInactive: '非アクティブ',
assignedCards: '割り当て済みカード',
assignedCardsDescription: 'これらのカードからの取引は自動的に同期されます。',
expensifyCard: 'Expensify カード',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index c20ac420..0e27ba43 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -2115,7 +2115,7 @@ const translations: TranslationDeepObject<typeof en> = {
enableWallet: 'Portemonnee inschakelen',
addBankAccountToSendAndReceive: 'Voeg een bankrekening toe om betalingen te doen of te ontvangen.',
addDebitOrCreditCard: 'Debet- of creditcard toevoegen',
- cardInactive: 'Inactive',
+ cardInactive: 'Inactief',
assignedCards: 'Toegewezen kaarten',
assignedCardsDescription: 'Transacties van deze kaarten worden automatisch gesynchroniseerd.',
expensifyCard: 'Expensify Card',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index e3ef492b..e3fcd548 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -2114,7 +2114,7 @@ const translations: TranslationDeepObject<typeof en> = {
enableWallet: 'Włącz portfel',
addBankAccountToSendAndReceive: 'Dodaj konto bankowe, aby wysyłać lub odbierać płatności.',
addDebitOrCreditCard: 'Dodaj kartę debetową lub kredytową',
- cardInactive: 'Inactive',
+ cardInactive: 'Nieaktywne',
assignedCards: 'Przypisane karty',
assignedCardsDescription: 'Transakcje z tych kart synchronizują się automatycznie.',
expensifyCard: 'Karta Expensify',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 09828397..aeda591b 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -2111,7 +2111,7 @@ const translations: TranslationDeepObject<typeof en> = {
enableWallet: 'Ativar carteira',
addBankAccountToSendAndReceive: 'Adicione uma conta bancária para fazer ou receber pagamentos.',
addDebitOrCreditCard: 'Adicionar cartão de débito ou crédito',
- cardInactive: 'Inactive',
+ cardInactive: 'Inativo',
assignedCards: 'Cartões atribuídos',
assignedCardsDescription: 'As transações desses cartões são sincronizadas automaticamente.',
expensifyCard: 'Cartão Expensify',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 1814e379..6db1cac5 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -2078,7 +2078,7 @@ const translations: TranslationDeepObject<typeof en> = {
enableWallet: '启用钱包',
addBankAccountToSendAndReceive: '添加银行账户以进行或接收付款。',
addDebitOrCreditCard: '添加借记卡或信用卡',
- cardInactive: 'Inactive',
+ cardInactive: '未激活',
assignedCards: '已分配的卡片',
assignedCardsDescription: '这些银行卡的交易会自动同步。',
expensifyCard: 'Expensify 卡',
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
This comment has been minimized.
This comment has been minimized.
Codecov Report❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.
|
|
🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here. |
This comment was marked as resolved.
This comment was marked as resolved.
|
🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
|
🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
grgia
changed the title
# Conflicts: # src/pages/settings/Wallet/PaymentMethodListItem.tsx
|
🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
grgia
changed the title
🔍 Updated PR Review —
|
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: ba57e9c231
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
| !descriptionAddon && icon && !Array.isArray(icon) ? styles.ml3 : {}, | ||
| descriptionAddon ? styles.ml2 : {}, |
There was a problem hiding this comment.
descriptionTextStyle previously came after the built-in icon indent, so screens could intentionally remove that indent (e.g., by passing styles.ml0 in card-detail MenuItems). In this change, styles.ml3/styles.ml2 are appended after descriptionTextStyle, which now forces left padding even when callers explicitly override it, leading to visible misalignment for icon+description rows that depend on custom spacing. Keep the default margin styles lower-precedence than descriptionTextStyle to avoid regressing existing layouts.
Useful? React with 👍 / 👎.
Is this one still held? |
No #82961 (comment) is just a blocker before merge |
JS00001
left a comment
JS00001
left a comment
There was a problem hiding this comment.
LGTM besides the one oustanding comment
src/components/MenuItem.tsx
Outdated
|
|
||
| const renderDescriptionView = () => { | ||
| if (!description && !descriptionAddon) { | ||
| return; |
There was a problem hiding this comment.
NAB, return null since this is returning jsx
|
@JS00001 @aimane-chnaif okay fixed the NAB to return null, should be good to merge |
|
What about this regression? - (descriptionTextStyle as TextStyle) || styles.breakWord,
!descriptionAddon && icon && !Array.isArray(icon) ? styles.ml3 : {},
descriptionAddon ? styles.ml2 : {},
+ (descriptionTextStyle as TextStyle) || styles.breakWord, |
🔍 PR ReviewNice work on moving the frozen/inactive badges from the right-side badge to inline description addons using the existing Issues1. Empty Suggest wrapping conditionally: <View style={descriptionContainerStyle}>
{descriptionAddon}
{!!description && (
<Text style={descriptionTextStyles} numberOfLines={numberOfLinesDescription}>
{description}
</Text>
)}
</View>2. Non-Expensify cards missing 3. Prop naming: 4. Double margin on description text Verified Correct
Confidence: High — reviewed all changed files and their dependencies. |
|
this PR is a case study on the endless stupid cycle of AI review / AI implementation lol |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: d17d32b8f7
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
|
🚧 @JS00001 has triggered a test Expensify/App build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/JS00001 in version: 9.3.52-0 🚀
Bundle Size Analysis (Sentry): |
|
🤖 Yes, help site changes are needed. I reviewed the PR and identified two articles that should be updated to document the new Frozen and Inactive card badge indicators. Draft PR created: #86999 Changes made:
All content follows HELPSITE_NAMING_CONVENTIONS.md and HELP_AUTHORING_GUIDELINES.md (task-based headings, exact UI terminology, concise and actionable). Please mark it as "Ready for review" when it is ready for review. |
|
@grgia @shawnborton how do we make a card inactive? |
|
🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.52-9 🚀
|
7 participants
Explanation of Change
Fixed Issues
$ #82808
PROPOSAL:
Tests
Offline tests
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari