Allow keyring paths to override query param pages

If the popup is presented for transaction signing, the keyrings must be
unlocked to proceed. Without this change, the router enters an infinite
loop as the query-param-based rerouting forces the route to transaction
signing, but the transaction signing component tries to reroute to the
keyring unlock screen.

ui/pages/Popup.tsx

@@ -34,7 +34,10 @@ function transformLocation(inputLocation: Location): Location {
   const maybePage = params.get("page")
 
   let { pathname } = inputLocation
-  if (isAllowedQueryParamPage(maybePage)) {
+  if (
+    isAllowedQueryParamPage(maybePage) &&
+    !inputLocation.pathname.includes("/keyring/")
+  ) {
     pathname = maybePage
   }
 
@@ -45,8 +48,6 @@ function transformLocation(inputLocation: Location): Location {
 }
 
 export default function Popup({ store }: { store: Store }): ReactElement {
-  const history = useHistory()
-
   return (
     <Provider store={store}>
       <Router>