From e1b50217224d8e4b3a91c7827deb7399b3c47558 Mon Sep 17 00:00:00 2001 From: fabric-8 Date: Wed, 3 Apr 2024 00:50:59 +0100 Subject: [PATCH 1/3] chore: Add wallet user survey, adjust styling --- config/wallet-config.json | 13 +++++- .../components/in-app-message-item.tsx | 40 +++++++++---------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/config/wallet-config.json b/config/wallet-config.json index 3e8cd0241b9..3f563beb127 100644 --- a/config/wallet-config.json +++ b/config/wallet-config.json @@ -1,7 +1,18 @@ { "$schema": "./wallet-config.schema.json", "messages": { - "global": [] + "global": [ + { + "chainTarget": "all", + "dismissible": true, + "id": "user-survey-announcement", + "publishedAt": "2024-04-03T12:55:46", + "text": "We want to hear what you think about using Leather.", + "learnMoreText": "Take our user survey →", + "learnMoreUrl":"https://blocksurvey.io/leather-wallet-user-survey-YWvSDeY2RU2mBtmuG2sbwA", + "purpose": "info" + } + ] }, "activeFiatProviders": { "coinbase": { diff --git a/src/app/features/hiro-messages/components/in-app-message-item.tsx b/src/app/features/hiro-messages/components/in-app-message-item.tsx index b68c1faaa95..c21d70cc047 100644 --- a/src/app/features/hiro-messages/components/in-app-message-item.tsx +++ b/src/app/features/hiro-messages/components/in-app-message-item.tsx @@ -11,18 +11,16 @@ export function HiroMessageItem(props: HiroMessageItemProps) { props; return ( - - + + {dismissible && ( onDismiss(id)} > @@ -34,35 +32,35 @@ export function HiroMessageItem(props: HiroMessageItemProps) { )} - + {title && ( {title} )} {text} + {learnMoreUrl && ( + + {learnMoreText ? learnMoreText : 'Learn more →'} + + )} - {learnMoreUrl && ( - - {learnMoreText ? learnMoreText : 'Learn more ↗'} - - )} - ); + ); } From 28a1dfb3b4bb17341be216671291c8aab61e04fe Mon Sep 17 00:00:00 2001 From: fabric-8 Date: Wed, 3 Apr 2024 01:12:32 +0100 Subject: [PATCH 2/3] chore: fmt --- .../hiro-messages/components/in-app-message-item.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/features/hiro-messages/components/in-app-message-item.tsx b/src/app/features/hiro-messages/components/in-app-message-item.tsx index c21d70cc047..e113b3d6d93 100644 --- a/src/app/features/hiro-messages/components/in-app-message-item.tsx +++ b/src/app/features/hiro-messages/components/in-app-message-item.tsx @@ -12,7 +12,13 @@ export function HiroMessageItem(props: HiroMessageItemProps) { return ( - + {dismissible && ( - ); + ); } From f389ecc962e4b0d84a25860e0c0918e132bdc432 Mon Sep 17 00:00:00 2001 From: kyranjamie Date: Wed, 3 Apr 2024 11:51:05 +0200 Subject: [PATCH 3/3] fix: only show messages on homepage --- config/wallet-config.json | 4 ++-- src/app/features/hiro-messages/in-app-messages.tsx | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/wallet-config.json b/config/wallet-config.json index 3f563beb127..5910eca4e49 100644 --- a/config/wallet-config.json +++ b/config/wallet-config.json @@ -7,9 +7,9 @@ "dismissible": true, "id": "user-survey-announcement", "publishedAt": "2024-04-03T12:55:46", - "text": "We want to hear what you think about using Leather.", + "text": "We want to hear what you think about Leather.", "learnMoreText": "Take our user survey →", - "learnMoreUrl":"https://blocksurvey.io/leather-wallet-user-survey-YWvSDeY2RU2mBtmuG2sbwA", + "learnMoreUrl": "https://blocksurvey.io/leather-wallet-user-survey-YWvSDeY2RU2mBtmuG2sbwA", "purpose": "info" } ] diff --git a/src/app/features/hiro-messages/in-app-messages.tsx b/src/app/features/hiro-messages/in-app-messages.tsx index 3a74216854e..e3c41207dda 100644 --- a/src/app/features/hiro-messages/in-app-messages.tsx +++ b/src/app/features/hiro-messages/in-app-messages.tsx @@ -1,5 +1,9 @@ +import { useLocation } from 'react-router-dom'; + import { Flex, FlexProps } from 'leather-styles/jsx'; +import { RouteUrls } from '@shared/route-urls'; + import { useRemoteLeatherMessages } from '@app/query/common/remote-config/remote-config.query'; import { useCurrentNetworkState } from '@app/store/networks/networks.hooks'; import { useDismissMessage } from '@app/store/settings/settings.actions'; @@ -7,15 +11,15 @@ import { useDismissedMessageIds } from '@app/store/settings/settings.selectors'; import { HiroMessageItem } from './components/in-app-message-item'; -// See wallet-config.md for instructions on testing InAppMessages export function InAppMessages(props: FlexProps) { + const location = useLocation(); const messages = useRemoteLeatherMessages(); const { mode } = useCurrentNetworkState(); const dismissMessage = useDismissMessage(); const dismissedIds = useDismissedMessageIds(); - if (messages.length === 0) return null; + if (location.pathname !== RouteUrls.Home || messages.length === 0) return null; const firstMessage = messages.filter(msg => !dismissedIds.includes(msg.id))[0];