From d84f7f8618aaa27f84c3e29bbfbec26c09daf4c9 Mon Sep 17 00:00:00 2001 From: Philip Welber Date: Mon, 11 Jun 2018 09:18:49 -0400 Subject: [PATCH] fix(Coinify): do not show trade in pending table if it is recurring --- packages/blockchain-info-components/src/Tables/TableRow.js | 5 ++--- .../RecurringOrderHistoryTable/RecurringOrder/index.js | 2 +- .../CoinifyCheckout/Content/OrderHistory/template.success.js | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/blockchain-info-components/src/Tables/TableRow.js b/packages/blockchain-info-components/src/Tables/TableRow.js index b18003462e3..1ab86817716 100644 --- 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 }) => ( {children} diff --git a/packages/blockchain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/OrderHistory/RecurringOrderHistoryTable/RecurringOrder/index.js b/packages/blockchain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/OrderHistory/RecurringOrderHistoryTable/RecurringOrder/index.js index 07ec987afa3..e157bea15e5 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/OrderHistory/RecurringOrderHistoryTable/RecurringOrder/index.js +++ b/packages/blockchain-wallet-v4-frontend/src/scenes/BuySell/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/packages/blockchain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/OrderHistory/template.success.js b/packages/blockchain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/OrderHistory/template.success.js index e7853b855ba..078c5b03072 100644 --- a/packages/blockchain-wallet-v4-frontend/src/scenes/BuySell/CoinifyCheckout/Content/OrderHistory/template.success.js +++ b/packages/blockchain-wallet-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