fix(send receive): get it compiling

blockchain · May 20, 2021 · abbe341 · abbe341
1 parent 76362f2
commit abbe341
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 86 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/sagaRegister.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/sagaRegister.ts
@@ -17,12 +17,9 @@ import onboarding from './onboarding/sagaRegister'
 import priceChart from './priceChart/sagaRegister'
 import priceTicker from './priceTicker/sagaRegister'
 import refresh from './refresh/sagaRegister'
-<<<<<<< HEAD
-import request from './request/sagaRegister'
-=======
 import remindWalletGuid from './remindWalletGuid/sagaRegister'
+import request from './request/sagaRegister'
 import resetWallet2fa from './resetWallet2fa/sagaRegister'
->>>>>>> development
 import send from './send/sagaRegister'
 import sendBch from './sendBch/sagaRegister'
 import sendBtc from './sendBtc/sagaRegister'
@@ -57,12 +54,9 @@ export default ({ api, coreSagas, networks }) =>
     yield fork(priceChart())
     yield fork(priceTicker({ coreSagas }))
     yield fork(refresh())
-<<<<<<< HEAD
     yield fork(request({ api, coreSagas, networks }))
-=======
     yield fork(remindWalletGuid({ api }))
     yield fork(resetWallet2fa({ api }))
->>>>>>> development
     yield fork(send({ api, coreSagas, networks }))
     yield fork(sendBch({ api, coreSagas, networks }))
     yield fork(sendBtc({ api, coreSagas, networks }))

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/selectors.ts b/packages/blockchain-wallet-v4-frontend/src/data/components/selectors.ts
@@ -10,12 +10,9 @@ import * as manageAddresses from './manageAddresses/selectors'
 import * as priceChart from './priceChart/selectors'
 import * as priceTicker from './priceTicker/selectors'
 import * as recoveryPhrase from './recoveryPhrase/selectors'
-<<<<<<< HEAD
-import * as request from './request/selectors'
-=======
 import * as remindWalletGuid from './remindWalletGuid/selectors'
+import * as request from './request/selectors'
 import * as resetWallet2fa from './resetWallet2fa/selectors'
->>>>>>> development
 import * as send from './send/selectors'
 import * as sendBch from './sendBch/selectors'
 import * as sendBtc from './sendBtc/selectors'
@@ -43,12 +40,9 @@ export {
   priceChart,
   priceTicker,
   recoveryPhrase,
-<<<<<<< HEAD
-  request,
-=======
   remindWalletGuid,
+  request,
   resetWallet2fa,
->>>>>>> development
   send,
   sendBch,
   sendBtc,
@@ -61,5 +55,5 @@ export {
   uploadDocuments,
   utils,
   veriff,
-  withdraw
+  withdraw,
 }
diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/RequestCrypto/ShowAddress/index.tsx b/packages/blockchain-wallet-v4-frontend/src/modals/RequestCrypto/ShowAddress/index.tsx
@@ -4,12 +4,7 @@ import { connect, ConnectedProps } from 'react-redux'
 import { bindActionCreators } from 'redux'
 import styled from 'styled-components'
 
-import {
-  Button,
-  Icon,
-  SkeletonRectangle,
-  Text
-} from 'blockchain-info-components'
+import { Button, Icon, SkeletonRectangle, Text } from 'blockchain-info-components'
 import { SupportedWalletCurrenciesType } from 'blockchain-wallet-v4/src/redux/walletOptions/types'
 import CopyClipboardButton from 'components/Clipboard/CopyClipboardButton'
 import { FlyoutWrapper } from 'components/Flyout'
@@ -32,9 +27,9 @@ const AddressWrapper = styled.div`
   justify-content: space-between;
   align-items: center;
   padding: 16px 40px;
-  border-bottom: ${props => `1px solid ${props.theme.grey000}`};
+  border-bottom: ${(props) => `1px solid ${props.theme.grey000}`};
   &:first-child {
-    border-top: ${props => `1px solid ${props.theme.grey000}`};
+    border-top: ${(props) => `1px solid ${props.theme.grey000}`};
   }
 `
 const AddressDisplay = styled.div`
@@ -47,7 +42,7 @@ const AddressDisplay = styled.div`
   hyphens: none;
 `
 const InfoContainer = styled.div`
-  background: ${props => props.theme.grey000};
+  background: ${(props) => props.theme.grey000};
   margin: 16px 40px 0px 40px;
   padding: 16px;
   border-radius: 8px;
@@ -82,19 +77,11 @@ const AlertWrapper = styled.div`
 
 class RequestShowAddress extends React.PureComponent<Props> {
   componentDidMount() {
-    this.props.requestActions.getNextAddress(
-      this.props.formValues.selectedAccount
-    )
+    this.props.requestActions.getNextAddress(this.props.formValues.selectedAccount)
   }
 
   render() {
-    const {
-      formValues,
-      handleClose,
-      setStep,
-      supportedCoins,
-      walletCurrency
-    } = this.props
+    const { formValues, handleClose, setStep, supportedCoins, walletCurrency } = this.props
     const { selectedAccount } = formValues
     const coinModel = supportedCoins[selectedAccount.coin]
 
@@ -132,59 +119,42 @@ class RequestShowAddress extends React.PureComponent<Props> {
             </Text>
             <Text color='grey800' size='16px' weight={600} lineHeight='24px'>
               {this.props.addressR.cata({
-                Success: val => val.address,
-                Failure: err => (
+                Failure: () => (
                   <FormattedMessage
                     id='components.alerts.unknown_error'
                     defaultMessage='An error has occurred.'
-                  >
-                    {err}
-                  </FormattedMessage>
-                ),
-                Loading: () => (
-                  <SkeletonRectangle width='280px' height='24px' />
+                  />
                 ),
-                NotAsked: () => (
-                  <SkeletonRectangle width='280px' height='24px' />
-                )
+                Loading: () => <SkeletonRectangle width='280px' height='24px' />,
+                NotAsked: () => <SkeletonRectangle width='280px' height='24px' />,
+                Success: (val) => val.address,
               })}
             </Text>
           </AddressDisplay>
           <ClipboardWrapper>
             {this.props.addressR.cata({
-              Success: val => (
-                <CopyClipboardButton
-                  textToCopy={val.address}
-                  color='blue600'
-                  size='24px'
-                />
-              ),
               Failure: () => <></>,
               Loading: () => <></>,
-              NotAsked: () => <></>
+              NotAsked: () => <></>,
+              Success: (val) => (
+                <CopyClipboardButton textToCopy={val.address} color='blue600' size='24px' />
+              ),
             })}
           </ClipboardWrapper>
         </AddressWrapper>
         {this.props.addressR.cata({
-          Success: val =>
+          Failure: () => null,
+          Loading: () => null,
+          NotAsked: () => null,
+          Success: (val) =>
             val.extras
-              ? Object.keys(val.extras).map(extra => (
+              ? Object.keys(val.extras).map((extra) => (
                   <AddressWrapper>
                     <AddressDisplay>
-                      <Text
-                        color='grey600'
-                        size='14px'
-                        lineHeight='21px'
-                        weight={500}
-                      >
+                      <Text color='grey600' size='14px' lineHeight='21px' weight={500}>
                         {extra}
                       </Text>
-                      <Text
-                        color='grey800'
-                        size='16px'
-                        weight={600}
-                        lineHeight='24px'
-                      >
+                      <Text color='grey800' size='16px' weight={600} lineHeight='24px'>
                         {val.extras[extra as string]}
                       </Text>
                     </AddressDisplay>
@@ -198,9 +168,6 @@ class RequestShowAddress extends React.PureComponent<Props> {
                   </AddressWrapper>
                 ))
               : null,
-          Failure: () => null,
-          Loading: () => null,
-          NotAsked: () => null
         })}
         {coinModel.isMemoBased && selectedAccount.type === 'CUSTODIAL' && (
           <InfoContainer>
@@ -215,14 +182,7 @@ class RequestShowAddress extends React.PureComponent<Props> {
         )}
         <QRCodeContainer>
           {this.props.addressR.cata({
-            Success: val => (
-              <QRCodeWrapper
-                data-e2e='requestAddressQrCode'
-                size={280}
-                value={val.address}
-              />
-            ),
-            Failure: err => (
+            Failure: (err) => (
               <SkeletonRectangle width='306px' height='306px'>
                 <AlertWrapper>
                   <Icon name='alert-filled' size='40px' color='red600' />
@@ -233,7 +193,10 @@ class RequestShowAddress extends React.PureComponent<Props> {
               </SkeletonRectangle>
             ),
             Loading: () => <SkeletonRectangle width='306px' height='306px' />,
-            NotAsked: () => <SkeletonRectangle width='306px' height='306px' />
+            NotAsked: () => <SkeletonRectangle width='306px' height='306px' />,
+            Success: (val) => (
+              <QRCodeWrapper data-e2e='requestAddressQrCode' size={280} value={val.address} />
+            ),
           })}
         </QRCodeContainer>
         <ButtonsWrapper>
@@ -255,17 +218,14 @@ class RequestShowAddress extends React.PureComponent<Props> {
 }
 
 const mapStateToProps = (state, ownProps: OwnProps) => ({
+  addressR: selectors.components.request.getNextAddress(state, ownProps.formValues.selectedAccount),
   supportedCoins: selectors.core.walletOptions
     .getSupportedCoins(state)
     .getOrElse({} as SupportedWalletCurrenciesType),
-  addressR: selectors.components.request.getNextAddress(
-    state,
-    ownProps.formValues.selectedAccount
-  )
 })
 
-const mapDispatchToProps = dispatch => ({
-  requestActions: bindActionCreators(actions.components.request, dispatch)
+const mapDispatchToProps = (dispatch) => ({
+  requestActions: bindActionCreators(actions.components.request, dispatch),
 })
 
 const connector = connect(mapStateToProps, mapDispatchToProps)