Merge branch 'improve-eslint-rules-2' into master

5 files changed, 14 insertions, 14 deletions

diff --git a/gui/src/renderer/components/Accordion.tsx b/gui/src/renderer/components/Accordion.tsx
index 1a26d765cd..01c0733165 100644
--- a/gui/src/renderer/components/Accordion.tsx
+++ b/gui/src/renderer/components/Accordion.tsx
@@ -29,9 +29,6 @@ const Content = styled.div({
 });
 
 export default class Accordion extends React.Component<IProps, IState> {
-  private containerRef = React.createRef<HTMLDivElement>();
-  private contentRef = React.createRef<HTMLDivElement>();
-
   public static defaultProps = {
     expanded: true,
     animationDuration: 350,
@@ -42,6 +39,9 @@ export default class Accordion extends React.Component<IProps, IState> {
     containerHeight: this.props.expanded ? 'auto' : '0',
   };
 
+  private containerRef = React.createRef<HTMLDivElement>();
+  private contentRef = React.createRef<HTMLDivElement>();
+
   public componentDidUpdate(oldProps: IProps) {
     if (this.props.expanded && !oldProps.expanded) {
       this.expand();
diff --git a/gui/src/renderer/components/AdvancedSettings.tsx b/gui/src/renderer/components/AdvancedSettings.tsx
index b044226634..a34b5b499c 100644
--- a/gui/src/renderer/components/AdvancedSettings.tsx
+++ b/gui/src/renderer/components/AdvancedSettings.tsx
@@ -77,15 +77,15 @@ interface IState {
 }
 
 export default class AdvancedSettings extends React.Component<IProps, IState> {
+  public state = {
+    showConfirmBlockWhenDisconnectedAlert: false,
+  };
+
   private portItems: { [key in RelayProtocol]: Array<ISelectorItem<OptionalPort>> };
   private protocolItems: Array<ISelectorItem<OptionalRelayProtocol>>;
   private bridgeStateItems: Array<ISelectorItem<BridgeState>>;
   private wireguardPortItems: Array<ISelectorItem<OptionalPort>>;
 
-  public state = {
-    showConfirmBlockWhenDisconnectedAlert: false,
-  };
-
   constructor(props: IProps) {
     super(props);
 
diff --git a/gui/src/renderer/components/Map.tsx b/gui/src/renderer/components/Map.tsx
index 8bc78b4b68..ddab985992 100644
--- a/gui/src/renderer/components/Map.tsx
+++ b/gui/src/renderer/components/Map.tsx
@@ -30,8 +30,6 @@ interface IState {
 }
 
 export default class Map extends React.Component<IProps, IState> {
-  private containerRef = React.createRef<HTMLDivElement>();
-
   public state: IState = {
     bounds: {
       width: 0,
@@ -39,6 +37,8 @@ export default class Map extends React.Component<IProps, IState> {
     },
   };
 
+  private containerRef = React.createRef<HTMLDivElement>();
+
   public render() {
     const { width, height } = this.state.bounds;
     const readyToRenderTheMap = width > 0 && height > 0;
diff --git a/gui/src/renderer/components/Marquee.tsx b/gui/src/renderer/components/Marquee.tsx
index d2d5bcbccd..427ab81780 100644
--- a/gui/src/renderer/components/Marquee.tsx
+++ b/gui/src/renderer/components/Marquee.tsx
@@ -30,14 +30,14 @@ interface IMarqueeState {
 }
 
 export default class Marquee extends React.Component<IMarqueeProps, IMarqueeState> {
-  private textRef = React.createRef<HTMLSpanElement>();
-  private scheduler = new Scheduler();
-
   public state = {
     alignRight: false,
     uniqueKey: 0,
   };
 
+  private textRef = React.createRef<HTMLSpanElement>();
+  private scheduler = new Scheduler();
+
   public componentDidMount() {
     this.startAnimationIfOverflow();
   }
diff --git a/gui/src/renderer/components/WireguardKeys.tsx b/gui/src/renderer/components/WireguardKeys.tsx
index d5b0dc1833..9e1df9693c 100644
--- a/gui/src/renderer/components/WireguardKeys.tsx
+++ b/gui/src/renderer/components/WireguardKeys.tsx
@@ -53,14 +53,14 @@ export interface IState {
 }
 
 export default class WireguardKeys extends React.Component<IProps, IState> {
-  private keyAgeUpdateInterval?: number;
-
   public state = {
     recentlyGeneratedKey: false,
     userHasInitiatedVerification: false,
     ageOfKeyString: WireguardKeys.ageOfKeyString(this.props.keyState, this.props.locale),
   };
 
+  private keyAgeUpdateInterval?: number;
+
   public static getDerivedStateFromProps(props: IProps) {
     return {
       ageOfKeyString: WireguardKeys.ageOfKeyString(props.keyState, props.locale),