frontend: update 'My portfolio' with lightning account #2703
Conversation
strmci
force-pushed
the
lightning_to_my_portfolio
branch
2 times, most recently
from
4a1bd10
to
3db7734
Compare
strmci
force-pushed
the
lightning_to_my_portfolio
branch
2 times, most recently
from
1dd6252
to
571341f
Compare
strmci
force-pushed
the
lightning_to_my_portfolio
branch
from
571341f
to
7e6de8d
Compare
|
Here I found the keystore (c6d..) repeated twice, during my test
|
| const hasLightningFromOtherKeystore = ( | ||
| lightningConfig.accounts.length !== 0 | ||
| && ( | ||
| accountsByKeystore.length === 0 |
There was a problem hiding this comment.
I think that you can avoid checking the length, it should be handled by the some condition anyway, right?
There was a problem hiding this comment.
Yes, this check is redundant here, removed.
| ) | ||
| ); | ||
|
|
||
| const showTotalCoins = accountsByKeystore.length > 1 || (hasLightningFromOtherKeystore && accountsByKeystore.length === 1); |
There was a problem hiding this comment.
Nit: what about doing smth like
let keystores = accountsByKeystore.length; if (hasLightningFromOtherKeystore) { keystores += 1; }
and check for keystores > 1 below?
I feel like it would be more readable
There was a problem hiding this comment.
I updated this to use keystores
strmci
force-pushed
the
lightning_to_my_portfolio
branch
2 times, most recently
from
547408d
to
2e0ac00
Compare
|
@Beerosagos
Also, this should be resolved now. PTAL |
|
There was some refactoring on master, maybe consider merge master->staging-ln before this? |
Yes, I agree 👍 |
|
merge master > staging-ln PR: #2782 |
strmci
force-pushed
the
lightning_to_my_portfolio
branch
2 times, most recently
from
6396687
to
e11b223
Compare
This commit adds functionality to display Lightning account in 'My portfolio' in cases where it is active but not associated with a connected or remembered wallet, or when all mainnet accounts in the connected wallet are disabled. The total coins table is updated to include the Lightning account, and the Lightning configuration now also contains the keystore name.
strmci
force-pushed
the
lightning_to_my_portfolio
branch
from
e11b223
to
3aed2f7
Compare
|
@Beerosagos rebased |
There was a problem hiding this comment.
Left a couple comments.
Also, I noticed that if the only active account is the lightning one, then the chart in the account summary is empty. Not sure what we want to do with this, the easier is probably to hide it, at least for now. wdyt @thisconnect ?
| return nil, err | ||
| } | ||
| totalCoinsBalances[coin.CodeBTC] = lightningBalance.Available().BigInt() | ||
| sortedCoins = append(sortedCoins, coin.CodeBTC) |
There was a problem hiding this comment.
This potentially breaks the coin sorting, which should be derived by the accounts sorting. The LN balance handling should be done together with the BTC accounts balance
| @@ -26,6 +26,8 @@ type LightningAccountConfig struct { | |||
| Mnemonic string `json:"mnemonic"` | |||
| // RootFingerprint is fingerprint of the keystore that generated the entropy. | |||
| RootFingerprint jsonp.HexBytes `json:"rootFingerprint"` | |||
| // KeyStoreName is name of the keystore. | |||
There was a problem hiding this comment.
I realized that storing the keystore name could lead to issues when the device name is changed by the user.
I didn't look deeply into this, but I think that the proper way of doing it could be to get the persisted keystore info and retrieve the name there (see backend.Config().AccountsConfig()), but we may need to actively persist the current keystore when enabling the LN account).
cc @benma wdyt?
This commit adds functionality to display lightning account in 'My portfolio' in cases where it is active but not associated with a connected or remembered wallet, or when all mainnet accounts in the connected wallet are disabled.
The total coins table is updated to include the Lightning account, and the Lightning configuration now also contains the keystore name.