Merge pull request #779 from LedgerHQ/develop

1.1.11 patches
LedgerHQ · Feb 18, 2019 · 3bc4c9a · 3bc4c9a
2 parents e0be43b + 7b55fd5
commit 3bc4c9a
Show file tree

Hide file tree

Showing 40 changed files with 1,503 additions and 864 deletions.
diff --git a/package.json b/package.json
@@ -33,13 +33,13 @@
     }
   },
   "dependencies": {
-    "@ledgerhq/errors": "4.38.0",
+    "@ledgerhq/errors": "4.39.0",
     "@ledgerhq/hw-app-btc": "4.38.0",
     "@ledgerhq/hw-app-eth": "4.38.0",
     "@ledgerhq/hw-app-xrp": "4.38.0",
     "@ledgerhq/hw-transport": "4.38.0",
     "@ledgerhq/hw-transport-http": "4.38.0",
-    "@ledgerhq/live-common": "4.16.1",
+    "@ledgerhq/live-common": "4.19.0",
     "@ledgerhq/react-native-hid": "4.38.0",
     "@ledgerhq/react-native-hw-transport-ble": "4.38.5",
     "@ledgerhq/react-native-ledger-core": "^0.3.45",

diff --git a/src/colors.js b/src/colors.js
@@ -30,6 +30,7 @@ export default {
   green: "rgb(102, 190, 84)",
   black: "#000000",
   orange: "#ff7701",
+  yellow: "#ffd24a",
 
   /* DERIVATIVES */
   lightLive: "#4b84ff19",

diff --git a/src/components/DeviceItemSummary.js b/src/components/DeviceItemSummary.js
@@ -12,6 +12,7 @@ import Touchable from "./Touchable";
 import LText from "./LText";
 import colors from "../colors";
 import IconNanoX from "../icons/NanoX";
+import Alert from "../icons/Alert";
 
 type Props = {
   deviceId: string,
@@ -36,11 +37,26 @@ class DeviceItemSummary extends PureComponent<Props> {
                 <Trans i18nKey="DeviceItemSummary.genuine" />
                 {"  "}
               </LText>
-              <Circle bg={colors.live} size={20}>
-                <Icon name="check" size={14} color={colors.white} />
+              <Circle bg={colors.live} size={14}>
+                <Icon name="check" size={10} color={colors.white} />
               </Circle>
             </View>
-          ) : null}
+          ) : (
+            <View style={styles.genuine}>
+              <LText
+                numberOfLines={1}
+                style={[styles.genuineText, styles.genuineFailed]}
+              >
+                <Trans i18nKey="DeviceItemSummary.genuineFailed">
+                  {"Genuine check "}
+                  <LText semiBold>failed</LText>
+                </Trans>
+              </LText>
+              <Circle bg={colors.yellow} size={14}>
+                <Alert size={10} color={colors.white} />
+              </Circle>
+            </View>
+          )}
         </View>
         <Touchable event="DeviceItemEdit" onPress={onEdit}>
           <LText bold numberOfLines={1} style={styles.editText}>
@@ -91,7 +107,11 @@ const styles = StyleSheet.create({
     fontSize: 14,
     color: colors.smoke,
   },
+  genuineFailed: {
+    marginRight: 6,
+  },
   editText: {
     color: colors.live,
+    fontSize: 14,
   },
 });
diff --git a/src/components/ExchangeCard.js → src/components/PartnerCard.js b/src/components/ExchangeCard.js → src/components/PartnerCard.js
@@ -14,7 +14,7 @@ type Props = {
   t: T,
 };
 
-export default class ExchangeCard extends Component<Props> {
+export default class PartnerCard extends Component<Props> {
   onClick = () => {
     const { card } = this.props;
     Linking.openURL(card.url).catch(err =>
@@ -24,21 +24,23 @@ export default class ExchangeCard extends Component<Props> {
 
   render() {
     const {
-      card: { logo, url, id },
+      card: { Logo, url, id },
       t,
     } = this.props;
 
     return (
       <Card style={styles.cardStyle}>
         <View style={styles.cardTextBlock}>
-          <View style={styles.logoContainer}>{logo}</View>
-          <LText style={styles.description}>{t(`exchange.${id}`)}</LText>
+          <View style={styles.logoContainer}>
+            <Logo />
+          </View>
+          <LText style={styles.description}>{t(`partners.${id}`)}</LText>
           <View>
             <Button
-              event="OpenExchange"
-              eventProperties={{ exchange: id, exchangeUrl: url }}
+              event="OpenPartner"
+              eventProperties={{ partner: id, partnerUrl: url }}
               type="tertiary"
-              title={<Trans i18nKey="exchange.visit" />}
+              title={<Trans i18nKey="partners.visit" />}
               onPress={this.onClick}
             />
           </View>

diff --git a/src/components/SettingsRow.js b/src/components/SettingsRow.js
@@ -76,7 +76,7 @@ export default class SettingsRow extends Component<{
         eventProperties={eventProperties}
       >
         {iconLeft && <View style={styles.iconLeft}>{iconLeft}</View>}
-        <View style={styles.textBlock}>
+        <View style={[styles.textBlock, { marginLeft: iconLeft ? 0 : 16 }]}>
           {title$}
           {desc &&
             !noTextDesc && <LText style={styles.description}>{desc}</LText>}
@@ -105,11 +105,10 @@ const styles = StyleSheet.create({
   root: {
     minHeight: 50,
     flexDirection: "row",
-    alignItems: "center",
-    paddingHorizontal: 16,
     paddingVertical: 24,
     backgroundColor: "white",
     marginBottom: 2,
+    justifyContent: "space-between",
   },
   rootAlignedTop: {
     alignItems: "flex-start",
@@ -121,13 +120,17 @@ const styles = StyleSheet.create({
     paddingVertical: 16,
   },
   textBlock: {
+    marginRight: "auto",
     paddingRight: 16,
-    flexGrow: 1,
     flexShrink: 1,
   },
   rightBlock: {
     flexDirection: "row",
     alignItems: "center",
+    justifyContent: "flex-end",
+    flexShrink: 0,
+    maxWidth: "50%",
+    marginRight: 16,
   },
   titleContainer: {
     flexDirection: "row",
@@ -151,6 +154,7 @@ const styles = StyleSheet.create({
   },
   iconLeft: {
     paddingRight: 16,
+    marginLeft: 16,
   },
   iconLeftContainer: {
     marginRight: 8,

diff --git a/src/config/exchange.js b/src/config/exchange.js
diff --git a/src/context/AuthPass/index.js b/src/context/AuthPass/index.js
@@ -18,6 +18,7 @@ const mapStateToProps = createStructuredSelector({
 type State = {
   isLocked: boolean,
   biometricsError: ?Error,
+  appState: string,
 };
 
 type Props = {
@@ -34,6 +35,7 @@ class AuthPass extends PureComponent<Props, State> {
   state = {
     isLocked: !!this.props.privacy && !wasUnlocked,
     biometricsError: null,
+    appState: AppState.currentState || "",
   };
 
   static getDerivedStateFromProps({ privacy }, { isLocked }) {
@@ -48,24 +50,20 @@ class AuthPass extends PureComponent<Props, State> {
     AppState.addEventListener("change", this.handleAppStateChange);
   }
 
-  timeout: *;
   appInBg: number;
 
-  handleAppStateChange = appState => {
-    clearTimeout(this.timeout);
-    if (appState === "background") {
-      this.appInBg = Date.now();
-      this.timeout = setTimeout(() => {
-        if (!this.state.isLocked) {
-          this.lock();
-        }
-      }, AUTOLOCK_TIMEOUT);
-    } else if (
-      appState === "active" &&
+  handleAppStateChange = nextAppState => {
+    if (
+      this.state.appState.match(/inactive|background/) &&
+      nextAppState === "active" &&
       this.appInBg + AUTOLOCK_TIMEOUT < Date.now()
     ) {
       this.lock();
+      this.appInBg = Date.now();
+    } else if (nextAppState === "background") {
+      this.appInBg = Date.now();
     }
+    this.setState({ appState: nextAppState });
   };
 
   // auth: try to auth with biometrics and fallback on password