Merge pull request #12686 from MetaMask/Version-v10.5.2

Version v10.5.2 RC

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [10.5.2]
+### Fixed
+- [#12685](https://github.com/MetaMask/metamask-extension/pull/12685): Fix Ledger WebHID issue preventing confirmation of token approvals
+
 ## [10.5.1]
 ### Changed
 - [#12658](https://github.com/MetaMask/metamask-extension/pull/12658): Properly display transaction fees on layer two networks like Optimism which have fees on both layers
@@ -2550,7 +2554,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/v10.5.1...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.5.2...HEAD
+[10.5.2]: https://github.com/MetaMask/metamask-extension/compare/v10.5.1...v10.5.2
 [10.5.1]: https://github.com/MetaMask/metamask-extension/compare/v10.5.0...v10.5.1
 [10.5.0]: https://github.com/MetaMask/metamask-extension/compare/v10.4.1...v10.5.0
 [10.4.1]: https://github.com/MetaMask/metamask-extension/compare/v10.4.0...v10.4.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "10.5.1",
+  "version": "10.5.2",
   "private": true,
   "repository": {
     "type": "git",

ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js

@@ -46,7 +46,7 @@ export default class ConfirmApproveContent extends Component {
     showCustomizeNonceModal: PropTypes.func,
     warning: PropTypes.string,
     txData: PropTypes.object,
-    ledgerWalletRequiredHidConnection: PropTypes.bool,
+    fromAddressIsLedger: PropTypes.bool,
   };
 
   state = {
@@ -242,7 +242,7 @@ export default class ConfirmApproveContent extends Component {
       useNonceField,
       warning,
       txData,
-      ledgerWalletRequiredHidConnection,
+      fromAddressIsLedger,
     } = this.props;
     const { showFullTxDetails } = this.state;
 
@@ -351,7 +351,7 @@ export default class ConfirmApproveContent extends Component {
             })}
         </div>
 
-        {ledgerWalletRequiredHidConnection ? (
+        {fromAddressIsLedger ? (
           <div className="confirm-approve-content__ledger-instruction-wrapper">
             <LedgerInstructionField
               showDataInstruction={Boolean(txData.txParams?.data)}

ui/pages/confirm-approve/confirm-approve.js

@@ -15,7 +15,11 @@ import {
   getTokenValueParam,
 } from '../../helpers/utils/token-util';
 import { useTokenTracker } from '../../hooks/useTokenTracker';
-import { getTokens, getNativeCurrency } from '../../ducks/metamask/metamask';
+import {
+  getTokens,
+  getNativeCurrency,
+  isAddressLedger,
+} from '../../ducks/metamask/metamask';
 import {
   transactionFeeSelector,
   txDataSelector,
@@ -24,7 +28,6 @@ import {
   getUseNonceField,
   getCustomNonceValue,
   getNextSuggestedNonce,
-  doesAddressRequireLedgerHidConnection,
 } from '../../selectors';
 
 import { useApproveTransaction } from '../../hooks/useApproveTransaction';
@@ -36,10 +39,8 @@ import { isEqualCaseInsensitive } from '../../helpers/utils/util';
 import { getCustomTxParamsData } from './confirm-approve.util';
 import ConfirmApproveContent from './confirm-approve-content';
 
-const doesAddressRequireLedgerHidConnectionByFromAddress = (address) => (
+const isAddressLedgerByFromAddress = (address) => (state) => {
-  state,
+  return isAddressLedger(state, address);
-) => {
-  return doesAddressRequireLedgerHidConnection(state, address);
 };
 
 export default function ConfirmApprove() {
@@ -59,9 +60,7 @@ export default function ConfirmApprove() {
   const nextNonce = useSelector(getNextSuggestedNonce);
   const customNonceValue = useSelector(getCustomNonceValue);
 
-  const ledgerWalletRequiredHidConnection = useSelector(
+  const fromAddressIsLedger = useSelector(isAddressLedgerByFromAddress(from));
-    doesAddressRequireLedgerHidConnectionByFromAddress(from),
-  );
 
   const transaction =
     currentNetworkTxList.find(
@@ -219,9 +218,7 @@ export default function ConfirmApprove() {
             }
             warning={submitWarning}
             txData={transaction}
-            ledgerWalletRequiredHidConnection={
+            fromAddressIsLedger={fromAddressIsLedger}
-              ledgerWalletRequiredHidConnection
-            }
           />
           {showCustomizeGasPopover && (
             <EditGasPopover