From 33c04631ea1b459924f8c2dfa15bafe491d88fbd Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 20 Sep 2018 14:34:55 -0700 Subject: [PATCH] Comments on Confluence doc --- scripts/system/commerce/wallet.js | 23 ++++++--------------- scripts/system/marketplaces/marketplaces.js | 8 +++---- scripts/system/pal.js | 4 ++-- scripts/system/tablet-goto.js | 11 +++++----- 4 files changed, 18 insertions(+), 28 deletions(-) diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js index c903080f62..1fce45bb6f 100644 --- a/scripts/system/commerce/wallet.js +++ b/scripts/system/commerce/wallet.js @@ -543,37 +543,26 @@ function notificationPollCallback(historyArray) { var message; if (!ui.notificationInitialCallbackMade) { message = "You have " + notificationCount + " unread wallet " + - "notification" + (notificationCount === 1 ? "" : "s") + "! Open WALLET to see all activity."; + "transaction" + (notificationCount === 1 ? "" : "s") + ". Open WALLET to see all activity."; ui.notificationDisplayBanner(message); } else { - var currentItemName, senderName; for (i = 0; i < someoneElsePurchasedArray.length; i++) { - currentItemName = (someoneElsePurchasedArray[i].message).match('(.*)')[1]; - message = "Someone purchased your item \"" + currentItemName + "\" from the Marketplace! " + + message = '"' + (someoneElsePurchasedArray[i].message) + '" ' + "Open WALLET to see all activity."; ui.notificationDisplayBanner(message); } for (i = 0; i < proofIssuedArray.length; i++) { - currentItemName = (proofIssuedArray[i].message).match('(.*)')[1]; - message = "You have been issued a proof for your Marketplace item \"" + currentItemName + "\"! " + + message = '"' + (proofIssuedArray[i].message) + '" ' + "Open WALLET to see all activity."; ui.notificationDisplayBanner(message); } for (i = 0; i < moneyReceivedArray.length; i++) { - senderName = moneyReceivedArray[i].sender_name; - if (senderName === "") { - senderName = "Someone"; - } - message = senderName + " sent you " + moneyReceivedArray[i].received_money + " HFC! " + + message = '"' + (moneyReceivedArray[i].message) + '" ' + "Open WALLET to see all activity."; ui.notificationDisplayBanner(message); } for (i = 0; i < giftReceivedArray.length; i++) { - senderName = giftReceivedArray[i].sender_name; - if (senderName === "") { - senderName = "Someone"; - } - message = senderName + " sent you a gift! " + + message = '"' + (giftReceivedArray[i].message) + '" ' + "Open WALLET to see all activity."; ui.notificationDisplayBanner(message); } @@ -602,7 +591,7 @@ function startup() { onClosed: walletClosed, onMessage: fromQml, notificationPollEndpoint: "/api/v1/commerce/history?per_page=10", - notificationPollTimeoutMs: 60000, + notificationPollTimeoutMs: 300000, notificationDataProcessPage: notificationDataProcessPage, notificationPollCallback: notificationPollCallback, notificationPollStopPaginatingConditionMet: isReturnedDataEmpty, diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js index 9bd3a9facf..d535884c94 100644 --- a/scripts/system/marketplaces/marketplaces.js +++ b/scripts/system/marketplaces/marketplaces.js @@ -1040,15 +1040,15 @@ function notificationPollCallback(updatesArray) { if (updatesArray.length > 0) { var message; if (!ui.notificationInitialCallbackMade) { - message = updatesArray.length + " of your purchased items have updates available! " + + message = updatesArray.length + " of your purchased items have updates available. " + "Open MARKET to update."; ui.notificationDisplayBanner(message); ui.notificationPollCaresAboutSince = true; } else { for (var i = 0; i < updatesArray.length; i++) { - message = "There's an update available for your version of \"" + - updatesArray[i].marketplace_item_name + "\"!" + + message = "Update available for \"" + + updatesArray[i].marketplace_item_name + "\"." + "Open MARKET to update."; ui.notificationDisplayBanner(message); } @@ -1077,7 +1077,7 @@ function startup() { onScreenChanged: onTabletScreenChanged, onMessage: onQmlMessageReceived, notificationPollEndpoint: "/api/v1/commerce/available_updates?per_page=10", - notificationPollTimeoutMs: 60000, + notificationPollTimeoutMs: 300000, notificationDataProcessPage: notificationDataProcessPage, notificationPollCallback: notificationPollCallback, notificationPollStopPaginatingConditionMet: isReturnedDataEmpty, diff --git a/scripts/system/pal.js b/scripts/system/pal.js index 02bf92dcfe..a2ebae1a33 100644 --- a/scripts/system/pal.js +++ b/scripts/system/pal.js @@ -846,7 +846,7 @@ function notificationPollCallback(connectionsArray) { if (!ui.isOpen && ui.notificationInitialCallbackMade) { message = user.username + " is available in " + - user.location.root.name + "! Open PEOPLE to join them."; + user.location.root.name + ". Open PEOPLE to join them."; ui.notificationDisplayBanner(message); } }); @@ -870,7 +870,7 @@ function notificationPollCallback(connectionsArray) { if (newOnlineUsers > 0 && !ui.notificationInitialCallbackMade) { message = newOnlineUsers + " of your connections " + - (newOnlineUsers === 1 ? "is" : "are") + " online! Open PEOPLE to join them."; + (newOnlineUsers === 1 ? "is" : "are") + " available online. Open PEOPLE to join them."; ui.notificationDisplayBanner(message); } } diff --git a/scripts/system/tablet-goto.js b/scripts/system/tablet-goto.js index fde558d728..22a9752db8 100644 --- a/scripts/system/tablet-goto.js +++ b/scripts/system/tablet-goto.js @@ -57,15 +57,15 @@ function notificationPollCallback(userStoriesArray) { if (shouldNotifyIndividually) { message = storedAnnouncements[key].username + " says something is happening in " + - storedAnnouncements[key].place_name + "! Open GOTO to join them."; + storedAnnouncements[key].place_name + ". Open GOTO to join them."; ui.notificationDisplayBanner(message); } } else if (story.audience === "for_feed") { storedFeaturedStories[story.id] = story; if (shouldNotifyIndividually) { - message = storedFeaturedStories[key].username + " has invited you to an event in " + - storedFeaturedStories[key].place_name + "! Open GOTO to join them."; + message = storedFeaturedStories[key].username + " invites you to an event in " + + storedFeaturedStories[key].place_name + ". Open GOTO to join them."; ui.notificationDisplayBanner(message); } } @@ -91,8 +91,9 @@ function notificationPollCallback(userStoriesArray) { ui.messagesWaiting(shouldShowDot && !ui.isOpen); if (totalStories > 0 && !ui.isOpen && !ui.notificationInitialCallbackMade) { - message = "You have " + totalStories + "event invitations pending! " + - "Open GOTO to see them."; + message = "There " + (totalStories === 1 ? "is " : "are ") + totalStories + "event" + + (totalStories === 1 ? "" : "s") + " to know about. " + + "Open GOTO to see " + (totalStories === 1 ? "it" : "them") + "."; ui.notificationDisplayBanner(message); } }