Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: link to old app from the import page #1306

Merged
merged 4 commits into from
Dec 5, 2022
Merged

Fix: link to old app from the import page #1306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1203363
Fix: link to old app from the import page
katspaugh Dec 5, 2022
90c7e4d
path-to-signatures
katspaugh Dec 5, 2022
6e7a322
CLA contains
katspaugh Dec 5, 2022
bf6d1b4
Revert conditional alert
katspaugh Dec 5, 2022
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
5 changes: 3 additions & 2 deletions .github/workflows/cla.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'CLA Assistant'
if: github.event_name == 'pull_request' || github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA'
uses: contributor-assistant/github-action@v2.2.0
if: contains(github.event.comment.body, 'recheck') || contains(github.event.comment.body, 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request'
uses: contributor-assistant/github-action@v2.2.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ASSISTANT_ACCESS_TOKEN }}
with:
path-to-document: 'https://github.com/safe-global/web-core/blob/dev/CLA.md'
branch: 'cla-signatures'
path-to-signatures: 'signatures/version1/cla.json'
allowlist: lukasschor,mikheevm,rmeissner,germartinez,Uxio0,dasanra,francovenica,tschubotz,luarx,gnosis-info,bot*,DaniSomoza,iamacook,yagopv,usame-algan,schmanu,DiogoSoaress,JagoFigueroa
lock-pullrequest-aftermerge: true
33 changes: 14 additions & 19 deletions src/components/settings/DataManagement/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import InfoIcon from '@/public/images/notifications/info.svg'

import { useState } from 'react'
import { Paper, Grid, Typography, Button, Link } from '@mui/material'
import Track from '@/components/common/Track'
import { SETTINGS_EVENTS } from '@/services/analytics'
import { Paper, Grid, Typography, Tooltip, SvgIcon, Button } from '@mui/material'
import { useState } from 'react'
import ImportAllDialog from '../ImportAllDialog'

const DataManagement = () => {
Expand All @@ -15,23 +13,20 @@ const DataManagement = () => {
<Grid item sm={4} xs={12}>
<Typography variant="h4" fontWeight={700}>
Data import
<Tooltip
placement="top"
title="The imported data will overwrite all added Safes and all address book entries"
>
<span>
<SvgIcon
component={InfoIcon}
inheritViewBox
fontSize="small"
color="border"
sx={{ verticalAlign: 'middle', ml: 0.5 }}
/>
</span>
</Tooltip>
</Typography>
</Grid>
<Grid item xs justifyContent="flex-end" display="flex">

<Grid item xs>
<Typography>
You can export your data from the{' '}
<Link target="_blank" href="https://gnosis-safe.io/app/export">
old app
</Link>
.
</Typography>

<Typography mb={3}>The imported data will overwrite all added Safes and all address book entries.</Typography>

<Track {...SETTINGS_EVENTS.DATA.IMPORT_ALL_BUTTON}>
<Button size="small" variant="contained" onClick={() => setModalOpen(true)}>
Import all data
Expand Down
2 changes: 1 addition & 1 deletion src/pages/import.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const Import: NextPage = () => {
return (
<>
<Head>
<title>Data Import</title>
<title>Data import</title>
</Head>

<main>
Expand Down