Skip to content
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

Rename "Isolated" app permission to "Sub-wallet" #982

Merged
merged 6 commits into from
Jan 17, 2025
Merged

Rename "Isolated" app permission to "Sub-wallet" #982

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6883e1c
Rename "Isolated" app permission to "Sub-wallet"
MoritzKa Jan 13, 2025
5a7409e
chore: undo comment
rolznz Jan 17, 2025
04599cd
Merge remote-tracking branch 'origin/master' into Rename-Isolated-con…
rolznz Jan 17, 2025
5a69139
chore: more renaming of isolated app to sub-wallet
rolznz Jan 17, 2025
030f035
Merge remote-tracking branch 'origin/master' into Rename-Isolated-con…
rolznz Jan 17, 2025
4f39886
Merge remote-tracking branch 'origin/master' into Rename-Isolated-con…
rolznz Jan 17, 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
2 changes: 1 addition & 1 deletion apps/apps_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func NewAppsService(db *gorm.DB, eventPublisher events.EventPublisher, keys keys
func (svc *appsService) CreateApp(name string, pubkey string, maxAmountSat uint64, budgetRenewal string, expiresAt *time.Time, scopes []string, isolated bool, metadata map[string]interface{}) (*db.App, string, error) {
if isolated && (slices.Contains(scopes, constants.SIGN_MESSAGE_SCOPE)) {
// cannot sign messages because the isolated app is a custodial subaccount
return nil, "", errors.New("isolated app cannot have sign_message scope")
return nil, "", errors.New("Sub-wallet app connection cannot have sign_message scope")
}

var pairingPublicKey string
Expand Down
2 changes: 1 addition & 1 deletion db/migrations/202407201604_transactions_indexes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
// - Adds indexes that should speed up queries related to transactions
// - (basic indexes)
// - index for budget query
// - index for isolated balance queries
// - index for isolated/sub-wallet balance queries
// - index for list_transactions / lookup transaciton queries

var _202407201604_transactions_indexes = &gormigrate.Migration{
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Scopes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const scopeGroupIconMap: ScopeGroupIconMap = {
const scopeGroupTitle: Record<ScopeGroup, string> = {
full_access: "Full Access",
read_only: "Read Only",
isolated: "Isolated",
isolated: "Sub-wallet",
custom: "Custom",
};

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/screens/apps/AppCreated.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function AppCreatedInternal() {
</li>
{app?.isolated && (
<li>
Optional: Increase isolated balance (
Optional: Increase sub-wallet balance (
{new Intl.NumberFormat().format(Math.floor(app.balance / 1000))}{" "}
sats){" "}
<IsolatedAppTopupDialog appPubkey={app.appPubkey}>
Expand Down
Loading