Skip to content

Commit 3d95c9d

Browse files
stoodkevstoodkev
authored
Merge pull request #190 from stoodkev/steemitwallet
Port wallet features to SteemitWallet
2 parents ad2adb6 + ccc20dc commit 3d95c9d

14 files changed

+131
-92
lines changed

‎main.js

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ const steemit = (window.location.href.includes('steemit.com') || window.location
33
const busy = window.location.href.includes('busy.org');
44
const utopian = window.location.href.includes('utopian.io');
55
const steemMonsters = window.location.href.includes('steemmonsters.com');
6+
const steemitwallet= window.location.href.includes('steemitwallet.com');
67
console.log('Starting SteemPlus...');
78
var market = null;
89
var SBDperSteem = 0;
@@ -18,11 +19,11 @@ var offlineModeRetryCount = 0;
1819
let hasSKC=false;
1920

2021
let elementUsername = null;
21-
if (steemit) elementUsername = '.Header__userpic > span';
22+
if (steemit||steemitwallet) elementUsername = '.Header__userpic > span';
2223
else if (busy) elementUsername = '.Topnav__user';
2324

2425
if ($(elementUsername).length > 0) {
25-
if (steemit) user = $(elementUsername)[0].title; //Get username in offline mode
26+
if (steemit||steemitwallet) user = $(elementUsername)[0].title; //Get username in offline mode
2627
else if (busy) user = $(elementUsername)[0].href.replace('https://busy.org/@', ''); //Get username in offline mode
2728
}
2829
steem_keychain.requestHandshake(function(){
@@ -98,13 +99,13 @@ Promise.all([steem.api.getDynamicGlobalPropertiesAsync(), steem.api.getCurrentMe
9899
to: 'sm_batch',
99100
order: 'start'
100101
});
101-
if (delegation && (steemit || busy))
102+
if (delegation && (steemit || steemitwallet||busy))
102103
chrome.runtime.sendMessage({
103104
token: token,
104105
to: 'delegation',
105106
order: 'notif',
106107
data: {
107-
steemit: steemit,
108+
steemit: steemit||steemitwallet,
108109
busy: busy,
109110
global: {
110111
totalSteem: totalSteem,
@@ -176,7 +177,7 @@ Promise.all([steem.api.getDynamicGlobalPropertiesAsync(), steem.api.getCurrentMe
176177
totalVestingShares: totalVests
177178
}
178179
});
179-
if (steemit && user_info_popover)
180+
if ((steemit || steemitwallet) && user_info_popover)
180181
chrome.runtime.sendMessage({
181182
token: token,
182183
to: 'user_info_popover',
@@ -561,11 +562,11 @@ function initOfflineFeatures(isConnected, items, user, account) {
561562
if (offlineModeRetryCount < 30) {
562563
if (!isConnected) {
563564
var elementUsername = null;
564-
if (steemit) elementUsername = '.Header__userpic > span';
565+
if (steemit||steemitwallet) elementUsername = '.Header__userpic > span';
565566
else if (busy) elementUsername = '.Topnav__user';
566567

567568
if ($(elementUsername).length > 0) {
568-
if (steemit) user = $(elementUsername)[0].title; //Get username in offline mode
569+
if (steemit||steemitwallet) user = $(elementUsername)[0].title; //Get username in offline mode
569570
else if (busy) user = $(elementUsername)[0].href.replace('https://busy.org/@', ''); //Get username in offline mode
570571
steem.api.getAccounts([user], function(err, result) {
571572
if (err) console.log(err);
@@ -643,13 +644,13 @@ async function startOfflineFeatures(items, user, account) {
643644
checkLastPost(last_post_url, account);
644645

645646
console.log('Starting features...', user);
646-
if (delegation && (steemit || busy))
647+
if (delegation && (steemit ||steemitwallet|| busy))
647648
chrome.runtime.sendMessage({
648649
token: token,
649650
to: 'delegation',
650651
order: 'start',
651652
data: {
652-
steemit: steemit,
653+
steemit: steemit||steemitwallet,
653654
busy: busy,
654655
global: {
655656
totalSteem: totalSteemLS,
@@ -658,13 +659,13 @@ async function startOfflineFeatures(items, user, account) {
658659
account: account
659660
}
660661
});
661-
if (transfers && (steemit))
662+
if (transfers && (steemit||steemitwallet))
662663
chrome.runtime.sendMessage({
663664
token: token,
664665
to: 'transfers',
665666
order: 'start',
666667
data: {
667-
steemit: steemit,
668+
steemit: steemit||steemitwallet,
668669
busy: busy,
669670
user: user,
670671
balance: {
@@ -673,14 +674,14 @@ async function startOfflineFeatures(items, user, account) {
673674
}
674675
}
675676
});
676-
if (account_value && (steemit || busy))
677+
if (account_value && (steemit ||steemitwallet|| busy))
677678
chrome.runtime.sendMessage({
678679
token: token,
679680
to: 'acc_v',
680681
order: 'start',
681682
data: {
682683
user: user,
683-
steemit: steemit,
684+
steemit: steemit||steemitwallet,
684685
busy: busy,
685686
global: {
686687
totalSteem: totalSteemLS,
@@ -689,14 +690,14 @@ async function startOfflineFeatures(items, user, account) {
689690
market: market
690691
}
691692
});
692-
if (rank && (steemit || busy))
693+
if (rank && (steemit ||steemitwallet|| busy))
693694
chrome.runtime.sendMessage({
694695
badge: items.badge,
695696
token: token,
696697
to: 'rank',
697698
order: 'start',
698699
data: {
699-
steemit: steemit,
700+
steemit: steemit||steemitwallet,
700701
busy: busy,
701702
totalSteem: totalSteemLS,
702703
totalVests: totalVestsLS
@@ -745,17 +746,17 @@ async function startOfflineFeatures(items, user, account) {
745746
busy: busy
746747
}
747748
});
748-
if (article_count && (steemit || busy))
749+
if (article_count && (steemit||steemitwallet || busy))
749750
chrome.runtime.sendMessage({
750751
token: token,
751752
to: 'article_count',
752753
order: 'start',
753754
data: {
754-
steemit: steemit,
755+
steemit: steemit||steemitwallet,
755756
busy: busy
756757
}
757758
});
758-
if (wallet_history && steemit)
759+
if (wallet_history && (steemit||steemitwallet))
759760
chrome.runtime.sendMessage({
760761
token: token,
761762
to: 'wallet_history',
@@ -824,14 +825,14 @@ async function startOfflineFeatures(items, user, account) {
824825
busy: busy
825826
}
826827
});
827-
if (steemplus_points && (steemit || busy))
828+
if (steemplus_points && (steemit||steemitwallet || busy))
828829
chrome.runtime.sendMessage({
829830
token: token,
830831
to: 'steemplus_points',
831832
order: 'start',
832833
data: {
833834
account: account,
834-
steemit: steemit,
835+
steemit: steemit||steemitwallet,
835836
busy: busy,
836837
market: market,
837838
global: {
@@ -851,7 +852,7 @@ async function startOfflineFeatures(items, user, account) {
851852
busy: busy
852853
}
853854
});
854-
if (premium_features && steemit)
855+
if (premium_features && steemit||steemitwallet)
855856
chrome.runtime.sendMessage({
856857
token: token,
857858
order: 'start',
@@ -951,7 +952,7 @@ async function startOfflineFeatures(items, user, account) {
951952
order: 'start',
952953
data: {}
953954
});
954-
if (steemit && user_info_popover)
955+
if (steemit||steemitwallet && user_info_popover)
955956
chrome.runtime.sendMessage({
956957
token: token,
957958
to: 'user_info_popover',
@@ -1001,13 +1002,13 @@ async function startOfflineFeatures(items, user, account) {
10011002
if (urlOffline !== window.location.href) {
10021003
if (urlOffline.match(/transfers/) && window.location.href.includes('@' + user + '/transfers'))
10031004
location.reload();
1004-
if (delegation && (steemit || busy))
1005+
if (delegation && (steemit ||steemitwallet|| busy))
10051006
chrome.runtime.sendMessage({
10061007
token: token,
10071008
to: 'delegation',
10081009
order: 'click',
10091010
data: {
1010-
steemit: steemit,
1011+
steemit: steemit||steemitwallet,
10111012
busy: busy,
10121013
global: {
10131014
totalSteem: totalSteemLS,
@@ -1016,28 +1017,28 @@ async function startOfflineFeatures(items, user, account) {
10161017
account: account
10171018
}
10181019
});
1019-
if (transfers && (steemit))
1020+
if (transfers && (steemit||steemitwallet))
10201021
chrome.runtime.sendMessage({
10211022
token: token,
10221023
to: 'transfers',
10231024
order: 'click',
10241025
data: {
1025-
steemit: steemit,
1026+
steemit: steemit||steemitwallet,
10261027
user: user,
10271028
balance: {
10281029
steem: account.balance.split(' ')[0],
10291030
sbd: account.sbd_balance.split(' ')[0]
10301031
}
10311032
}
10321033
});
1033-
if (account_value && (steemit || busy))
1034+
if (account_value && (steemit||steemitwallet || busy))
10341035
chrome.runtime.sendMessage({
10351036
token: token,
10361037
to: 'acc_v',
10371038
order: 'click',
10381039
data: {
10391040
user: user,
1040-
steemit: steemit,
1041+
steemit: steemit||steemitwallet,
10411042
busy: busy,
10421043
global: {
10431044
totalSteem: totalSteemLS,
@@ -1046,14 +1047,14 @@ async function startOfflineFeatures(items, user, account) {
10461047
market: market
10471048
}
10481049
});
1049-
if (rank && (steemit || busy))
1050+
if (rank && (steemit ||steemitwallet|| busy))
10501051
chrome.runtime.sendMessage({
10511052
badge: items.badge,
10521053
token: token,
10531054
to: 'rank',
10541055
order: 'click',
10551056
data: {
1056-
steemit: steemit,
1057+
steemit: steemit||steemitwallet,
10571058
busy: busy,
10581059
totalSteem: totalSteemLS,
10591060
totalVests: totalVestsLS
@@ -1084,7 +1085,7 @@ async function startOfflineFeatures(items, user, account) {
10841085
order: 'click',
10851086
data: {}
10861087
});
1087-
if (steemit && user_info_popover && steemit_more_info)
1088+
if (steemit||steemitwallet && user_info_popover && steemit_more_info)
10881089
chrome.runtime.sendMessage({
10891090
token: token,
10901091
to: 'user_info_popover',
@@ -1196,17 +1197,17 @@ async function startOfflineFeatures(items, user, account) {
11961197
busy: busy
11971198
}
11981199
});
1199-
if (article_count && (steemit || busy))
1200+
if (article_count && (steemit||steemitwallet || busy))
12001201
chrome.runtime.sendMessage({
12011202
token: token,
12021203
to: 'article_count',
12031204
order: 'click',
12041205
data: {
1205-
steemit: steemit,
1206+
steemit: steemit||steemitwallet,
12061207
busy: busy
12071208
}
12081209
});
1209-
if (wallet_history && steemit)
1210+
if (wallet_history && (steemit||steemitwallet))
12101211
chrome.runtime.sendMessage({
12111212
token: token,
12121213
to: 'wallet_history',
@@ -1302,14 +1303,14 @@ async function startOfflineFeatures(items, user, account) {
13021303
steemPrice: steemPriceLS
13031304
}
13041305
});
1305-
if (steemplus_points && (steemit || busy))
1306+
if (steemplus_points && (steemit ||steemitwallet|| busy))
13061307
chrome.runtime.sendMessage({
13071308
token: token,
13081309
to: 'steemplus_points',
13091310
order: 'click',
13101311
data: {
13111312
account: account,
1312-
steemit: steemit,
1313+
steemit: steemit||steemitwallet,
13131314
busy: busy,
13141315
market: market,
13151316
global: {
@@ -1331,7 +1332,7 @@ async function startOfflineFeatures(items, user, account) {
13311332
}
13321333
});
13331334

1334-
if (premium_features && steemit)
1335+
if (premium_features && steemit||steemitwallet)
13351336
chrome.runtime.sendMessage({
13361337
token: token,
13371338
order: 'click',
@@ -1349,7 +1350,7 @@ async function startOfflineFeatures(items, user, account) {
13491350

13501351
urlOffline = window.location.href;
13511352
}
1352-
if (dropdown && steemit)
1353+
if (dropdown && steemit||steemitwallet)
13531354
chrome.runtime.sendMessage({
13541355
token: token,
13551356
to: 'drop',

‎manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"manifest_version": 2,
33
"name": "SteemPlus",
44
"description": "Lightweight toolbox for Steemit",
5-
"version": "3.8.0.6",
5+
"version": "3.8.1.0",
66
"content_security_policy": "script-src 'self' 'unsafe-eval' ; object-src 'self'; child-src 'unsafe-eval' 'self'",
77
"browser_action": {
88
"default_icon": "src/img/logo.png",
@@ -62,7 +62,7 @@
6262

6363
"content_scripts": [
6464
{
65-
"matches": ["https://steemit.com/*","https://busy.org/*","https://mspsteem.com/*","https://utopian.io/*"],
65+
"matches": ["https://steemit.com/*","https://steemitwallet.com/*","https://busy.org/*","https://mspsteem.com/*","https://utopian.io/*"],
6666
"js": ["vendor/global_const.js","vendor/jquery.js","vendor/logger.js","vendor/jquery.livequery.min.js","vendor/sc2.min.js","vendor/jquery.justifiedGallery.min.js","vendor/timeago.js","vendor/steemjs.js","vendor/decode.min.js","vendor/bootstrap.js","vendor/datatables.min.js", "vendor/lodash.min.js", "vendor/remarkable.min.js", "vendor/sanitize-html.min.js", "vendor/moment.min.js", "vendor/Chart.min.js", "vendor/toastr.min.js",
6767
"vendor/smi/HtmlReady.js","vendor/smi/base_tab.js","vendor/smi/sanitize.js","vendor/smi/utils.js","vendor/unslider/unslider-min.js","vendor/jquery.markdown-live.js","vendor/js-markdown-extra.js","vendor/bootstrap-slider/bootstrap-slider.min.js","vendor/jquery.easy-autocomplete.min.js",
6868
"vendor/steem_keychain.js",

‎src/js/account_val.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
4444
});
4545

4646
function startAccountValue() {
47-
if (regexWalletSteemit.test(window.location.href) || regexWalletBusy.test(window.location.href)) {
47+
if (regexWalletSteemit.test(window.location.href) ||regexWalletSteemitWallet.test(window.location.href) || regexWalletBusy.test(window.location.href)) {
4848
if (acc_steemit) {
4949
load_check_a = /transfers/;
5050
load_check2_a = /transfers/;
@@ -85,7 +85,7 @@ function onClickA() {
8585

8686
function checkLoad() {
8787

88-
if ((regexWalletSteemit.test(window.location.href) || regexWalletBusy.test(window.location.href)) && retryAccountVal < 5) {
88+
if ((regexWalletSteemit.test(window.location.href) ||regexWalletSteemitWallet.test(window.location.href) || regexWalletBusy.test(window.location.href)) && retryAccountVal < 5) {
8989
if ($(wallet_elt_a).length > 0) {
9090
createTitle();
9191
} else {
@@ -113,8 +113,6 @@ function createTitle() {
113113

114114
Promise.all([steem.api.getAccountsAsync([account_v]), steem.api.getOpenOrdersAsync(account_v), steem.api.getSavingsWithdrawFromAsync(account_v)])
115115
.then(function(result) {
116-
console.log(result);
117-
118116
var accountAccountValue = result[0];
119117
var openOrdersAccountValue = result[1];
120118
var savingsWithdrawFromAccountValue = result[2];

‎src/js/author_popup_info.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ chrome.runtime.onMessage.addListener(function(request, sender, sendResponse) {
2727
// No parameters
2828
function startAuthorPopupInfo() {
2929
// Check url of the page. Need to be on a post to start the function
30-
if (isSteemit && regexPostSteemit.test(window.location.href) && retryCountAuthorPopupInfo < 20) {
30+
if (isSteemit && (regexPostSteemit.test(window.location.href)||regexPostSteemitWallet.test(window.location.href)) && retryCountAuthorPopupInfo < 20) {
3131
if ($('.ptc').length === 0) {
3232
// Looking for the right html element. If can't find it retry later. Maximum 20 seconds
3333
retryCountAuthorPopupInfo++;

0 commit comments

Comments
 (0)