From 4fdd97b12bd82bd14f69bcd3b6559e6fbfe8a538 Mon Sep 17 00:00:00 2001
From: Dan J Miller <danjm.com@gmail.com>
Date: Fri, 21 May 2021 09:31:45 -0230
Subject: [PATCH 1/3] Capture exception instead of throw error in
 useTransactionDisplayData (#11153)

---
 ui/app/hooks/useTransactionDisplayData.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/app/hooks/useTransactionDisplayData.js b/ui/app/hooks/useTransactionDisplayData.js
index ea886205e..dc589f858 100644
--- a/ui/app/hooks/useTransactionDisplayData.js
+++ b/ui/app/hooks/useTransactionDisplayData.js
@@ -1,4 +1,5 @@
 import { useSelector } from 'react-redux';
+import { captureException } from '@sentry/browser';
 import { getKnownMethodData } from '../selectors/selectors';
 import {
   getStatusKey,
@@ -221,8 +222,10 @@ export function useTransactionDisplayData(transactionGroup) {
     title = t('send');
     subtitle = t('toAddress', [shortenAddress(recipientAddress)]);
   } else {
-    throw new Error(
-      `useTransactionDisplayData does not recognize transaction type. Type received is: ${type}`,
+    captureException(
+      Error(
+        `useTransactionDisplayData does not recognize transaction type. Type received is: ${type}`,
+      ),
     );
   }
 

From 00f141ff9c2daa06150e2b55aba2da4cb3156339 Mon Sep 17 00:00:00 2001
From: MetaMask Bot <metamaskbot@users.noreply.github.com>
Date: Fri, 21 May 2021 16:07:41 +0000
Subject: [PATCH 2/3] Version v9.5.4

---
 CHANGELOG.md            | 7 ++++++-
 app/manifest/_base.json | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0add13fc8..b9ea74ea5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [9.5.4]
+### Uncategorized
+- [#11153](https://github.com/MetaMask/metamask-extension/pull/11153): Capture exception instead of throw error in useTransactionDisplayData
+
 ## [9.5.3]
 ### Fixed
 - [#11103](https://github.com/MetaMask/metamask-extension/pull/11103): Fixes bug that made MetaMask unusable and displayed 'Minified React error #130' on certain networks and accounts
@@ -2235,7 +2239,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Uncategorized
 - Added the ability to restore accounts from seed words.
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v9.5.3...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v9.5.4...HEAD
+[9.5.4]: https://github.com/MetaMask/metamask-extension/compare/v9.5.3...v9.5.4
 [9.5.3]: https://github.com/MetaMask/metamask-extension/compare/v9.5.2...v9.5.3
 [9.5.2]: https://github.com/MetaMask/metamask-extension/compare/v9.5.1...v9.5.2
 [9.5.1]: https://github.com/MetaMask/metamask-extension/compare/v9.5.0...v9.5.1
diff --git a/app/manifest/_base.json b/app/manifest/_base.json
index bff810ebb..47cc6a5f9 100644
--- a/app/manifest/_base.json
+++ b/app/manifest/_base.json
@@ -71,6 +71,6 @@
     "notifications"
   ],
   "short_name": "__MSG_appName__",
-  "version": "9.5.3",
+  "version": "9.5.4",
   "web_accessible_resources": ["inpage.js", "phishing.html"]
 }

From a0b3f78d33d9f44a6832eb86de0be4db29efb36a Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Fri, 21 May 2021 14:24:18 -0230
Subject: [PATCH 3/3] Update v9.5.4 changelog (#11157)

The changelog has been updated to categorize the single commit, and
improve the description.
---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9ea74ea5..4b5d916a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [9.5.4]
-### Uncategorized
-- [#11153](https://github.com/MetaMask/metamask-extension/pull/11153): Capture exception instead of throw error in useTransactionDisplayData
+### Fixed
+- [#11153](https://github.com/MetaMask/metamask-extension/pull/11153): Prevent UI crash when the transaction being retried or canceled is missing.
 
 ## [9.5.3]
 ### Fixed