Compare commits
6 Commits
019b8d3a9b
...
fbc06a407b
Author | SHA1 | Date |
---|---|---|
Sean | fbc06a407b | |
Sean | 64b38e7abc | |
Sean | a7b9274ddd | |
Sean Darcy | 3248e03924 | |
Sean Darcy | 165c140588 | |
Sean Darcy | c44a3666f3 |
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "oxen-electron-wallet",
|
"name": "oxen-electron-wallet",
|
||||||
"version": "1.7.2",
|
"version": "1.8.0",
|
||||||
"description": "Modern GUI interface for Oxen Currency",
|
"description": "Modern GUI interface for Oxen Currency",
|
||||||
"productName": "Oxen Electron Wallet",
|
"productName": "Oxen Electron Wallet",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
|
@ -72,13 +72,20 @@ export default {
|
||||||
node.contributors.find(
|
node.contributors.find(
|
||||||
c => c.address === this.our_address && c.amount > 0
|
c => c.address === this.our_address && c.amount > 0
|
||||||
);
|
);
|
||||||
return nodes.filter(getOurContribution).map(n => {
|
return nodes
|
||||||
const ourContribution = getOurContribution(n);
|
.filter(getOurContribution)
|
||||||
return {
|
.sort((a, b) => {
|
||||||
...n,
|
if (a.service_node_pubkey < b.service_node_pubkey) return -1;
|
||||||
ourContributionAmount: ourContribution.amount
|
if (a.service_node_pubkey > b.service_node_pubkey) return 1;
|
||||||
};
|
return 0;
|
||||||
});
|
})
|
||||||
|
.map(n => {
|
||||||
|
const ourContribution = getOurContribution(n);
|
||||||
|
return {
|
||||||
|
...n,
|
||||||
|
ourContributionAmount: ourContribution.amount
|
||||||
|
};
|
||||||
|
});
|
||||||
},
|
},
|
||||||
fetching: state => state.gateway.daemon.service_nodes.fetching
|
fetching: state => state.gateway.daemon.service_nodes.fetching
|
||||||
}),
|
}),
|
||||||
|
|
|
@ -31,9 +31,13 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="hr-separator" />
|
<div class="hr-separator" />
|
||||||
<!-- Hardware wallets -->
|
<!-- Hardware wallets -->
|
||||||
<q-list-header v-if="hardware_wallets.length">{{
|
<q-list-header v-if="hardware_wallets.length">
|
||||||
$t("strings.hardwareWallets")
|
<div class="header row justify-between items-center">
|
||||||
}}</q-list-header>
|
<div class="header-title">
|
||||||
|
{{ $t("strings.hardwareWallets") }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</q-list-header>
|
||||||
<WalletListItem
|
<WalletListItem
|
||||||
v-for="wallet in hardware_wallets"
|
v-for="wallet in hardware_wallets"
|
||||||
:key="`${wallet.address}-${wallet.name}`"
|
:key="`${wallet.address}-${wallet.name}`"
|
||||||
|
@ -41,9 +45,13 @@
|
||||||
:open-wallet="openWallet"
|
:open-wallet="openWallet"
|
||||||
/>
|
/>
|
||||||
<!-- Regular wallets -->
|
<!-- Regular wallets -->
|
||||||
<q-list-header v-if="hardware_wallets.length">{{
|
<q-list-header v-if="hardware_wallets.length">
|
||||||
$t("strings.regularWallets")
|
<div class="header row justify-between items-center">
|
||||||
}}</q-list-header>
|
<div class="header-title">
|
||||||
|
{{ $t("strings.regularWallets") }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</q-list-header>
|
||||||
<WalletListItem
|
<WalletListItem
|
||||||
v-for="wallet in regular_wallets"
|
v-for="wallet in regular_wallets"
|
||||||
:key="`${wallet.address}-${wallet.name}`"
|
:key="`${wallet.address}-${wallet.name}`"
|
||||||
|
|
Loading…
Reference in New Issue