Merge remote-tracking branch 'origin/development' into release-changes-from-master-to-development

.github/workflows/lint.yml

@@ -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

.github/workflows/release.yml

@@ -3,9 +3,8 @@ name: Build/Release Desktop app
 # this will help you specify where to run
 on:
   push:
-    branches-ignore:
+    branches:
-      # Temporary disable action
+      - 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
-

src/components/CookiesBanner/index.tsx

@@ -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

src/components/Footer/index.tsx

@@ -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>

src/routes/load/components/DetailsForm/index.tsx

@@ -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{' '}
+          By continuing you consent to the{' '}
-          <a href="https://safe.gnosis.io/terms" rel="noopener noreferrer" target="_blank">
+          <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>
     </>

src/routes/open/components/SafeNameForm/index.tsx

@@ -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{' '}
+        By continuing you consent to the{' '}
-        <a href="https://safe.gnosis.io/terms" rel="noopener noreferrer" target="_blank">
+        <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>
   </>

src/routes/welcome/components/Layout.tsx

@@ -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"
         >