diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d0a7df..52f6075 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.3.14] +### Added +- Clearer give-confirmation screen +- BX currency https://thebx.medium.com/ +- Deselection of project on gifted details page +### Fixed +- Don't show registration pop-up for a new contact that is registered ### Changed in DB or environment - Nothing diff --git a/package-lock.json b/package-lock.json index 80d8e59..4033158 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "TimeSafari", - "version": "0.3.14-beta", + "version": "0.3.15-beta", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "TimeSafari", - "version": "0.3.14-beta", + "version": "0.3.15-beta", "dependencies": { "@dicebear/collection": "^5.4.1", "@dicebear/core": "^5.4.1", diff --git a/package.json b/package.json index 3a91ea7..4e49326 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "TimeSafari", - "version": "0.3.14-beta", + "version": "0.3.15-beta", "scripts": { "dev": "vite", "serve": "vite preview", diff --git a/src/components/GiftedDialog.vue b/src/components/GiftedDialog.vue index 9dd8f01..183ac97 100644 --- a/src/components/GiftedDialog.vue +++ b/src/components/GiftedDialog.vue @@ -54,7 +54,7 @@ }" class="text-blue-500" > - Photo, ... + Photo & Details ... diff --git a/src/libs/util.ts b/src/libs/util.ts index 0bd8016..cdecf31 100644 --- a/src/libs/util.ts +++ b/src/libs/util.ts @@ -17,6 +17,7 @@ export const PRIVACY_MESSAGE = /* eslint-disable prettier/prettier */ export const UNIT_SHORT: Record = { + "BX": "BX", "BTC": "BTC", "ETH": "ETH", "HUR": "Hours", @@ -26,6 +27,7 @@ export const UNIT_SHORT: Record = { /* eslint-disable prettier/prettier */ export const UNIT_LONG: Record = { + "BX": "Buxbe", "BTC": "Bitcoin", "ETH": "Ethereum", "HUR": "hours", @@ -70,7 +72,7 @@ export const isGlobalUri = (uri: string) => { return uri && uri.match(new RegExp(/^[A-Za-z][A-Za-z0-9+.-]+:/)); }; -export const giveIsConfirmable = (veriClaim: GenericCredWrapper) => { +export const isGiveAction = (veriClaim: GenericCredWrapper) => { return veriClaim.claimType === "GiveAction"; }; @@ -91,7 +93,7 @@ export const isGiveRecordTheUserCanConfirm = ( confirmerIdList: string[] = [], ) => { return ( - giveIsConfirmable(veriClaim) && + isGiveAction(veriClaim) && !confirmerIdList.includes(activeDid) && veriClaim.issuer !== activeDid && !containsHiddenDid(veriClaim.claim) diff --git a/src/main.ts b/src/main.ts index edf1f0a..595a80c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -11,10 +11,12 @@ import "./assets/styles/tailwind.css"; import { library } from "@fortawesome/fontawesome-svg-core"; import { + faArrowDown, faArrowLeft, faArrowRight, faArrowRotateBackward, faArrowUpRightFromSquare, + faArrowUp, faBan, faBitcoinSign, faBurst, @@ -47,6 +49,7 @@ import { faGlobe, faHammer, faHand, + faHandHoldingDollar, faHandHoldingHeart, faHouseChimney, faImagePortrait, @@ -66,6 +69,7 @@ import { faRotate, faShareNodes, faSpinner, + faSquare, faSquareCaretDown, faSquareCaretUp, faSquarePlus, @@ -77,10 +81,12 @@ import { } from "@fortawesome/free-solid-svg-icons"; library.add( + faArrowDown, faArrowLeft, faArrowRight, faArrowRotateBackward, faArrowUpRightFromSquare, + faArrowUp, faBan, faBitcoinSign, faBurst, @@ -113,6 +119,7 @@ library.add( faGlobe, faHammer, faHand, + faHandHoldingDollar, faHandHoldingHeart, faHouseChimney, faImagePortrait, @@ -132,6 +139,7 @@ library.add( faRotate, faShareNodes, faSpinner, + faSquare, faSquareCaretDown, faSquareCaretUp, faSquarePlus, diff --git a/src/router/index.ts b/src/router/index.ts index 1189599..c44739d 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -43,14 +43,19 @@ const routes: Array = [ name: "confirm-contact", component: () => import("../views/ConfirmContactView.vue"), }, + { + path: "/confirm-gift/:id?", + name: "confirm-gift", + component: () => import("@/views/ConfirmGiftView.vue"), + }, { path: "/contact-amounts", name: "contact-amounts", component: () => import("../views/ContactAmountsView.vue"), }, { - path: "/contact-gives", - name: "contact-gives", + path: "/contact-gift", + name: "contact-gift", component: () => import("../views/ContactGiftingView.vue"), }, { diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue index 5485f52..a1e1de2 100644 --- a/src/views/AccountViewView.vue +++ b/src/views/AccountViewView.vue @@ -57,7 +57,7 @@

{{ givenName }} - +

@@ -103,9 +103,9 @@
- People {{ profileImageUrl ? "without your image" : "" }} see this: + People {{ profileImageUrl ? "without your image" : "" }} see this
- (if you've let them see your activity) + (if you've let them see your activity):
Copied
+ +
+ + Activity + +
@@ -387,7 +393,7 @@ > Contacts Display - Show amounts given + Show hours given & received
diff --git a/src/views/ClaimView.vue b/src/views/ClaimView.vue index 8b8e5a0..22c04a5 100644 --- a/src/views/ClaimView.vue +++ b/src/views/ClaimView.vue @@ -10,7 +10,7 @@ @click="$router.go(-1)" class="text-lg text-center px-2 py-1 absolute -left-2 -top-1" > - + Verifiable Claim Details @@ -35,16 +35,16 @@ " class="ml-2 mr-2" > - + Copied ID
- + {{ veriClaim.claim?.description }}
- + {{ veriClaim.issuer }} Copied DID
- + {{ veriClaim.issuedAt?.replace(/T/, " ").replace(/Z/, " UTC") }}
@@ -121,7 +121,7 @@ -
+
+ + + Confirmation Details... + + +
@@ -90,20 +90,27 @@ {{ contact.name || AppString.NO_CONTACT_NAME }} + + +
{{ contact.did }} @@ -118,14 +125,6 @@ > - - - Copied DID
@@ -680,7 +679,7 @@ export default class ContactsView extends Vue { nextPubKeyHashB64: payload.own.nextPublicEncKeyHash, profileImageUrl: payload.own.profileImageUrl, publicKeyBase64: payload.own.publicEncKey, - isRegistered: payload.own.isRegistered, + registered: payload.own.registered, } as Contact); } } diff --git a/src/views/DiscoverView.vue b/src/views/DiscoverView.vue index ae26205..50f6e74 100644 --- a/src/views/DiscoverView.vue +++ b/src/views/DiscoverView.vue @@ -74,7 +74,7 @@