fix issue where user rejected request errors are not correctly handle…

…d in either wallet_switchEthereumChain nor wallet_addEthereumChain calls

app/scripts/lib/rpc-method-middleware/handlers/ethereum-chain-utils.js

@@ -230,11 +230,19 @@ export async function switchChain(
     await setActiveNetwork(networkClientId);
     res.result = null;
   } catch (error) {
-    return end(
-      error.code === errorCodes.provider.userRejectedRequest
-        ? undefined
-        : error,
-    );
+    // We don't want to return an error if user rejects the request
+    // and this is a chained switch request after wallet_addEthereumChain.
+    // approvalFlowId is only defined when this call is of a
+    // wallet_addEthereumChain request so we can use it to determine
+    // if we should return an error
+    if (
+      error.code === errorCodes.provider.userRejectedRequest &&
+      approvalFlowId
+    ) {
+      res.result = null;
+      return end();
+    }
+    return end(error);
   } finally {
     if (approvalFlowId) {
       endApprovalFlow({ id: approvalFlowId });