Skip to content
This repository was archived by the owner on Nov 10, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
"@gnosis.pm/safe-apps-sdk": "1.0.0-beta.4",
"@gnosis.pm/safe-apps-sdk-v1": "npm:@gnosis.pm/safe-apps-sdk@0.4.2",
"@gnosis.pm/safe-contracts": "1.1.1-dev.2",
"@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#ff29c3c",
"@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#3afc7cbb6914081036b4cbf10bacfe6270a9e198",
"@gnosis.pm/util-contracts": "2.0.6",
"@ledgerhq/hw-transport-node-hid-singleton": "5.34.0",
"@material-ui/core": "^4.11.0",
Expand Down
1 change: 1 addition & 0 deletions src/components/AppLayout/Sidebar/SafeHeader/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ const IconContainer = styled.div`
justify-content: space-evenly;
`
const StyledButton = styled(Button)`
padding: 0 18px;
*:first-child {
margin: 0 4px 0 0;
}
Expand Down
24 changes: 10 additions & 14 deletions src/components/ConnectButton/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,17 @@ export const onboardUser = async (): Promise<boolean> => {
return walletSelected && onboard.walletCheck()
}

const ConnectButton = (props): React.ReactElement => (
<Button
color="primary"
minWidth={140}
onClick={async () => {
const walletSelected = await onboard.walletSelect()
export const onConnectButtonClick = async () => {
const walletSelected = await onboard.walletSelect()

// perform wallet checks only if user selected a wallet
if (walletSelected) {
await onboard.walletCheck()
}
}}
variant="contained"
{...props}
>
// perform wallet checks only if user selected a wallet
if (walletSelected) {
await onboard.walletCheck()
}
}

const ConnectButton = (props): React.ReactElement => (
<Button color="primary" minWidth={140} onClick={onConnectButtonClick} variant="contained" {...props}>
Connect
</Button>
)
Expand Down
22 changes: 0 additions & 22 deletions src/components/NoSafe/index.tsx

This file was deleted.

13 changes: 0 additions & 13 deletions src/components/layout/Page/index.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,6 @@
padding: 12px 0 0 0;
}

@media only screen and (max-width: #{$screenLg}px) {
.page {
padding: 72px $lg 0 $lg;
}
}

@media only screen and (min-width: #{$screenLg}px) and (max-width: 1360px) {
.page {
padding: 96px 120px 0 120px;
}
}


.center {
align-self: center;
}
Expand Down
10 changes: 1 addition & 9 deletions src/routes/safe/container/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ import React, { useState } from 'react'
import { useSelector } from 'react-redux'
import { Redirect, Route, Switch, useRouteMatch } from 'react-router-dom'

import NoSafe from 'src/components/NoSafe'
import { providerNameSelector } from 'src/logic/wallets/store/selectors'
import { safeFeaturesEnabledSelector, safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors'
import { safeFeaturesEnabledSelector } from 'src/logic/safe/store/selectors'
import { wrapInSuspense } from 'src/utils/wrapInSuspense'
import { SAFELIST_ADDRESS } from 'src/routes/routes'
import { FEATURES } from 'src/config/networks/network.d'
Expand Down Expand Up @@ -35,14 +33,8 @@ const Container = (): React.ReactElement => {
onClose: () => {},
})

const safeAddress = useSelector(safeParamAddressFromStateSelector)
const provider = useSelector(providerNameSelector)
const matchSafeWithAddress = useRouteMatch({ path: `${SAFELIST_ADDRESS}/:safeAddress` })

if (!safeAddress) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code is obsolete, there is no way to reach this page without a safeAddress.

return <NoSafe provider={provider} text="Safe not found" />
}

if (!featuresEnabled) {
return (
<LoadingContainer>
Expand Down
25 changes: 0 additions & 25 deletions src/routes/welcome/components/Layout.module.scss

This file was deleted.

Loading