Merge pull request #1143 from gnosis/development

v2.7.1 Dev -> master
This commit is contained in:
Mikhail Mikheev 2020-07-23 17:31:00 +04:00 committed by GitHub
commit 934de39d69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 1611 additions and 1191 deletions

9
.github/workflows/lint.yml vendored Normal file
View File

@ -0,0 +1,9 @@
name: 'ESLint check'
on: [pull_request]
jobs:
eslint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: gnosis/safe-react-eslint-plus-action@main

View File

@ -3,9 +3,8 @@ name: Build/Release Desktop app
# this will help you specify where to run
on:
push:
branches-ignore:
# Temporary disable action
- '**'
branches:
- master
env:
REACT_APP_BLOCKNATIVE_KEY: ${{ secrets.REACT_APP_BLOCKNATIVE_KEY }}
@ -89,4 +88,3 @@ jobs:
with:
name: Desktop Windows
path: ./dist/Safe[ ]Multisig*.exe

View File

@ -1,6 +1,6 @@
{
"name": "safe-react",
"version": "2.7.0",
"version": "2.7.1",
"description": "Allowing crypto users manage funds in a safer way",
"website": "https://github.com/gnosis/safe-react#readme",
"bugs": {
@ -160,7 +160,7 @@
},
"dependencies": {
"@gnosis.pm/safe-contracts": "1.1.1-dev.2",
"@gnosis.pm/safe-react-components": "^0.2.0",
"@gnosis.pm/safe-react-components": "https://github.com/gnosis/safe-react-components.git#7bb55de",
"@gnosis.pm/util-contracts": "2.0.6",
"@ledgerhq/hw-transport-node-hid": "5.19.0",
"@material-ui/core": "4.11.0",

View File

@ -151,7 +151,7 @@ const CookiesBanner = () => {
<div className={classes.content}>
<p className={classes.text}>
We use cookies to give you the best experience and to help improve our website. Please read our{' '}
<Link className={classes.link} to="https://safe.gnosis.io/cookie">
<Link className={classes.link} to="https://gnosis-safe.io/cookie">
Cookie Policy
</Link>{' '}
for more information. By clicking &quot;Accept all&quot;, you agree to the storing of cookies on your device

View File

@ -57,23 +57,23 @@ const Footer = () => {
<footer className={classes.footer}>
<span className={classes.item}>©{date.getFullYear()} Gnosis</span>
<span className={classes.sep}>|</span>
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://safe.gnosis.io/terms">
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://gnosis-safe.io/terms">
Terms
</Link>
<span className={classes.sep}>|</span>
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://safe.gnosis.io/privacy">
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://gnosis-safe.io/privacy">
Privacy
</Link>
<span className={classes.sep}>|</span>
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://safe.gnosis.io/licenses">
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://gnosis-safe.io/licenses">
Licenses
</Link>
<span className={classes.sep}>|</span>
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://safe.gnosis.io/imprint">
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://gnosis-safe.io/imprint">
Imprint
</Link>
<span className={classes.sep}>|</span>
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://safe.gnosis.io/cookie">
<Link className={cn(classes.item, classes.link)} target="_blank" to="https://gnosis-safe.io/cookie">
Cookie Policy
</Link>
<span className={classes.sep}>-</span>

View File

@ -133,16 +133,15 @@ const Details = ({ classes, errors, form }) => {
</Block>
<Block margin="sm">
<Paragraph className={classes.links} color="primary" noMargin size="md">
By continuing you consent with the{' '}
<a href="https://safe.gnosis.io/terms" rel="noopener noreferrer" target="_blank">
By continuing you consent to the{' '}
<a href="https://gnosis-safe.io/terms" rel="noopener noreferrer" target="_blank">
terms of use
</a>{' '}
and{' '}
<a href="https://safe.gnosis.io/privacy" rel="noopener noreferrer" target="_blank">
<a href="https://gnosis-safe.io/privacy" rel="noopener noreferrer" target="_blank">
privacy policy
</a>
. Most importantly, you confirm that your funds are held securely in the Gnosis Safe, a smart contract on the
Ethereum blockchain. These funds cannot be accessed by Gnosis at any point.
.
</Paragraph>
</Block>
</>

View File

@ -50,16 +50,15 @@ const SafeName = ({ classes, safeName }) => (
</Block>
<Block margin="lg">
<Paragraph className={classes.links} color="primary" noMargin size="md">
By continuing you consent with the{' '}
<a href="https://safe.gnosis.io/terms" rel="noopener noreferrer" target="_blank">
By continuing you consent to the{' '}
<a href="https://gnosis-safe.io/terms" rel="noopener noreferrer" target="_blank">
terms of use
</a>{' '}
and{' '}
<a href="https://safe.gnosis.io/privacy" rel="noopener noreferrer" target="_blank">
<a href="https://gnosis-safe.io/privacy" rel="noopener noreferrer" target="_blank">
privacy policy
</a>
. Most importantly, you confirm that your funds are held securely in the Gnosis Safe, a smart contract on the
Ethereum blockchain. These funds cannot be accessed by Gnosis at any point.
.
</Paragraph>
</Block>
</>

View File

@ -26,7 +26,7 @@ export const staticAppsList: Array<{ url: string; disabled: boolean }> = [
// Sablier
{ url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmabPEk7g4zaytFefp6fE4nz8f85QMJoWmRQQZypvJViNG`, disabled: false },
// Synthetix
{ url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmQSVfqPYSSsnmtbJQCg7s9iLykTDYKoK5k98K4Fd6bwdJ`, disabled: true },
{ url: `${process.env.REACT_APP_IPFS_GATEWAY}/QmS6PvFksTQHzxWCNGQ1vto6S9TdVrP83EgLd545DK3aQN`, disabled: false },
// TX-Builder
{ url: `${gnosisAppsUrl}/tx-builder`, disabled: false },
]
@ -40,10 +40,10 @@ export const getAppInfoFromOrigin = (origin) => {
}
}
export const getAppInfoFromUrl = async (appUrl: string): Promise<SafeApp> => {
export const getAppInfoFromUrl = async (appUrl?: string): Promise<SafeApp> => {
let res = { id: undefined, url: appUrl, name: 'unknown', iconUrl: appsIconSvg, error: true }
if (!appUrl.length) {
if (!appUrl?.length) {
return res
}

View File

@ -88,7 +88,7 @@ const Welcome = ({ isOldMultisigMigration, provider }: any) => {
{headingText}
<a
className={styles.learnMoreLink}
href="https://safe.gnosis.io/teams"
href="https://gnosis-safe.io/teams"
rel="noopener noreferrer"
target="_blank"
>

2745
yarn.lock

File diff suppressed because it is too large Load Diff