From 5cec0cf507ade0368441ef480e92628d405aac28 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Mon, 28 Jan 2019 15:40:32 -0500 Subject: [PATCH 1/5] v0.28.0-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 99a791adb83..233d2383a7b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.27.1", + "version": "0.28.0-rc.1", "description": "A browser for the LBRY network, a digital marketplace controlled by its users.", "keywords": [ "lbry" From 7ffeef107419971df11738886cd760d58288e2d7 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Thu, 31 Jan 2019 16:26:14 -0500 Subject: [PATCH 2/5] v0.28.0-rc.2 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4547c1df746..d8b74b19b06 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.28.0-rc.1", + "version": "0.28.0-rc.2", "description": "A browser for the LBRY network, a digital marketplace controlled by its users.", "keywords": [ "lbry" @@ -140,4 +140,4 @@ "lbrynetDaemonDir": "static/daemon", "lbrynetDaemonFileName": "lbrynet" } -} \ No newline at end of file +} From 9b2ce9f5572db4eafbbf7662090ab291565c4abd Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Fri, 1 Feb 2019 01:43:00 -0500 Subject: [PATCH 3/5] fix: claimed reward messaging Make it clear that the rewards history may not be part of the current wallet. Some users were confused when not backing up or using multiple wallets. --- src/renderer/component/rewardListClaimed/view.jsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/renderer/component/rewardListClaimed/view.jsx b/src/renderer/component/rewardListClaimed/view.jsx index 245581242a1..8af573918be 100644 --- a/src/renderer/component/rewardListClaimed/view.jsx +++ b/src/renderer/component/rewardListClaimed/view.jsx @@ -26,6 +26,12 @@ const RewardListClaimed = (props: Props) => {

Claimed Rewards

+ +

+ {__( + 'Reward history is tied to your email. In case of lost or multiple wallets, balance may differ from amounts claimed' + )}. +

From 1ec0c588a233f604c116a0631cb09627acc11718 Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Fri, 1 Feb 2019 01:43:23 -0500 Subject: [PATCH 4/5] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c285b164311..9b9d037fbb0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Less intrusive first run flow ([#2210](https://github.com/lbryio/lbry-desktop/pull/2210)) - Add icon for your own publishes on cards/tiles ([#2249](https://github.com/lbryio/lbry-desktop/pull/2249)) +- Improved Claimed Reward messaging ([#2253](https://github.com/lbryio/lbry-desktop/pull/2253)) ### Fixed From f096918c934a1d741035f6493d2a6d58b7608fea Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Fri, 1 Feb 2019 10:56:54 -0500 Subject: [PATCH 5/5] Update view.jsx --- src/renderer/component/rewardListClaimed/view.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/component/rewardListClaimed/view.jsx b/src/renderer/component/rewardListClaimed/view.jsx index 8af573918be..0a9b44d8732 100644 --- a/src/renderer/component/rewardListClaimed/view.jsx +++ b/src/renderer/component/rewardListClaimed/view.jsx @@ -29,7 +29,7 @@ const RewardListClaimed = (props: Props) => {

{__( - 'Reward history is tied to your email. In case of lost or multiple wallets, balance may differ from amounts claimed' + 'Reward history is tied to your email. In case of lost or multiple wallets, your balance may differ from the amounts claimed' )}.