LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

exclude internal transfers on wallet txo list (#3998)

Browse source
This commit is contained in:
jessopb 2020-04-15 14:09:22 -04:00 committed by GitHub
parent 0bd1421a0e
commit 4cc2d00f19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -130,7 +130,7 @@
"imagesloaded": "^4.1.4", "imagesloaded": "^4.1.4",
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"lbry-format": "https://github.com/lbryio/lbry-format.git", "lbry-format": "https://github.com/lbryio/lbry-format.git",
"lbry-redux": "lbryio/lbry-redux#1bd142caa16e279d4cb446382291feae9226d8bd", "lbry-redux": "lbryio/lbry-redux#387aa8d0a8e9383f4f27c991bfd9c37fdb14a779",
"lbryinc": "lbryio/lbryinc#12aefaa14343d2f3eac01f2683701f58e53f1848", "lbryinc": "lbryio/lbryinc#12aefaa14343d2f3eac01f2683701f58e53f1848",
"lint-staged": "^7.0.2", "lint-staged": "^7.0.2",
"localforage": "^1.7.1", "localforage": "^1.7.1",

11
ui/component/txoList/view.jsx
View file

@ -31,9 +31,9 @@ function TxoList(props: Props) {
const urlParams = new URLSearchParams(search); const urlParams = new URLSearchParams(search);
const page = urlParams.get(TXO.PAGE) || String(1); const page = urlParams.get(TXO.PAGE) || String(1);
const pageSize = urlParams.get(TXO.PAGE_SIZE) || String(TXO.PAGE_SIZE_DEFAULT); const pageSize = urlParams.get(TXO.PAGE_SIZE) || String(TXO.PAGE_SIZE_DEFAULT);
const type = urlParams.get(TXO.TYPE); const type = urlParams.get(TXO.TYPE) || TXO.ALL;
const subtype = urlParams.get(TXO.SUB_TYPE); const subtype = urlParams.get(TXO.SUB_TYPE);
const active = urlParams.get(TXO.ACTIVE) || TXO.ACTIVE; const active = urlParams.get(TXO.ACTIVE) || TXO.ALL;
const currentUrlParams = { const currentUrlParams = {
page, page,
@ -45,7 +45,9 @@ function TxoList(props: Props) {
const params = {}; const params = {};
if (currentUrlParams.type) { if (currentUrlParams.type) {
if (currentUrlParams.type === TXO.SENT) { if (currentUrlParams.type === TXO.ALL) {
params[TXO.EXCLUDE_INTERNAL_TRANSFERS] = true;
} else if (currentUrlParams.type === TXO.SENT) {
params[TXO.IS_MY_INPUT] = true; params[TXO.IS_MY_INPUT] = true;
params[TXO.IS_NOT_MY_OUTPUT] = true; params[TXO.IS_NOT_MY_OUTPUT] = true;
if (currentUrlParams.subtype === TXO.TIP) { if (currentUrlParams.subtype === TXO.TIP) {
@ -64,8 +66,9 @@ function TxoList(props: Props) {
params[TXO.TX_TYPE] = TXO.SUPPORT; params[TXO.TX_TYPE] = TXO.SUPPORT;
} else if (currentUrlParams.subtype === TXO.PURCHASE) { } else if (currentUrlParams.subtype === TXO.PURCHASE) {
params[TXO.TX_TYPE] = TXO.PURCHASE; params[TXO.TX_TYPE] = TXO.PURCHASE;
} else if (currentUrlParams.subtype === TXO.PURCHASE) { } else if (currentUrlParams.subtype === TXO.PAYMENT) {
params[TXO.TX_TYPE] = TXO.OTHER; params[TXO.TX_TYPE] = TXO.OTHER;
params[TXO.EXCLUDE_INTERNAL_TRANSFERS] = true;
} else { } else {
params[TXO.TX_TYPE] = [TXO.OTHER, TXO.PURCHASE, TXO.SUPPORT]; params[TXO.TX_TYPE] = [TXO.OTHER, TXO.PURCHASE, TXO.SUPPORT];
} }

4
yarn.lock
View file

@ -6139,9 +6139,9 @@ lazy-val@^1.0.4:
yargs "^13.2.2" yargs "^13.2.2"
zstd-codec "^0.1.1" zstd-codec "^0.1.1"
lbry-redux@lbryio/lbry-redux#1bd142caa16e279d4cb446382291feae9226d8bd: lbry-redux@lbryio/lbry-redux#387aa8d0a8e9383f4f27c991bfd9c37fdb14a779:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/1bd142caa16e279d4cb446382291feae9226d8bd" resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/387aa8d0a8e9383f4f27c991bfd9c37fdb14a779"
dependencies: dependencies:
proxy-polyfill "0.1.6" proxy-polyfill "0.1.6"
reselect "^3.0.0" reselect "^3.0.0"