From 70bdd9729fe7345b4dd36e3bd4ce00dc720054c4 Mon Sep 17 00:00:00 2001
From: Ariella Vu <20778143+digiwand@users.noreply.github.com>
Date: Wed, 25 May 2022 10:13:15 -0500
Subject: [PATCH] Enables the "Safe Transaction From" copy for safeTransferFrom
 transactions (#14769)

* useTransactionDisplayData:support safetransferfrom

* useTransactionDisplayData: update test
---
 ui/hooks/useTransactionDisplayData.js      | 8 ++++++--
 ui/hooks/useTransactionDisplayData.test.js | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ui/hooks/useTransactionDisplayData.js b/ui/hooks/useTransactionDisplayData.js
index ee47225c8..d623d7e75 100644
--- a/ui/hooks/useTransactionDisplayData.js
+++ b/ui/hooks/useTransactionDisplayData.js
@@ -238,8 +238,7 @@ export function useTransactionDisplayData(transactionGroup) {
     subtitle = t('fromAddress', [shortenAddress(senderAddress)]);
   } else if (
     type === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM ||
-    type === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER ||
-    type === TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM
+    type === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER
   ) {
     category = TRANSACTION_GROUP_CATEGORIES.SEND;
     title = t('sendSpecifiedTokens', [
@@ -247,6 +246,11 @@ export function useTransactionDisplayData(transactionGroup) {
     ]);
     recipientAddress = getTokenAddressParam(tokenData);
     subtitle = t('toAddress', [shortenAddress(recipientAddress)]);
+  } else if (type === TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM) {
+    category = TRANSACTION_GROUP_CATEGORIES.SEND;
+    title = t('safeTransferFrom');
+    recipientAddress = getTokenAddressParam(tokenData);
+    subtitle = t('toAddress', [shortenAddress(recipientAddress)]);
   } else if (type === TRANSACTION_TYPES.SIMPLE_SEND) {
     category = TRANSACTION_GROUP_CATEGORIES.SEND;
     title = t('send');
diff --git a/ui/hooks/useTransactionDisplayData.test.js b/ui/hooks/useTransactionDisplayData.test.js
index 29e4d43d2..b30ea254d 100644
--- a/ui/hooks/useTransactionDisplayData.test.js
+++ b/ui/hooks/useTransactionDisplayData.test.js
@@ -131,7 +131,7 @@ const expectedResults = [
     displayedStatusKey: TRANSACTION_STATUSES.CONFIRMED,
   },
   {
-    title: 'Send Token',
+    title: 'Safe Transfer From',
     category: TRANSACTION_GROUP_CATEGORIES.SEND,
     subtitle: 'To: 0xe7d...dd98',
     subtitleContainsOrigin: true,