fix(Coinify): do not show trade in pending table if it is recurring

blockchain · Jun 11, 2018 · d84f7f8 · d84f7f8
1 parent bd70f60
commit d84f7f8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/packages/blockchain-info-components/src/Tables/TableRow.js b/packages/blockchain-info-components/src/Tables/TableRow.js
@@ -7,15 +7,14 @@ const Wrapper = styled.div`
   flex-direction: row;
   align-items: center;
   justify-content: flex-start;
-  padding: ${props => props.padding || '8px 15px'};
+  padding: 8px 15px;
   box-sizing: border-box;
   border-left: 1px solid ${props => props.theme['gray-2']};
   border-top: 1px solid ${props => props.theme['gray-2']};
   border-right: 1px solid ${props => props.theme['gray-2']};
-  border: ${props => props.border}
 `
 
-const TableRow = ({ children, border, padding }) => (
+const TableRow = ({ children }) => (
   <Wrapper border padding>
     {children}
   </Wrapper>

diff --git a/...l/CoinifyCheckout/Content/OrderHistory/RecurringOrderHistoryTable/RecurringOrder/index.js b/...l/CoinifyCheckout/Content/OrderHistory/RecurringOrderHistoryTable/RecurringOrder/index.js
@@ -13,7 +13,7 @@ import { TableCell, TableRow, Text, Link, Icon, Button } from 'blockchain-info-c
 const ToggleIcon = styled(Icon)`
   cursor: pointer;
   transform: rotate(-90deg);
-  transition: transform 0.5s;
+  transition: transform 0.3s;
   transform: ${props => props.toggled && 'rotate(0deg)'};
 `
 const Frequency = styled(Text)`

diff --git a/...t-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/OrderHistory/template.success.js b/...t-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/OrderHistory/template.success.js
@@ -23,7 +23,7 @@ const OrderHistoryContent = styled.div`
     margin-bottom: 20px;
   }
 `
-const isPending = (t) => t.state === 'processing' || t.state === 'awaiting_transfer_in'
+const isPending = (t) => (t.state === 'processing' || t.state === 'awaiting_transfer_in') && !t.tradeSubscriptionId
 const isCompleted = (t) => contains(t.state, ['completed', 'rejected', 'cancelled', 'expired'])
 const isPartOfSubscription = (t) => t.tradeSubscriptionId