Skip to content

🎨 [Frontend] Enh: Preferred Wallet #7978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 26, 2025
Merged

🎨 [Frontend] Enh: Preferred Wallet #7978

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0ab503d
comments
odeimaiz Jun 25, 2025
b31555d
two options
odeimaiz Jun 25, 2025
219249e
minor
odeimaiz Jun 25, 2025
0573236
Merge branch 'master' into enh/default-wallet
odeimaiz Jun 25, 2025
2e5f054
Update Store.js
odeimaiz Jun 25, 2025
da46761
Merge branch 'master' into enh/default-wallet
mergify[bot] Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions services/static-webserver/client/source/class/osparc/store/Store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,10 +389,18 @@ qx.Class.define("osparc.store.Store", {
const preferenceWalletId = preferenceSettings.getPreferredWalletId();
if (
(preferenceWalletId === null || osparc.desktop.credits.Utils.getWallet(preferenceWalletId) === null) &&
wallets.length === 1
wallets.length
) {
// If there is only one wallet available, make it default
preferenceSettings.requestChangePreferredWalletId(wallets[0].getWalletId());
// If there is no default wallet set in preferences or the default wallet is not available anymore:
const myGroupId = osparc.auth.Data.getInstance().getGroupId();
const myWallet = wallets.filter(wallet => wallet.getOwner() === myGroupId);
if (myWallet) {
// select the personal wallet if it exists
preferenceSettings.requestChangePreferredWalletId(myWallet.getWalletId());
} else {
// otherwise select the first wallet available
preferenceSettings.requestChangePreferredWalletId(wallets[0].getWalletId());
}
} else if (preferenceWalletId) {
const walletFound = wallets.find(wallet => wallet.getWalletId() === preferenceWalletId);
if (walletFound) {
Expand Down
Loading