Skip to content

Commit

Permalink
Merge pull request swaponline#4934 from swaponline/developmentBranch
Browse files Browse the repository at this point in the history
History: displayed invoices even if they disabled
  • Loading branch information
noxonsu authored Nov 26, 2021
2 parents ed9ad4f + b567410 commit 6161090
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 15 deletions.
3 changes: 1 addition & 2 deletions src/front/client/variables.css
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
--box-shadow: 0px 4px 16px rgba(0,0,0,0.08), 0px 1px 4px rgba(0,0,0,0.08);
--button-border-radius: 0.125rem;
--main-component-border-radius: 0.5rem;
--card-border-radius: 0.25rem;
}

[data-scheme="dark"] {
Expand All @@ -45,6 +46,4 @@
--color-inactive: #3c3c3c;

--box-shadow: 0px 4px 16px rgba(0, 0, 0, 0.49),0px 1px 4px rgba(13, 13, 13, 0.06);
--button-border-radius: 0.125rem;
--main-component-border-radius: 0.5rem;
}
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
flex-direction: column;
align-items: center;
font-size: 0.9rem;
border-radius: 0.4rem;
border-radius: var(--card-border-radius);
border: 1px solid var(--color-border);
transition: 0.2s;

Expand Down
2 changes: 1 addition & 1 deletion src/front/shared/pages/CreateWallet/CreateWallet.scss
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
border: 1px solid var(--color-border);
box-sizing: border-box;
box-shadow: 0px 2px 12px var(--color-pale);
border-radius: 4px;
border-radius: var(--card-border-radius);
padding: 10px;
list-style: none;
display: grid;
Expand Down
2 changes: 0 additions & 2 deletions src/front/shared/pages/CreateWallet/CreateWallet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { FormattedMessage, useIntl } from 'react-intl'
import { withRouter } from 'react-router-dom'
import { isMobile } from 'react-device-detect'
import reducers from 'redux/core/reducers'
import getCoinInfo from 'common/coins/getCoinInfo'
import TOKEN_STANDARDS from 'helpers/constants/TOKEN_STANDARDS'
import links from 'helpers/links'
import metamask from 'helpers/metamask'
Expand All @@ -22,7 +21,6 @@ import { constants, localStorage, user } from 'helpers'
import CloseIcon from 'components/ui/CloseIcon/CloseIcon'
import web3Icons from 'images'

const isWidgetBuild = config && config.isWidget
const noInternalWallet = (config?.opts?.ui?.disableInternalWallet) ? true : false

const CreateWallet = (props) => {
Expand Down
9 changes: 4 additions & 5 deletions src/front/shared/pages/History/History.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import React, { Component, Fragment } from 'react'
import { Component, Fragment } from 'react'
import { FormattedMessage, injectIntl } from 'react-intl'
import CSSModules from 'react-css-modules'
import { connect } from 'redaction'
import actions from 'redux/actions'
import Row from './Row/Row'
import styles from 'components/tables/Table/Table.scss'
import stylesHere from './History.scss'

import { externalConfig } from 'helpers'
import InfiniteScrollTable from 'components/tables/InfiniteScrollTable/InfiniteScrollTable'
import { FormattedMessage, injectIntl } from 'react-intl'
import ContentLoader from 'components/loaders/ContentLoader/ContentLoader'
import FilterForm from 'components/FilterForm/FilterForm'

import InvoicesList from 'pages/Invoices/InvoicesList'
import SwapsHistory from 'pages/History/SwapsHistory/SwapsHistory'

Expand Down Expand Up @@ -191,7 +190,7 @@ class History extends Component<any, any> {
}
</section>

<InvoicesList onlyTable />
{externalConfig.opts.invoiceEnabled && <InvoicesList onlyTable />}

{ swapHistory.length > 0 &&
<SwapsHistory orders={swapHistory.filter((item) => item.step >= 1)} />
Expand Down
4 changes: 0 additions & 4 deletions src/front/shared/pages/Invoices/InvoicesList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ const isWidgetBuild = config && config.isWidget
arbethData,
ghostData,
nextData,
multisigStatus,
activeFiat,
},
}) => {
Expand All @@ -44,7 +43,6 @@ const isWidgetBuild = config && config.isWidget
ghost: ghostData,
next: nextData,
},
multisigStatus,
activeFiat,
}
})
Expand Down Expand Up @@ -211,7 +209,6 @@ class InvoicesList extends PureComponent<any, any> {
{(items && items.length > 0) ? (
<Table rows={items} styleName="currencyHistory" rowRender={this.rowRender} />
) : (
//@ts-ignore
<ContentLoader rideSideContent empty inner />
)}
</div>
Expand Down Expand Up @@ -245,7 +242,6 @@ class InvoicesList extends PureComponent<any, any> {
{/* Right form holder */}
</div>
) : (
//@ts-ignore
<ContentLoader leftSideContent />
)}
</div>
Expand Down

0 comments on commit 6161090

Please sign in to comment.