Show "smart" merchant names

hackclub · Mar 21, 2024 · 7db63d1 · 7db63d1
1 parent 1af8c28
commit 7db63d1
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/src/components/Transaction.tsx b/src/components/Transaction.tsx
@@ -3,6 +3,7 @@ import { useTheme } from "@react-navigation/native";
 import { LinearGradient } from "expo-linear-gradient";
 import { memo } from "react";
 import { View, Text, ViewProps, StyleSheet } from "react-native";
+import { match } from "ts-pattern";
 
 import {
   TransactionCardCharge,
@@ -155,9 +156,20 @@ function Transaction({
             : transaction.pending
             ? "Pending: "
             : "")}
-        {transaction.appearance == "hackathon_grant"
-          ? "💰 Hackathon grant"
-          : transaction.memo.replaceAll(/\s{2,}/g, " ")}
+        {match(transaction)
+          .with(
+            { appearance: "hackathon_grant", has_custom_memo: false },
+            () => "💰 Hackathon grant",
+          )
+          // .with(
+          //   {
+          //     card_charge: { merchant: { smart_name: P.string } },
+          //     has_custom_memo: false,
+          //   },
+          //   (tx) => tx.card_charge.merchant.smart_name,
+          // )
+          .otherwise((tx) => tx.memo)
+          .replaceAll(/\s{2,}/g, " ")}
       </Text>
       {transaction.missing_receipt && !hideMissingReceipt && (
         <View>

diff --git a/src/components/transaction/types/CardChargeTransaction.tsx b/src/components/transaction/types/CardChargeTransaction.tsx
@@ -15,7 +15,10 @@ import TransactionTitle, { Muted } from "../TransactionTitle";
 import { TransactionViewProps } from "./TransactionViewProps";
 
 export default function CardChargeTransaction({
-  transaction,
+  transaction: {
+    card_charge: { merchant, ...card_charge },
+    ...transaction
+  },
   orgId,
 }: TransactionViewProps<TransactionCardCharge>) {
   const navigation =
@@ -36,16 +39,20 @@ export default function CardChargeTransaction({
       <View style={{ flexDirection: "column", alignItems: "center" }}>
         <TransactionTitle badge={badge}>
           {renderMoney(Math.abs(transaction.amount_cents))}{" "}
-          <Muted>charge at</Muted> {transaction.card_charge.merchant.name}
+          <Muted>charge at</Muted>{"\n"}{merchant.smart_name}
         </TransactionTitle>
       </View>
       <TransactionDetails
         details={[
+          {
+            label: "Memo",
+            value: merchant.name,
+          },
           descriptionDetail(orgId, transaction, navigation),
           { label: "Spent on", value: renderDate(transaction.date) },
           {
             label: "Spent by",
-            value: <UserMention user={transaction.card_charge.card.user} />,
+            value: <UserMention user={card_charge.card.user} />,
           },
         ]}
       />

diff --git a/src/lib/types/Transaction.ts b/src/lib/types/Transaction.ts
@@ -40,6 +40,7 @@ export interface TransactionBase
 export interface CardCharge {
   merchant: {
     name: string;
+    smart_name?: string;
     country: string;
   };
   charge_method?: "keyed_in" | "swipe" | "chip" | "contactless" | "online";