Merge branch 'master' into fix/173-react-18next-interpolation

leapdao · Jul 19, 2019 · be21be3 · be21be3
2 parents 7a44327 + 38ff965
commit be21be3
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -63,3 +63,4 @@ react.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.vscode
diff --git a/src/components/Advanced.js b/src/components/Advanced.js
@@ -14,7 +14,7 @@ import { PrimaryButton, BorderButton } from '../components/Buttons'
 import getConfig from '../config'
 import { getStoredValue, storeValues } from "../services/localStorage";
 
-const { CURRENCY } = getConfig()
+const { CURRENCY, LINKS } = getConfig()
 
 class Advanced extends React.Component {
   constructor(props) {
@@ -161,28 +161,35 @@ class Advanced extends React.Component {
 
     return (
       <div style={{marginTop:20}}>
-      <Flex alignItems='center' justifyContent='space-between' width={1}>
-        <Text>{t('currency.label')}</Text>
-        <Select items={CURRENCY.CURRENCY_LIST} onChange={this.updateCurrency} value={currency}/>
-      </Flex>
-      <hr style={{paddingTop:20}}/>
-      <div>
-        <div style={{width:"100%",textAlign:"center"}}><h5>Learn More</h5></div>
-        <div className="content ops row settings-row" style={{marginBottom:10}}>
-          <a href="https://github.com/leapdao/burner-wallet" style={{color:"#FFFFFF"}} target="_blank" rel="noopener noreferrer">
-            <BorderButton width={1}>
-              <Scaler config={{startZoomAt:400,origin:"50% 50%"}}>
-                <i className="fas fa-code"/> {t('code')}
-              </Scaler>
-            </BorderButton>
-          </a>
-          <a href="https://leapdao.org/" style={{color:"#FFFFFF"}} target="_blank" rel="noopener noreferrer">
-            <BorderButton width={1}>
-              <Scaler config={{startZoomAt:400,origin:"50% 50%"}}>
-                <i className="fas fa-info"/> {t('about')}
-              </Scaler>
-            </BorderButton>
-          </a>
+        <Flex py={3} alignItems='center' justifyContent='space-between'>
+          <Text>{t('currency.label')}</Text>
+          <Select items={CURRENCY.CURRENCY_LIST} onChange={this.updateCurrency} value={currency}/>
+        </Flex>
+        <Flex py={3} alignItems='center' justifyContent='space-between'>
+          <Text>Enable advanced features</Text>
+          <Checkbox onChange={this.updateAdvancedBalance} checked={expertMode} />
+        </Flex>
+
+        <hr style={{paddingTop:20}}/>
+
+        <div>
+          <div style={{width:"100%",textAlign:"center"}}><h5>Learn More</h5></div>
+          <div className="content ops row settings-row" style={{marginBottom:10}}>
+            <a href={LINKS.CODE} style={{color:"#FFFFFF"}} target="_blank" rel="noopener noreferrer">
+              <BorderButton width={1}>
+                <Scaler config={{startZoomAt:400,origin:"50% 50%"}}>
+                  <i className="fas fa-code"/> {t('code')}
+                </Scaler>
+              </BorderButton>
+            </a>
+            <a href={LINKS.ABOUT} style={{color:"#FFFFFF"}} target="_blank" rel="noopener noreferrer">
+              <BorderButton width={1}>
+                <Scaler config={{startZoomAt:400,origin:"50% 50%"}}>
+                  <i className="fas fa-info"/> {t('about')}
+                </Scaler>
+              </BorderButton>
+            </a>
+          </div>
         </div>
 
         <hr style={{paddingTop:20}}/>

diff --git a/src/config.js b/src/config.js
@@ -5,6 +5,10 @@ const configs = [
       CURRENCY_LIST: ["USD", "EUR", "GBP"],
       DEFAULT_CURRENCY: "USD"
     },
+    LINKS: {
+      CODE: "https://github.com/leapdao/burner-wallet",
+      ABOUT: "https://leapdao.org/",
+    },
     SIDECHAIN: {
       NAME: "Leap Testnet",
       RPC: "https://testnet-node.leapdao.org",
@@ -46,6 +50,10 @@ const configs = [
       CURRENCY_LIST: ["EUR", "USD", "GBP"],
       DEFAULT_CURRENCY: "USD"
     },
+    LINKS: {
+      CODE: "https://github.com/leapdao/burner-wallet",
+      ABOUT: "https://leapdao.org/",
+    },
     SIDECHAIN: {
       NAME: "Leap Testnet",
       RPC: "https://testnet-node.leapdao.org",
@@ -87,6 +95,10 @@ const configs = [
       CURRENCY_LIST: ["EUR", "USD", "GBP"],
       DEFAULT_CURRENCY: "USD"
     },
+    LINKS: {
+      CODE: "https://github.com/leapdao/burner-wallet",
+      ABOUT: "https://leapdao.org/",
+    },
     SIDECHAIN: {
       NAME: "Leap Network",
       RPC: "wss://mainnet-node1.leapdao.org:1443",