feat(simple buy): move ordering of custody wallets and change name

blockchain · Mar 27, 2020 · a6d783e · a6d783e
1 parent a0cc90a
commit a6d783e
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 28 deletions.
diff --git a/...es/blockchain-info-components/src/Form/SelectInput/__snapshots__/SelectInput.spec.js.snap b/...es/blockchain-info-components/src/Form/SelectInput/__snapshots__/SelectInput.spec.js.snap
@@ -15,6 +15,7 @@ exports[`SelectInput component default renders correctly 1`] = `
       }
     }
     focusedBorderColor="blue600"
+    height="48px"
     openMenuOnClick={true}
     options={
       Array [

diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Form/FormGroup/index.js b/packages/blockchain-wallet-v4-frontend/src/components/Form/FormGroup/index.js
@@ -4,6 +4,7 @@ import styled from 'styled-components'
 const Wrapper = styled.div`
   width: 100%;
   display: flex;
+  position: relative;
   flex-direction: ${props => (props.inline ? 'row' : 'column')};
   margin-bottom: ${props => (props.margin ? props.margin : '10px')};
   > div {

diff --git a/...ages/blockchain-wallet-v4-frontend/src/components/Form/SelectBoxBchAddresses/selectors.ts b/...ages/blockchain-wallet-v4-frontend/src/components/Form/SelectBoxBchAddresses/selectors.ts
@@ -173,6 +173,13 @@ export const getData = (
         .map(excluded)
         .map(toDropdown)
         .map(toGroup('Wallet')),
+      includeCustodial
+        ? selectors.components.simpleBuy
+            .getSBBalances(state)
+            .map<any, any>(prop('BCH'))
+            .map(toCustodialDropdown)
+            .map(toGroup('Custodial Wallet'))
+        : Remote.of([]),
       excludeImported
         ? Remote.of([])
         : lift(formatImportedAddressesData)(relevantAddresses)
@@ -201,13 +208,6 @@ export const getData = (
             .map(toGroup('Lockbox')),
       includeExchangeAddress && hasExchangeAddress
         ? exchangeAddress.map(toExchange).map(toGroup('Exchange'))
-        : Remote.of([]),
-      includeCustodial
-        ? selectors.components.simpleBuy
-            .getSBBalances(state)
-            .map<any, any>(prop('BCH'))
-            .map(toCustodialDropdown)
-            .map(toGroup('Custodial Wallet'))
         : Remote.of([])
     ]).map(([b1, b2, b3, b4, b5]) => {
       // @ts-ignore

diff --git a/...ages/blockchain-wallet-v4-frontend/src/components/Form/SelectBoxEthAddresses/selectors.ts b/...ages/blockchain-wallet-v4-frontend/src/components/Form/SelectBoxEthAddresses/selectors.ts
@@ -78,6 +78,13 @@ export const getEthData = (
         .map(excluded)
         .map(toDropdown)
         .map(toGroup('Wallet')),
+      includeCustodial
+        ? selectors.components.simpleBuy
+            .getSBBalances(state)
+            .map<any, any>(prop('ETH'))
+            .map(toCustodialDropdown)
+            .map(toGroup('Custodial Wallet'))
+        : Remote.of([]),
       excludeLockbox
         ? Remote.of([])
         : selectors.core.common.eth
@@ -87,13 +94,6 @@ export const getEthData = (
             .map(toGroup('Lockbox')),
       includeExchangeAddress && hasExchangeAddress
         ? exchangeAddress.map(toExchange).map(toGroup('Exchange'))
-        : Remote.of([]),
-      includeCustodial
-        ? selectors.components.simpleBuy
-            .getSBBalances(state)
-            .map<any, any>(prop('ETH'))
-            .map(toCustodialDropdown)
-            .map(toGroup('Custodial Wallet'))
         : Remote.of([])
     ]).map(([b1, b2, b3, b4]) => ({
       // @ts-ignore
@@ -187,15 +187,15 @@ export const getErc20Data = (
         .map(toDropdown)
         .map(toGroup('Wallet')),
       Remote.of([]),
-      includeExchangeAddress && hasExchangeAddress
-        ? exchangeAddress.map(toExchange).map(toGroup('Exchange'))
-        : Remote.of([]),
       includeCustodial
         ? selectors.components.simpleBuy
             .getSBBalances(state)
             .map<any, any>(prop('PAX'))
             .map(toCustodialDropdown)
             .map(toGroup('Custodial Wallet'))
+        : Remote.of([]),
+      includeExchangeAddress && hasExchangeAddress
+        ? exchangeAddress.map(toExchange).map(toGroup('Exchange'))
         : Remote.of([])
     ]).map(([b1, b2, b3, b4]) => ({
       // @ts-ignore

diff --git a/...ages/blockchain-wallet-v4-frontend/src/components/Form/SelectBoxXlmAddresses/selectors.ts b/...ages/blockchain-wallet-v4-frontend/src/components/Form/SelectBoxXlmAddresses/selectors.ts
@@ -76,15 +76,15 @@ export const getData = (
           .map(excluded)
           .map(toDropdown)
           .map(toGroup('Lockbox')),
-    includeExchangeAddress && hasExchangeAddress
-      ? exchangeAddress.map(toExchange).map(toGroup('Exchange'))
-      : Remote.of([]),
     includeCustodial
       ? selectors.components.simpleBuy
           .getSBBalances(state)
           .map<any, any>(prop('XLM'))
           .map(toCustodialDropdown)
           .map(toGroup('Custodial Wallet'))
+      : Remote.of([]),
+    includeExchangeAddress && hasExchangeAddress
+      ? exchangeAddress.map(toExchange).map(toGroup('Exchange'))
       : Remote.of([])
   ]).map(([b1, b2, b3, b4]) => ({
     // @ts-ignore

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Bch/SendBch/FirstStep/template.success.js b/packages/blockchain-wallet-v4-frontend/src/modals/Bch/SendBch/FirstStep/template.success.js
@@ -85,7 +85,7 @@ const FirstStep = props => {
 
   return (
     <Form onSubmit={handleSubmit}>
-      <FormGroup inline margin={'15px'}>
+      <FormGroup inline margin={'15px'} style={{ zIndex: 3 }}>
         <FormItem width={'40%'}>
           <FormLabel htmlFor='coin'>
             <FormattedMessage
@@ -283,7 +283,7 @@ const FirstStep = props => {
         <ErrorCartridge>
           <FormattedMessage
             id='modals.sendBch.firststep.fromcustody.withdrawal'
-            defaultMessage='Withdrawals from your custody wallet will be enabled soon.'
+            defaultMessage='Withdrawals from your Trading Wallet will be enabled soon.'
           />
         </ErrorCartridge>
       )}

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Btc/SendBtc/FirstStep/template.success.js b/packages/blockchain-wallet-v4-frontend/src/modals/Btc/SendBtc/FirstStep/template.success.js
@@ -123,7 +123,7 @@ const FirstStep = props => {
 
   return (
     <Form onSubmit={handleSubmit}>
-      <FormGroup inline margin={'15px'}>
+      <FormGroup inline margin={'15px'} style={{ zIndex: 3 }}>
         <FormItem width={'40%'}>
           <FormLabel htmlFor='coin'>
             <FormattedMessage
@@ -435,7 +435,7 @@ const FirstStep = props => {
         <ErrorCartridge>
           <FormattedMessage
             id='modals.sendbtc.firststep.fromcustody.withdrawal'
-            defaultMessage='Withdrawals from your custody wallet will be enabled soon.'
+            defaultMessage='Withdrawals from your Trading Wallet will be enabled soon.'
           />
         </ErrorCartridge>
       )}

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Eth/SendEth/FirstStep/template.success.js b/packages/blockchain-wallet-v4-frontend/src/modals/Eth/SendEth/FirstStep/template.success.js
@@ -95,7 +95,7 @@ const FirstStep = props => {
 
   return (
     <Form onSubmit={handleSubmit}>
-      <FormGroup inline margin={'15px'}>
+      <FormGroup inline margin={'15px'} style={{ zIndex: 3 }}>
         <FormItem width={'40%'}>
           <FormLabel HtmlFor='coin'>
             <FormattedMessage
@@ -318,7 +318,7 @@ const FirstStep = props => {
         <ErrorCartridge>
           <FormattedMessage
             id='modals.sendeth.firststep.fromcustoday.withdrawal'
-            defaultMessage='Withdrawals from your custody wallet will be enabled soon.'
+            defaultMessage='Withdrawals from your Trading Wallet will be enabled soon.'
           />
         </ErrorCartridge>
       )}

diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Xlm/SendXlm/FirstStep/template.success.js b/packages/blockchain-wallet-v4-frontend/src/modals/Xlm/SendXlm/FirstStep/template.success.js
@@ -98,7 +98,7 @@ const FirstStep = props => {
 
   return (
     <Form onSubmit={handleSubmit}>
-      <FormGroup inline margin={'15px'}>
+      <FormGroup inline margin={'15px'} style={{ zIndex: 3 }}>
         <FormItem width={'40%'}>
           <FormLabel htmlFor='coin'>
             <FormattedMessage
@@ -301,7 +301,7 @@ const FirstStep = props => {
             <ErrorCartridge>
               <FormattedMessage
                 id='modals.sendxlm.firststep.fromcustoday.withdrawal'
-                defaultMessage='Withdrawals from your custody wallet will be enabled soon.'
+                defaultMessage='Withdrawals from your Trading Wallet will be enabled soon.'
               />
             </ErrorCartridge>
           )}