remove cancel redirect

ui/app/pages/permissions-connect/permissions-connect.component.js

@@ -14,7 +14,6 @@ import ChooseAccount from './choose-account'
 import PermissionsRedirect from './redirect'
 
 const APPROVE_TIMEOUT = 1500
-const REJECT_TIMEOUT = 750
 
 export default class PermissionConnect extends Component {
   static propTypes = {
@@ -105,7 +104,10 @@ export default class PermissionConnect extends Component {
     const { permissionsRequest, lastConnectedInfo, targetDomainMetadata } = this.props
     const { redirecting, origin, targetDomainMetadata: savedMetadata } = this.state
 
-    if (savedMetadata.name !== targetDomainMetadata?.name) {
+    if (
+      permissionsRequest &&
+      savedMetadata.name !== targetDomainMetadata?.name
+    ) {
       this.setState({
         targetDomainMetadata,
       })
@@ -139,16 +141,16 @@ export default class PermissionConnect extends Component {
     })
     this.removeBeforeUnload()
 
-    const timeout = approved ? APPROVE_TIMEOUT : REJECT_TIMEOUT
+    const redirectFunction = getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION
+      ? () => window.close()
+      : () => history.push(DEFAULT_ROUTE)
 
-    if (getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION) {
+    if (approved) {
       setTimeout(async () => {
-        global.platform.closeCurrentWindow()
+        redirectFunction()
-      }, timeout)
+      }, APPROVE_TIMEOUT)
     } else {
-      setTimeout(async () => {
+      redirectFunction()
-        history.push(DEFAULT_ROUTE)
-      }, timeout)
     }
   }
 
@@ -158,11 +160,8 @@ export default class PermissionConnect extends Component {
 
     if (requestId) {
       await rejectPermissionsRequest(requestId)
-
       if (getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION) {
         window.close()
-      } else {
-        this.redirectFlow(false)
       }
     }
   }
@@ -223,11 +222,10 @@ export default class PermissionConnect extends Component {
       <div className="permissions-connect">
         { this.renderTopBar() }
         {
-          redirecting
+          redirecting && permissionsApproved
             ? (
               <PermissionsRedirect
                 domainMetadata={targetDomainMetadata}
-                permissionsRejected={ permissionsApproved === false }
               />
             )
             : (

ui/app/pages/permissions-connect/redirect/index.scss

@@ -47,19 +47,6 @@
     position: absolute;
   }
 
-  &__reject {
-    position: absolute;
-    background: white;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    i {
-      color: #D73A49;
-      transform: scale(3);
-    }
-  }
-
   &__identicon, .icon-with-fallback__identicon {
     width: 32px;
     height: 32px;

ui/app/pages/permissions-connect/redirect/permissions-redirect.component.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import IconWithFallBack from '../../../components/ui/icon-with-fallback'
 import { I18nContext } from '../../../contexts/i18n'
 
-export default function PermissionsRedirect ({ domainMetadata, permissionsRejected }) {
+export default function PermissionsRedirect ({ domainMetadata }) {
 
   const t = useContext(I18nContext)
 
@@ -11,14 +11,11 @@ export default function PermissionsRedirect ({ domainMetadata, permissionsReject
     <div className="page-container permissions-redirect-container">
       <div className="permissions-redirect-container__content">
         <div className="permission-result">
-          { permissionsRejected ? t('cancelling') : t('connecting') }
+          { t('connecting') }
           <div className="permission-result__icons">
             <IconWithFallBack icon={domainMetadata.icon} name={domainMetadata.name} />
             <div className="permission-result__center-icon">
-              { permissionsRejected
+              <span className="permission-result__check" />
-                ? <span className="permission-result__reject" ><i className="fa fa-times-circle" /></span>
-                : <span className="permission-result__check" />
-              }
               { renderBrokenLine() }
             </div>
             <div className="permission-result__identicon-container">
@@ -43,9 +40,4 @@ export default function PermissionsRedirect ({ domainMetadata, permissionsReject
 
 PermissionsRedirect.propTypes = {
   domainMetadata: PropTypes.object.isRequired,
-  permissionsRejected: PropTypes.bool,
-}
-
-PermissionsRedirect.defaultProps = {
-  permissionsRejected: null,
 }

ui/app/pages/routes/routes.component.js

@@ -173,17 +173,15 @@ export default class Routes extends Component {
       return true
     }
 
-    if (windowType === ENVIRONMENT_TYPE_POPUP) {
+    if (windowType === ENVIRONMENT_TYPE_POPUP && this.onConfirmPage()) {
-      return this.onConfirmPage() || hasPermissionsRequests
+      return true
     }
 
     const isHandlingPermissionsRequest = Boolean(matchPath(location.pathname, {
       path: CONNECT_ROUTE, exact: false,
-    }))
+    })) || hasPermissionsRequests
 
-    if (hasPermissionsRequests || isHandlingPermissionsRequest) {
+    return isHandlingPermissionsRequest
-      return true
-    }
   }
 
   render () {