From 37e34381a3fc4388ced426bf418162243696db95 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]" <greenkeeper[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2018 17:25:01 -0600
Subject: [PATCH] =?UTF-8?q?Update=20@types/react=20to=20the=20latest=20ver?=
 =?UTF-8?q?sion=20=F0=9F=9A=80=20(#912)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(package): update @types/react to version 16.0.35

* Add stricter typing via function overloads

* Fix rest of aria translations
---
 .../components/Keystore/DownloadWallet.tsx             |  2 +-
 .../GenerateWallet/components/Keystore/PaperWallet.tsx |  2 +-
 common/translations/index.tsx                          | 10 ++++++----
 package.json                                           |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/common/containers/Tabs/GenerateWallet/components/Keystore/DownloadWallet.tsx b/common/containers/Tabs/GenerateWallet/components/Keystore/DownloadWallet.tsx
index f8a31387..74e61b10 100644
--- a/common/containers/Tabs/GenerateWallet/components/Keystore/DownloadWallet.tsx
+++ b/common/containers/Tabs/GenerateWallet/components/Keystore/DownloadWallet.tsx
@@ -33,7 +33,7 @@ export default class DownloadWallet extends Component<Props, State> {
             role="button"
             className="DlWallet-download btn btn-primary btn-lg"
             aria-label="Download Keystore File (UTC / JSON · Recommended · Encrypted)"
-            aria-describedby={translate('x_KeystoreDesc')}
+            aria-describedby={translate('x_KeystoreDesc', true)}
             download={filename}
             href={this.getBlob()}
             onClick={this.handleDownloadKeystore}
diff --git a/common/containers/Tabs/GenerateWallet/components/Keystore/PaperWallet.tsx b/common/containers/Tabs/GenerateWallet/components/Keystore/PaperWallet.tsx
index 8f121dc8..73fc2658 100644
--- a/common/containers/Tabs/GenerateWallet/components/Keystore/PaperWallet.tsx
+++ b/common/containers/Tabs/GenerateWallet/components/Keystore/PaperWallet.tsx
@@ -20,7 +20,7 @@ const PaperWallet: React.SFC<Props> = props => (
       <input
         className="GenPaper-private form-control"
         value={stripHexPrefix(props.privateKey)}
-        aria-label={translate('x_PrivKey')}
+        aria-label={translate('x_PrivKey', true)}
         aria-describedby="x_PrivKeyDesc"
         type="text"
         readOnly={true}
diff --git a/common/translations/index.tsx b/common/translations/index.tsx
index 4209ef59..d108961c 100644
--- a/common/translations/index.tsx
+++ b/common/translations/index.tsx
@@ -42,19 +42,21 @@ export function getTranslators() {
     'TranslatorName_5'
   ].filter(x => {
     const translated = translate(x);
-    if (typeof translated === 'string') {
-      return !!translated.trim();
-    }
     return !!translated;
   });
 }
 
 export type TranslateType = React.ReactElement<any> | string;
 
-export default function translate(key: string, textOnly: boolean = false): TranslateType {
+function translate(key: string, textOnly?: false): React.ReactElement<any>;
+function translate(key: string, textOnly: true): string;
+
+function translate(key: string, textOnly: boolean = false) {
   return textOnly ? translateRaw(key) : <Translate translationKey={key} />;
 }
 
+export default translate;
+
 export function translateRaw(key: string) {
   const lang = getLanguageSelection(configuredStore.getState());
 
diff --git a/package.json b/package.json
index cd269da0..0c7e1950 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "@types/qrcode": "0.8.0",
     "@types/qrcode.react": "0.6.2",
     "@types/query-string": "5.0.1",
-    "@types/react": "16.0.34",
+    "@types/react": "16.0.35",
     "@types/react-dom": "16.0.3",
     "@types/react-redux": "5.0.14",
     "@types/react-router-dom": "4.2.3",