Merge branch 'typescript'

5 files changed, 12 insertions, 17 deletions

diff --git a/gui/packages/components/src/Accordion.tsx b/gui/packages/components/src/Accordion.tsx
index 7019c9cb9c..19c9ddee56 100644
--- a/gui/packages/components/src/Accordion.tsx
+++ b/gui/packages/components/src/Accordion.tsx
@@ -66,11 +66,9 @@ export default class Accordion extends Component<IProps, IState> {
 
   public render() {
     const { style, children, expanded, animationDuration, ...otherProps } = this.props;
-    const containerStyles = [style];
-
-    if (this.state.applyAnimatedStyle) {
-      containerStyles.push(containerOverflowStyle, this.animatedStyle);
-    }
+    const containerStyles = this.state.applyAnimatedStyle
+      ? [style, containerOverflowStyle, this.animatedStyle]
+      : [style];
 
     return (
       <Animated.View {...otherProps} style={containerStyles} ref={this.containerRef}>
diff --git a/gui/packages/components/src/HeaderBar.tsx b/gui/packages/components/src/HeaderBar.tsx
index 2e2c7bcf30..7fd1a96f24 100644
--- a/gui/packages/components/src/HeaderBar.tsx
+++ b/gui/packages/components/src/HeaderBar.tsx
@@ -9,7 +9,7 @@ export enum HeaderBarStyle {
   success = 'success',
 }
 
-interface IHeaderBarProps {
+export interface IHeaderBarProps {
   barStyle: HeaderBarStyle;
   style?: Types.ViewStyleRuleSet;
 }
diff --git a/gui/packages/components/src/ImageView.tsx b/gui/packages/components/src/ImageView.tsx
index d05c72dba7..1f6a90493a 100644
--- a/gui/packages/components/src/ImageView.tsx
+++ b/gui/packages/components/src/ImageView.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Component, Styles, Types, View } from 'reactxp';
+import { Component, Types, View } from 'reactxp';
 
 interface IProps {
   source: string;
@@ -7,8 +7,9 @@ interface IProps {
   height?: number;
   tintColor?: string;
   tintHoverColor?: string;
-  style?: Types.ViewStyleRuleSet | Types.ViewStyleRuleSet[];
   disabled?: boolean;
+  onPress?: (event: Types.SyntheticEvent) => void;
+  style?: Types.StyleRuleSetRecursive<Types.ViewStyleRuleSet>;
 }
 
 interface IState {
@@ -19,8 +20,8 @@ export default class ImageView extends Component<IProps, IState> {
   public state = { hovered: false };
 
   public render() {
-    const { source, width, height, style, tintColor, tintHoverColor, ...otherProps } = this.props;
-    const url = `../assets/images/${source}.svg`;
+    const { source, width, height, tintColor, tintHoverColor, ...otherProps } = this.props;
+    const url = `../../assets/images/${source}.svg`;
     let image;
 
     const activeTintColor = (this.state.hovered && tintHoverColor) || tintColor;
@@ -52,11 +53,7 @@ export default class ImageView extends Component<IProps, IState> {
     }
 
     return (
-      <View
-        {...otherProps}
-        onMouseEnter={this.onHoverStart}
-        onMouseLeave={this.onHoverEnd}
-        style={style}>
+      <View {...otherProps} onMouseEnter={this.onHoverStart} onMouseLeave={this.onHoverEnd}>
         {image}
       </View>
     );
diff --git a/gui/packages/components/src/Modal.tsx b/gui/packages/components/src/Modal.tsx
index 6eb070262b..5742e68f2b 100644
--- a/gui/packages/components/src/Modal.tsx
+++ b/gui/packages/components/src/Modal.tsx
@@ -42,7 +42,7 @@ export class ModalAlert extends React.Component {
 }
 
 interface IModalContainerProps {
-  children?: Array<React.ReactElement<ModalContent | ModalAlert>>;
+  children?: React.ReactNode;
 }
 
 export class ModalContainer extends React.Component<IModalContainerProps> {
diff --git a/gui/packages/components/src/SecuredLabel.tsx b/gui/packages/components/src/SecuredLabel.tsx
index 9bf9ce0cdc..26fc425383 100644
--- a/gui/packages/components/src/SecuredLabel.tsx
+++ b/gui/packages/components/src/SecuredLabel.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Clipboard, Component, Styles, Text, Types } from 'reactxp';
+import { Component, Styles, Text, Types } from 'reactxp';
 
 export enum SecuredDisplayStyle {
   secured,