Merge pull request #1220 from gnosis/gh-1210-final-adjustments

gh-1210 change some texts
safe-global · Jun 4, 2021 · 93f1fc0 · 93f1fc0
2 parents 8abe473 + 1bf4ddd
commit 93f1fc0
Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/Multisig/Cross-layer/Analytics/Multisig/Cross-layer/Analytics/Firebase/.gitignore b/Multisig/Cross-layer/Analytics/Multisig/Cross-layer/Analytics/Firebase/.gitignore
@@ -0,0 +1 @@
+GoogleService-Info*.plist
diff --git a/Multisig/Cross-layer/Configuration/Config.Example.xcconfig b/Multisig/Cross-layer/Configuration/Config.Example.xcconfig
@@ -137,7 +137,7 @@ WALLETCONNECT_BRIDGE_URL = https:/$()/safe-walletconnect.gnosis.io/
 CONFLICT_URL = https:/$()/help.gnosis-safe.io/en/articles/4730252-why-are-transactions-with-the-same-nonce-conflicting-with-each-other
 FALLBACKHANDLER_URL = https:/$()/help.gnosis-safe.io/en/articles/4738352-what-is-a-fallback-handler-and-how-does-it-relate-to-the-gnosis-safe
 PAY_FOR_CANCELLATION_URL = https:/$()/help.gnosis-safe.io/en/articles/4738501-why-do-i-need-to-pay-for-cancelling-a-transaction
-CONNECT_DAPP_ON_MOBILE_URL = https:/$()/gist.github.com/sche/4618df0058640099354da73ccbe630b5
+CONNECT_DAPP_ON_MOBILE_URL = https:/$()/help.gnosis-safe.io/en/articles/5307197-how-to-connect-a-dapp-via-walletconnect-on-gnosis-safe-mobile
 
 // Legal URLs
 TERMS_URL       = https:/$()/gnosis-safe.io/terms/

diff --git a/Multisig/UI/Dapps/DappsViewController.swift b/Multisig/UI/Dapps/DappsViewController.swift
@@ -216,7 +216,7 @@ class DappsViewController: UIViewController, UITableViewDataSource, UITableViewD
             return nil
         }
         let view = tableView.dequeueHeaderFooterView(ExternalLinkHeaderFooterView.self)
-        view.set(label: "How to connect dapp to Gnosis Safe Multisig?")
+        view.set(label: "How to connect a dapp via WalletConnect on Gnosis Safe Mobile?")
         view.set(url: App.configuration.help.connectDappOnMobileURL)
         return view
     }

diff --git a/Multisig/UI/Settings/Experimental/ExperimentalViewController.swift b/Multisig/UI/Settings/Experimental/ExperimentalViewController.swift
@@ -79,7 +79,7 @@ class ExperimentalViewController: UITableViewController {
 
         case .walletConnectDescription:
             return descriptionCell(
-                "Try out interacting with Dapps via WalletConnect.",
+                "This adds a tab to connect your Safe to dapps via WalletConnect.",
                 indexPath: indexPath
             )
 
@@ -91,7 +91,7 @@ class ExperimentalViewController: UITableViewController {
 
         case .walletConnectOwnerKeyDescription:
             return descriptionCell(
-                "Try out connecting owner key and executing transactions via WalletConnect.",
+                "This allows to use other wallets as owners in your Safe app via WalletConnect to sign and execute transactions on mobile.",
                 indexPath: indexPath
             )
         }

diff --git a/.../UI/Settings/OwnerKeyManagement/AddOwnerKeyViewController/AddOwnerKeyViewController.swift b/.../UI/Settings/OwnerKeyManagement/AddOwnerKeyViewController/AddOwnerKeyViewController.swift
@@ -29,7 +29,7 @@ class AddOwnerKeyViewController: UITableViewController {
 
         if App.configuration.toggles.walletConnectOwnerKeyEnabled {
             keyTypes.append(
-                (.walletConnect, "Connect Key", "Connect an existing key using WalletConnect")
+                (.walletConnect, "Connect Key", "Connect an existing key from another wallet using WalletConnect")
             )
         }
     }

diff --git a/...gs/OwnerKeyManagement/WalletConnectOwnerKey/OnboardingConnectOwnerKeyViewController.swift b/...gs/OwnerKeyManagement/WalletConnectOwnerKey/OnboardingConnectOwnerKeyViewController.swift
@@ -14,15 +14,15 @@ class OnboardingConnectOwnerKeyViewController: UITableViewController {
     private let cards = [
         (UIImage(named: "ico-onbaording-import-key-1"),
          "How does it work?",
-         "You can connect owner key stored in other wallet. You will be proposed to select it from a list of already installed wallets on your phone, or you can display a QR code and scan it with other wallet."),
+         "You can connect an owner key from another wallet. You will be asked to select it from a list of already installed wallets on your phone or you can display a QR code and scan it with another wallet."),
 
         (UIImage(named: "ico-onbaording-import-key-2"),
          "How secure is that?",
-         "WalletConnect is a secure protocol for exchanging messages. Gnosis Safe Multisig app will not get access to your private key stored in your wallet"),
+         "WalletConnect is a secure protocol for exchanging messages. Gnosis Safe Multisig app will not get access to your private key stored in your wallet."),
 
         (UIImage(named: "ico-onbaording-import-key-3"),
          "Is my wallet supported?",
-         "Your wallet should support WalletConnect protocol.")
+         "You wallet needs to support the WalletConnect protocol.")
     ]
 
     override func viewDidLoad() {
@@ -57,6 +57,7 @@ class OnboardingConnectOwnerKeyViewController: UITableViewController {
         cell.set(image: card.0)
         cell.set(title: card.1)
         cell.set(body: card.2)
+        cell.set(linkTitle: nil, url: nil)
 
         return cell
     }

diff --git a/...I/Settings/OwnerKeyManagement/WalletConnectOwnerKey/WalletConnectQRCodeViewController.xib b/...I/Settings/OwnerKeyManagement/WalletConnectOwnerKey/WalletConnectQRCodeViewController.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -27,7 +27,7 @@
                         <constraint firstAttribute="width" secondItem="wDY-2h-BxL" secondAttribute="height" multiplier="1:1" id="As1-9z-nK9"/>
                     </constraints>
                 </imageView>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Scan this QR code with your WalletConnect compatible wallet ." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c1B-Kk-Dc0">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Scan this QR code with your WalletConnect compatible wallet." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c1B-Kk-Dc0">
                     <rect key="frame" x="16" y="64" width="382" height="41"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <nil key="textColor"/>