diff --git a/src/components/OnboardingDialog.vue b/src/components/OnboardingDialog.vue index f3ecf615..ab2d177c 100644 --- a/src/components/OnboardingDialog.vue +++ b/src/components/OnboardingDialog.vue @@ -5,7 +5,7 @@

Welcome to Time Safari
- - Showcasing Gratitude & Magnifying Time + - Showcase Impact & Magnify Time

+ The feed underneath this pop-up shows the latest contributions, + some from people and some from projects. +

You can now log things that you've seen: @@ -23,14 +26,11 @@ - button to express your appreciation for... whatever -- maybe thanks for - showing you all these fascinating stories of - gratitude. + button to express your appreciation for... whatever.

-

- The feed underneath this pop-up shows the latest gifts that others have - recognized. Once someone registers you, you can log your appreciation, - too. +

+ Once someone registers you, you can log your + appreciation, too.

diff --git a/src/db/databaseUtil.ts b/src/db/databaseUtil.ts index 680326fb..ec537619 100644 --- a/src/db/databaseUtil.ts +++ b/src/db/databaseUtil.ts @@ -107,7 +107,6 @@ export async function retrieveSettingsForActiveAccount(): Promise { try { // Get default settings first const defaultSettings = await retrieveSettingsForDefaultAccount(); - // If no active DID, return defaults if (!defaultSettings.activeDid) { logConsoleAndDb( @@ -280,10 +279,8 @@ export function generateUpdateStatement( const params: unknown[] = []; Object.entries(model).forEach(([key, value]) => { - if (value !== undefined) { - setClauses.push(`${key} = ?`); - params.push(value); - } + setClauses.push(`${key} = ?`); + params.push(value ?? null); }); if (setClauses.length === 0) { diff --git a/src/libs/util.ts b/src/libs/util.ts index c29a5cbd..8a1e53ea 100644 --- a/src/libs/util.ts +++ b/src/libs/util.ts @@ -416,8 +416,10 @@ export function offerGiverDid( */ export const canFulfillOffer = ( veriClaim: GenericCredWrapper, + isRegistered: boolean, ) => { return ( + isRegistered && veriClaim.claimType === "Offer" && !!offerGiverDid(veriClaim as GenericCredWrapper) ); diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue index bc1c352a..f55a164e 100644 --- a/src/views/AccountViewView.vue +++ b/src/views/AccountViewView.vue @@ -1239,6 +1239,7 @@ export default class AccountViewView extends Vue { */ async initializeState() { let settings = await databaseUtil.retrieveSettingsForActiveAccount(); + console.log("settings", settings); if (USE_DEXIE_DB) { await db.open(); settings = await retrieveSettingsForActiveAccount(); diff --git a/src/views/ClaimView.vue b/src/views/ClaimView.vue index 0aeba0fa..cc83b612 100644 --- a/src/views/ClaimView.vue +++ b/src/views/ClaimView.vue @@ -206,7 +206,7 @@

+
@@ -1278,7 +1278,7 @@ export default class ProjectViewView extends Vue { claimType: "Offer", issuer: offer.offeredByDid, }; - return libsUtil.canFulfillOffer(offerRecord); + return libsUtil.canFulfillOffer(offerRecord, this.isRegistered); } onClickFulfillGiveToOffer(offer: OfferSummaryRecord) {