diff --git a/src/components/AppLayout/index.tsx b/src/components/AppLayout/index.tsx index 56a0e482..e70a31b4 100644 --- a/src/components/AppLayout/index.tsx +++ b/src/components/AppLayout/index.tsx @@ -97,7 +97,7 @@ const Layout: React.FC = ({
- + theme.colors.secondary}; :hover { box-shadow: 1px 2px 16px 0 ${({ theme }) => fade(theme.colors.shadow.color, 0.35)}; diff --git a/src/routes/safe/components/Apps/components/AppsList.tsx b/src/routes/safe/components/Apps/components/AppsList.tsx index 89933d2b..378e4780 100644 --- a/src/routes/safe/components/Apps/components/AppsList.tsx +++ b/src/routes/safe/components/Apps/components/AppsList.tsx @@ -6,7 +6,7 @@ import { GenericModal, IconText, Loader, Menu } from '@gnosis.pm/safe-react-comp import { safeParamAddressFromStateSelector } from 'src/logic/safe/store/selectors' import AppCard from 'src/routes/safe/components/Apps/components/AppCard' import AddAppIcon from 'src/routes/safe/components/Apps/assets/addApp.svg' -import { useRouteMatch, useHistory } from 'react-router-dom' +import { useRouteMatch, Link } from 'react-router-dom' import { SAFELIST_ADDRESS } from 'src/routes/routes' import { useAppList } from '../hooks/useAppList' @@ -19,6 +19,10 @@ const Wrapper = styled.div` flex-direction: column; ` +const StyledLink = styled(Link)` + text-decoration: none; +` + const centerCSS = css` display: flex; align-items: center; @@ -53,17 +57,11 @@ const Breadcrumb = styled.div` ` const AppsList = (): React.ReactElement => { - const history = useHistory() const matchSafeWithAddress = useRouteMatch<{ safeAddress: string }>({ path: `${SAFELIST_ADDRESS}/:safeAddress` }) const safeAddress = useSelector(safeParamAddressFromStateSelector) const { appList } = useAppList() const [isAddAppModalOpen, setIsAddAppModalOpen] = useState(false) - const onAddAppHandler = (url: string) => () => { - const goToApp = `${matchSafeWithAddress?.url}/apps?appUrl=${encodeURI(url)}` - history.push(goToApp) - } - const openAddAppModal = () => setIsAddAppModalOpen(true) const closeAddAppModal = () => setIsAddAppModalOpen(false) @@ -92,14 +90,9 @@ const AppsList = (): React.ReactElement => { {appList .filter((a) => a.fetchStatus !== SAFE_APP_FETCH_STATUS.ERROR) .map((a) => ( - + + + ))} diff --git a/src/routes/safe/components/Balances/SendModal/screens/AddressBookInput/index.tsx b/src/routes/safe/components/Balances/SendModal/screens/AddressBookInput/index.tsx index 68ad183a..6c237aae 100644 --- a/src/routes/safe/components/Balances/SendModal/screens/AddressBookInput/index.tsx +++ b/src/routes/safe/components/Balances/SendModal/screens/AddressBookInput/index.tsx @@ -131,13 +131,13 @@ const BaseAddressBookInput = ({ onChange={onChange} onInputChange={onInputChange} options={addressBookEntries} + id="address-book-input" renderInput={(params) => (