Merge pull request #41 from NordicSemiconductor/update/shared

Update shared
NordicSemiconductor · Jul 8, 2020 · 5671232 · 5671232
2 parents b98963a + 7a39ad6
commit 5671232
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 21 deletions.
diff --git a/lib/actions/warningActions.js b/lib/actions/warningActions.js
@@ -56,7 +56,6 @@ export function clearIncompatibleWarning() {
     };
 }
 
-
 export function setCommunicationErrorWarning(message) {
     return dispatch => {
         dispatch({

diff --git a/lib/components/AppSidePanelView.jsx b/lib/components/AppSidePanelView.jsx
@@ -60,8 +60,7 @@ const AppSidePanelView = ({ selectedTestMode }) => (
                     <PacketView />
                     <TransmitSetupView />
                 </>
-            )
-        }
+            )}
     </>
 );
 

diff --git a/lib/components/ChannelView.jsx b/lib/components/ChannelView.jsx
@@ -75,7 +75,6 @@ const ChannelView = ({
         </div>
     );
 
-
     const delayLabel = channelMode === SettingsActions.DTM_CHANNEL_MODE.sweep
         ? 'Sweep delay'
         : 'Update period';
@@ -93,22 +92,19 @@ const ChannelView = ({
                     <div className="app-sidepanel-component-slider">
                         {ChannelSlider('Channel', channel, onChannelChanged)}
                     </div>
-                )
-            }
+                )}
             {channelMode === SettingsActions.DTM_CHANNEL_MODE.sweep
                 && (
                     <div className="app-sidepanel-component-slider">
                         {ChannelSlider('Channel Low', channelLow, onChannelLowChanged)}
                     </div>
-                )
-            }
+                )}
             {channelMode === SettingsActions.DTM_CHANNEL_MODE.sweep
                 && (
                     <div className="app-sidepanel-component-slider">
                         {ChannelSlider('Channel High', channelHigh, onChannelHighChanged)}
                     </div>
-                )
-            }
+                )}
 
             <div className="app-sidepanel-component-inputbox">
                 <Form>

diff --git a/lib/components/ChartView.jsx b/lib/components/ChartView.jsx
@@ -214,7 +214,6 @@ const ChartView = ({
         receiveValueHistoryTicks[lastChannel.channel] = 0;
     }
 
-
     const currentChannelData = new Array(channelTotal).fill(0);
     if (currentChannel !== undefined) {
         currentChannelData[currentChannel] = Math.max(1, Math.max(...receiveValueHistory));

diff --git a/lib/components/ToggleChannelModeView.jsx b/lib/components/ToggleChannelModeView.jsx
@@ -66,7 +66,6 @@ const ToggleChannelModeView = ({
     );
 };
 
-
 ToggleChannelModeView.propTypes = {
     selected: PropTypes.string.isRequired,
     onButtonClicked: PropTypes.func.isRequired,

diff --git a/lib/components/TransmitSetupView.jsx b/lib/components/TransmitSetupView.jsx
@@ -65,8 +65,7 @@ const txPowerView = (boardType, txPowerIdx, txPowerUpdated, isRunning) => {
                         return txPowerUpdated(value);
                     }
                     return txPowerUpdated(txPowerIdx);
-                }
-                }
+                }}
                 max={maxDbmRangeValue}
                 min={0}
                 labels={label}

diff --git a/lib/containers/channelView.js b/lib/containers/channelView.js
@@ -38,7 +38,6 @@ import { connect } from 'react-redux';
 import ChannelView from '../components/ChannelView';
 import * as SettingsActions from '../actions/settingsActions';
 
-
 export default connect(
     (state, props) => ({
         ...props,

diff --git a/lib/containers/otherSettingsView.js b/lib/containers/otherSettingsView.js
@@ -38,7 +38,6 @@ import { connect } from 'react-redux';
 import OtherSettingsView from '../components/OtherSettingsView';
 import * as SettingsActions from '../actions/settingsActions';
 
-
 export default connect(
     (state, props) => ({
         ...props,

diff --git a/lib/containers/timeoutView.js b/lib/containers/timeoutView.js
@@ -38,7 +38,6 @@ import { connect } from 'react-redux';
 import TimeoutView from '../components/TimeoutView';
 import * as SettingsActions from '../actions/settingsActions';
 
-
 export default connect(
     (state, props) => ({
         ...props,

diff --git a/lib/containers/toggleChannelModeView.js b/lib/containers/toggleChannelModeView.js
@@ -38,7 +38,6 @@ import { connect } from 'react-redux';
 import ToggleChannelModeView from '../components/ToggleChannelModeView';
 import * as SettingsActions from '../actions/settingsActions';
 
-
 export default connect(
     (state, props) => ({
         ...props,

diff --git a/lib/containers/toggleTestModeView.js b/lib/containers/toggleTestModeView.js
@@ -38,7 +38,6 @@ import { connect } from 'react-redux';
 import ToggleTestModeView from '../components/ToggleTestModeView';
 import * as SettingsActions from '../actions/settingsActions';
 
-
 export default connect(
     (state, props) => ({
         ...props,

diff --git a/package.json b/package.json
@@ -37,9 +37,12 @@
   "devDependencies": {
     "chart.js": "^2.8.0",
     "nrf-dtm-js": "git+https://github.com/NordicPlayground/nrf-dtm-js",
-    "pc-nrfconnect-devdep": "git+https://github.com/NordicSemiconductor/pc-nrfconnect-devdep.git#semver:3.4.0",
+    "pc-nrfconnect-shared": "git+https://github.com/NordicSemiconductor/pc-nrfconnect-shared.git#semver:^4.8.3",
+    "react": "16.13.1",
     "react-chartjs-2": "^2.7.6",
-    "react-rangeslider": "^2.2.0"
+    "react-dom": "16.13.1",
+    "react-rangeslider": "^2.2.0",
+    "react-redux": "7.2.0"
   },
   "dependencies": {
     "electron-store": "^3.2.0"
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,6 @@ export function clearIncompatibleWarning() { @@
         };
     }
     export function setCommunicationErrorWarning(message) {
         return dispatch => {
             dispatch({
@@ Expand Down @@