Merge pull request #331 from Lumerin-protocol/stg

Main 1.2.47
Lumerin-protocol · Dec 7, 2023 · ba22f3a · ba22f3a
2 parents c6421d9 + b838e6c
commit ba22f3a
Show file tree

Hide file tree

Showing 7 changed files with 314 additions and 215 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lumerin-wallet-desktop",
-  "version": "1.2.46",
+  "version": "1.2.47",
   "engines": {
     "node": ">=14"
   },
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "@electron/remote": "2.0.9",
-    "@lumerin/wallet-core": "git+ssh://[email protected]:Lumerin-protocol/WalletCore.git#1.0.83",
+    "@lumerin/wallet-core": "git+ssh://[email protected]:Lumerin-protocol/WalletCore.git#1.0.84",
     "@reach/menu-button": "0.17.0",
     "@tabler/icons": "1.119.0",
     "axios": "0.27.2",

diff --git a/src/components/toasts/Toast.js b/src/components/toasts/Toast.js
@@ -130,7 +130,6 @@ export default class Toast extends React.Component {
               key: msg,
               data: msg,
               style: {
-                maxHeight: spring(50, { stiffness: 150, damping: 20 }),
                 opacity: spring(1, { stiffness: 60, damping: 5 })
               }
             }))}

diff --git a/src/components/tools/ExportPrivateKeyModal.js b/src/components/tools/ExportPrivateKeyModal.js
@@ -10,8 +10,8 @@ import {
   ConfirmBtn,
   Row
 } from './ConfirmModal.styles';
-import { Input } from './Tools';
 import { useState } from 'react';
+import { Input } from './common';
 
 const PrivateKey = styled.div`
   word-break: break-word;

diff --git a/src/components/tools/ProxyConfigPanel.js b/src/components/tools/ProxyConfigPanel.js
@@ -0,0 +1,229 @@
+//ts-check
+
+import React, { useState } from 'react';
+import { Sp } from '../common';
+import Spinner from '../common/Spinner';
+import ConfirmProxyConfigModal from './ConfirmProxyConfigModal';
+import { generatePoolUrl } from '../../utils';
+import { validatePoolAddress } from '../../store/validators';
+
+import 'react-tabs/style/react-tabs.css';
+import './styles.css';
+
+import {
+  ErrorLabel,
+  StyledBtn,
+  Subtitle,
+  StyledParagraph,
+  Input
+} from './common';
+
+function RemoteProxyConfig() {
+  return (
+    <StyledParagraph>
+      You are running Wallet wihout Proxy-Router. Reset wallet to setup
+      validator node.
+    </StyledParagraph>
+  );
+}
+
+function TitanLightningProxyPanel(props) {
+  const { titanLightningDashboard, sellerPoolParts } = props;
+  return (
+    <>
+      <StyledParagraph>
+        <div>
+          <span>Titan Lightning Address:</span> {sellerPoolParts?.account}{' '}
+        </div>
+        <p
+          style={{
+            textDecoration: 'underline',
+            cursor: 'pointer'
+          }}
+          data-tooltip={titanLightningDashboard}
+          onClick={() => {
+            window.open(titanLightningDashboard, '_blank');
+          }}
+        >
+          Dashboard for Lightning users
+        </p>
+      </StyledParagraph>
+    </>
+  );
+}
+
+function ProxyConfigView(props) {
+  const { isTitanLightning, sellerPoolParts, proxyRouterEditClick } = props;
+  return (
+    <>
+      {isTitanLightning ? (
+        <TitanLightningProxyPanel {...props} />
+      ) : (
+        <StyledParagraph>
+          <div>
+            <span>Proxy Default Pool:</span> {sellerPoolParts?.pool}{' '}
+          </div>
+          <div>
+            <span>Proxy Default Account:</span> {sellerPoolParts?.account}{' '}
+          </div>
+        </StyledParagraph>
+      )}
+      <StyledBtn onClick={proxyRouterEditClick}>Edit</StyledBtn>
+    </>
+  );
+}
+
+function ProxyConfigEdit(props) {
+  const {
+    isTitanLightning,
+    sellerPoolParts,
+    setSellerPoolParts,
+    errors,
+    setErrors
+  } = props;
+
+  const onChangePoolAddess = address => {
+    const result = validatePoolAddress(address, {});
+
+    setErrors({
+      ...errors,
+      proxyDefaultPool: result.proxyDefaultPool || null
+    });
+
+    setSellerPoolParts({
+      ...sellerPoolParts,
+      pool: address,
+      isTitanLightning
+    });
+  };
+
+  return (
+    <>
+      {isTitanLightning ? (
+        <StyledParagraph>
+          Titan Lightning Address:
+          <Input
+            placeholder={'[email protected]'}
+            onChange={e =>
+              setSellerPoolParts({
+                ...sellerPoolParts,
+                account: e.value
+              })
+            }
+            value={sellerPoolParts?.account}
+          />
+        </StyledParagraph>
+      ) : (
+        <>
+          <StyledParagraph>
+            Proxy Default Pool Host & Port:{' '}
+            <Input
+              placeholder="example: btc.global.luxor.tech:8888"
+              onChange={e => onChangePoolAddess(e.value)}
+              value={sellerPoolParts?.pool}
+            />
+            {errors?.proxyDefaultPool && (
+              <ErrorLabel>{errors?.proxyDefaultPool}</ErrorLabel>
+            )}
+          </StyledParagraph>
+          <StyledParagraph>
+            Proxy Default Account:
+            <Input
+              placeholder="[email protected]"
+              onChange={e =>
+                setSellerPoolParts({
+                  ...sellerPoolParts,
+                  account: e.value
+                })
+              }
+              value={sellerPoolParts?.account}
+            />
+          </StyledParagraph>
+        </>
+      )}
+    </>
+  );
+}
+
+export function ProxyConfigPanel(props) {
+  const [errors, setErrors] = useState({});
+
+  return !props.isLocalProxyRouter ? (
+    <RemoteProxyConfig />
+  ) : (
+    <>
+      <Sp mt={5}>
+        <Subtitle>Proxy-Router Configuration</Subtitle>
+        {props.proxyRouterSettings.isFetching ? (
+          <Spinner />
+        ) : props.proxyRouterSettings.proxyRouterEditMode ? (
+          <>
+            <div style={{ display: 'flex' }}>
+              <span>Use Titan Pool for Lightning Payouts</span>
+              <input
+                style={{ marginLeft: '10px' }}
+                data-testid="use-titan-lightning"
+                onChange={() => {
+                  props.toggleIsLightning();
+                }}
+                checked={props.isTitanLightning}
+                type="checkbox"
+                id="isTitanLightning"
+              />
+            </div>
+            <ProxyConfigEdit {...props} errors={errors} setErrors={setErrors} />
+            <hr></hr>
+            <StyledBtn
+              disabled={!!errors?.proxyDefaultPool}
+              onClick={() => {
+                props.setProxyRouterSettings({
+                  ...props.proxyRouterSettings,
+                  isTitanLightning: props.isTitanLightning,
+                  sellerDefaultPool: generatePoolUrl(
+                    props.sellerPoolParts.account,
+                    !props.isTitanLightning
+                      ? props.sellerPoolParts.pool
+                      : props.titanLightningPool
+                  )
+                });
+                props.onActiveModalClick('confirm-proxy-restart');
+              }}
+            >
+              Save
+            </StyledBtn>
+          </>
+        ) : (
+          <ProxyConfigView {...props} />
+        )}
+
+        <ConfirmProxyConfigModal
+          onRequestClose={props.onCloseModal}
+          onConfirm={props.confirmProxyRouterRestart}
+          onLater={props.saveProxyRouterConfig}
+          isOpen={props.state.activeModal === 'confirm-proxy-restart'}
+        />
+      </Sp>
+      <Sp mt={5}>
+        <Subtitle>Restart Proxy Router</Subtitle>
+        <StyledParagraph>Restart the connected Proxy Router.</StyledParagraph>
+        {props.isRestarting ? (
+          <Spinner size="20px" />
+        ) : (
+          <StyledBtn
+            onClick={() =>
+              props.onActiveModalClick('confirm-proxy-direct-restart')
+            }
+          >
+            Restart
+          </StyledBtn>
+        )}
+        <ConfirmProxyConfigModal
+          onRequestClose={props.onCloseModal}
+          onConfirm={props.onRestartClick}
+          onLater={props.onCloseModal}
+          isOpen={props.state.activeModal === 'confirm-proxy-direct-restart'}
+        />
+      </Sp>
+    </>
+  );
+}
diff --git a/src/components/tools/RevealSecretPhraseModal.js b/src/components/tools/RevealSecretPhraseModal.js
@@ -1,17 +1,16 @@
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import React, { useEffect } from 'react';
+import React, { useState } from 'react';
 
-import { Modal, BaseBtn } from '../common';
+import { Modal } from '../common';
 import {
   Container,
   Message,
   Row,
   DismissBtn,
   ConfirmBtn
 } from './ConfirmModal.styles';
-import { Input } from './Tools';
-import { useState } from 'react';
+import { Input } from './common';
 
 const Mnemonic = styled.div`
   padding: 10px 0;