Merge branch 'develop' of github.com:andrerfneves/zec-react-wallet into hotfix/built-in-daemon

README.md

@@ -18,11 +18,11 @@ List of the main open source libraries and technologies used in building **Zepio
 - [zcashd](https://github.com/zcash/zcash): Zcash node daemon
 - [Electron](https://github.com/electron/electron): Desktop application builder
 - [React](https://facebook.github.io/react/): User interface view layer
-- [Redux](http://redux.js.org/): Predictable application state container
+- [Redux](https://redux.js.org/): Predictable application state container
 - [Styled Components](https://www.styled-components.com/): Visual primitives for theming and styling applications
-- [webpack](http://webpack.github.io/): Application module bundler (and more)
-- [Babel](http://babeljs.io/): ES7/JSX transpilling
-- [ESLint](http://eslint.org/): Code linting rules
+- [webpack](https://webpack.github.io/): Application module bundler (and more)
+- [Babel](https://babeljs.io/): ES7/JSX transpilling
+- [ESLint](https://eslint.org/): Code linting rules
 - [Flow](https://flow.org): JavaScript static type checker
 - [Docz](https://docz.site): Documentation builder
 

app/views/settings.js

@@ -373,32 +373,33 @@ export class SettingsView extends PureComponent<Props, State> {
 
     return (
       <Wrapper>
-        <ConfirmDialogComponent
-          title='Confirm'
-          onConfirm={() => updateZcashNetwork(zcashNetwork === MAINNET ? TESTNET : MAINNET)}
-          showButtons={embeddedDaemon}
-          renderTrigger={toggleVisibility => (
-            <ThemeSelectWrapper>
-              <SettingsTitle value='Zcash Network' />
-              <SelectComponent
-                onChange={value => (zcashNetwork !== value ? toggleVisibility() : undefined)}
-                value={zcashNetwork}
-                options={networkOptions}
-              />
-            </ThemeSelectWrapper>
-          )}
-        >
-          {() => (
-            <ModalContent>
-              <TextComponent
-                value={
-                  embeddedDaemon ? CONFIRM_RELAUNCH_CONTENT : RUNNING_NON_EMBEDDED_DAEMON_WARNING
-                }
-              />
-            </ModalContent>
-          )}
-        </ConfirmDialogComponent>
-
+        {embeddedDaemon && (
+          <ConfirmDialogComponent
+            title='Confirm'
+            onConfirm={() => updateZcashNetwork(zcashNetwork === MAINNET ? TESTNET : MAINNET)}
+            showButtons={embeddedDaemon}
+            renderTrigger={toggleVisibility => (
+              <ThemeSelectWrapper>
+                <SettingsTitle value='Zcash Network' />
+                <SelectComponent
+                  onChange={value => (zcashNetwork !== value ? toggleVisibility() : undefined)}
+                  value={zcashNetwork}
+                  options={networkOptions}
+                />
+              </ThemeSelectWrapper>
+            )}
+          >
+            {() => (
+              <ModalContent>
+                <TextComponent
+                  value={
+                    embeddedDaemon ? CONFIRM_RELAUNCH_CONTENT : RUNNING_NON_EMBEDDED_DAEMON_WARNING
+                  }
+                />
+              </ModalContent>
+            )}
+          </ConfirmDialogComponent>
+        )}
         <ThemeSelectWrapper>
           <SettingsTitle value='Theme' />
           <SelectComponent

package.json

@@ -1,7 +1,7 @@
 {
   "name": "zepio",
   "productName": "Zepio",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Zepio | Cross-platform sapling-enabled full-node Zcash wallet",
   "main": "config/main.js",
   "homepage": "https://zepiowallet.com",