Fixes two small bugs in the LoginPerSite ui (#7595)

MetaMask · Nov 28, 2019 · 985bbbd · 985bbbd
1 parent b67f01a
commit 985bbbd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ui/app/components/app/modals/disconnect-account/disconnect-account.container.js b/ui/app/components/app/modals/disconnect-account/disconnect-account.container.js
@@ -19,7 +19,7 @@ const mapDispatchToProps = dispatch => {
   }
 }
 
-const mergeProps = (stateProps, dispatchProps) => {
+const mergeProps = (stateProps, dispatchProps, ownProps) => {
   const {
     domainKey,
     domain,
@@ -29,6 +29,7 @@ const mergeProps = (stateProps, dispatchProps) => {
   } = dispatchProps
 
   return {
+    ...ownProps,
     ...stateProps,
     ...dispatchProps,
     disconnectAccount: () => dispatchDisconnectAccount(domainKey, domain),

diff --git a/ui/app/selectors/selectors.js b/ui/app/selectors/selectors.js
@@ -537,7 +537,9 @@ function getRenderablePermissionsDomains (state) {
       const accountsLastConnectedTime = ethAccountsPermissionsForDomain.accounts || {}
       const selectedAddressLastConnectedTime = accountsLastConnectedTime[selectedAddress]
 
-      const lastConnectedTime = formatDate(selectedAddressLastConnectedTime, 'yyyy-M-d')
+      const lastConnectedTime = selectedAddressLastConnectedTime
+        ? formatDate(selectedAddressLastConnectedTime, 'yyyy-M-d')
+        : ''
 
       return [ ...acc, {
         name,