diff --git a/.eslintrc b/.eslintrc
index 30b99d6a..a825aa3a 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -57,8 +57,7 @@
         "ecmaVersion": 7,
         "sourceType": "module",
         "ecmaFeatures": {
-            "jsx": true,
-            "experimentalObjectRestSpread": true
+            "jsx": true
         }
     }
 }
\ No newline at end of file
diff --git a/src/components/Tooltip/index.js b/src/components/Tooltip/index.js
index 32f504b3..6d8d5412 100644
--- a/src/components/Tooltip/index.js
+++ b/src/components/Tooltip/index.js
@@ -45,7 +45,8 @@ const Tooltip = ({
                         </Link>
                     )
                     }
-                </ContentWrapper>)}
+                </ContentWrapper>
+            )}
         >
             {children}
         </RcTooltip>
diff --git a/src/components/modals/QrModal/index.js b/src/components/modals/QrModal/index.js
index d581a8ea..1eef2b10 100644
--- a/src/components/modals/QrModal/index.js
+++ b/src/components/modals/QrModal/index.js
@@ -127,7 +127,8 @@ class QrModal extends React.Component<Props, State> {
                     {!this.state.readerLoaded && (
                         <CameraPlaceholder>
                             Waiting for camera...
-                        </CameraPlaceholder>)
+                        </CameraPlaceholder>
+                    )
                     }
                 </Padding>
                 <StyledQrReader
diff --git a/src/components/modals/index.js b/src/components/modals/index.js
index 519fc314..4db54d9e 100644
--- a/src/components/modals/index.js
+++ b/src/components/modals/index.js
@@ -68,7 +68,8 @@ const getDeviceContextModal = (props: Props) => {
                 <Pin
                     device={modal.device}
                     onPinSubmit={modalActions.onPinSubmit}
-                />);
+                />
+            );
 
         case UI.INVALID_PIN:
             return <InvalidPin device={modal.device} />;
@@ -79,7 +80,8 @@ const getDeviceContextModal = (props: Props) => {
                     device={modal.device}
                     selectedDevice={props.wallet.selectedDevice}
                     onPassphraseSubmit={modalActions.onPassphraseSubmit}
-                />);
+                />
+            );
 
         case 'ButtonRequest_PassphraseType':
             return <PassphraseType device={modal.device} />;
@@ -110,7 +112,8 @@ const getDeviceContextModal = (props: Props) => {
                     onCancel={modalActions.onCancel}
                     showAddress={props.receiveActions.showAddress}
                     showUnverifiedAddress={props.receiveActions.showUnverifiedAddress}
-                />);
+                />
+            );
 
         case CONNECT.REMEMBER_REQUEST:
             return (
@@ -119,7 +122,8 @@ const getDeviceContextModal = (props: Props) => {
                     instances={modal.instances}
                     onRememberDevice={modalActions.onRememberDevice}
                     onForgetDevice={modalActions.onForgetDevice}
-                />);
+                />
+            );
 
         case CONNECT.FORGET_REQUEST:
             return (
@@ -127,7 +131,8 @@ const getDeviceContextModal = (props: Props) => {
                     device={modal.device}
                     onForgetSingleDevice={modalActions.onForgetSingleDevice}
                     onCancel={modalActions.onCancel}
-                />);
+                />
+            );
 
         case CONNECT.TRY_TO_DUPLICATE:
             return (
@@ -136,7 +141,8 @@ const getDeviceContextModal = (props: Props) => {
                     devices={props.devices}
                     onDuplicateDevice={modalActions.onDuplicateDevice}
                     onCancel={modalActions.onCancel}
-                />);
+                />
+            );
 
         case CONNECT.REQUEST_WALLET_TYPE:
             return (
@@ -144,7 +150,8 @@ const getDeviceContextModal = (props: Props) => {
                     device={modal.device}
                     onWalletTypeRequest={modalActions.onWalletTypeRequest}
                     onCancel={modalActions.onCancel}
-                />);
+                />
+            );
 
         default:
             return null;
diff --git a/src/reducers/AccountsReducer.js b/src/reducers/AccountsReducer.js
index f52f22c8..a9c5d9cf 100644
--- a/src/reducers/AccountsReducer.js
+++ b/src/reducers/AccountsReducer.js
@@ -92,8 +92,8 @@ export default (state: State = initialState, action: Action): State => {
         case WALLET.CLEAR_UNAVAILABLE_DEVICE_DATA:
             return clear(state, action.devices);
 
-        //case CONNECT.FORGET_SINGLE :
-        //    return forgetAccounts(state, action);
+            //case CONNECT.FORGET_SINGLE :
+            //    return forgetAccounts(state, action);
 
         case ACCOUNT.UPDATE:
             return updateAccount(state, action.payload);
diff --git a/src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.js b/src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.js
index 86612377..7a4391a8 100644
--- a/src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.js
+++ b/src/views/Wallet/views/Account/Send/ethereum/components/AdvancedForm/index.js
@@ -200,7 +200,8 @@ const AdvancedForm = (props: Props) => {
                             { showDefaultGasLimitButton && (
                                 <Right>
                                     <StyledLink onClick={setDefaultGasLimit} isGreen>Set default</StyledLink>
-                                </Right>)
+                                </Right>
+                            )
                             }
                         </InputLabelWrapper>
                     )}
diff --git a/src/views/Wallet/views/Account/Summary/ripple/index.js b/src/views/Wallet/views/Account/Summary/ripple/index.js
index 8c1e6a6a..17b752bb 100644
--- a/src/views/Wallet/views/Account/Summary/ripple/index.js
+++ b/src/views/Wallet/views/Account/Summary/ripple/index.js
@@ -107,7 +107,8 @@ const AccountSummary = (props: Props) => {
                                 size={24}
                             />
                         </StyledTooltip>
-                    </H2Wrapper>)
+                    </H2Wrapper>
+                )
                 }
             </React.Fragment>
         </Content>