Merge pull request #192 from codaco/fix/prop-type

Fix addresses displayed in Instructions
complexdatacollective · Nov 16, 2018 · 35bd0c9 · 35bd0c9
2 parents 1ca8595 + 13c625f
commit 35bd0c9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/renderer/components/Instructions.js b/src/renderer/components/Instructions.js
@@ -48,8 +48,8 @@ const Instructions = ({ compact, apiInfo, showPairingInstructions, showImportIns
               you may enter the connection information manually:</em>
             </p>
             <dl className="instructions__definition-list">
-              <dt>Address</dt>
-              <dd>{apiInfo.address}</dd>
+              <dt>Addresses</dt>
+              <dd>{apiInfo.publicAddresses.join(', ')}</dd>
               <dt>Port</dt>
               <dd>{apiInfo.httpPort}</dd>
             </dl>

diff --git a/src/renderer/components/__tests__/Instructions-test.js b/src/renderer/components/__tests__/Instructions-test.js
@@ -31,9 +31,9 @@ describe('<Instructions />', () => {
   });
 
   it('renders API info', () => {
-    const apiInfo = { address: '192.168.x.x', httpPort: 65531 };
+    const apiInfo = { publicAddresses: ['192.168.x.x'], httpPort: 65531 };
     const subject = shallow(<Instructions apiInfo={apiInfo} />);
-    expect(subject.text()).toMatch(apiInfo.address);
+    expect(subject.text()).toMatch(apiInfo.publicAddresses[0]);
     expect(subject.text()).toMatch(apiInfo.httpPort.toString());
   });
 });
diff --git a/src/renderer/containers/__tests__/OverviewScreen-test.js b/src/renderer/containers/__tests__/OverviewScreen-test.js
@@ -37,7 +37,7 @@ describe('<OverviewScreen />', () => {
     const state = {
       devices: [{ id: 'device1', name: '1', createdAt: new Date() }],
       protocols: [{ id: 'protocol1', name: '1', createdAt: new Date() }],
-      connectionInfo: { deviceService: { httpPort: 5555, address: '192.168.x.x' } },
+      connectionInfo: { deviceService: { httpPort: 5555, publicAddresses: ['192.168.x.x'] } },
     };
     let store;
     beforeEach(() => {

diff --git a/src/renderer/types.js b/src/renderer/types.js
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 
 const deviceApiInfo = PropTypes.shape({
-  address: PropTypes.string.isRequired,
+  publicAddresses: PropTypes.arrayOf(PropTypes.string).isRequired,
   httpPort: PropTypes.number.isRequired,
 });