Skip to content

Commit

Permalink
Merge pull request #515 from hive-keychain/pre-prod
Browse files Browse the repository at this point in the history
v3.6
  • Loading branch information
stoodkev authored Aug 14, 2024
2 parents bd14897 + 9e6a9b0 commit a09ec21
Show file tree
Hide file tree
Showing 43 changed files with 996 additions and 108 deletions.
2 changes: 1 addition & 1 deletion manifests/chromium-beta/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "Hive Keychain Beta",
"description": "Hive Keychain Beta (don't forget to switch back to production version)",
"default_locale": "en",
"version": "3.5",
"version": "3.6",
"permissions": ["storage", "idle", "alarms"],
"host_permissions": ["https://*/*"],
"action": {
Expand Down
2 changes: 1 addition & 1 deletion manifests/chromium/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "__MSG_keychain__",
"description": "__MSG_description__",
"default_locale": "en",
"version": "3.5",
"version": "3.6",
"permissions": ["storage", "idle", "alarms"],
"host_permissions": ["https://*/*"],
"action": {
Expand Down
2 changes: 1 addition & 1 deletion manifests/firefox/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "__MSG_keychain__",
"description": "__MSG_description__",
"default_locale": "en",
"version": "3.5",
"version": "3.6",
"permissions": ["storage", "idle", "alarms"],
"content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self';",
"browser_action": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hive-keychain",
"version": "3.5",
"version": "3.6",
"description": "Hive Keychain extension",
"main": "index.js",
"directories": {
Expand Down
45 changes: 40 additions & 5 deletions public/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,10 @@
"message": "Click here to copy username",
"description": "after clicking on copy username to clipboard button on home page"
},
"popup_html_detach_window_tooltip_text": {
"message": "Detach window\nShorcut: Ctrl + D",
"description": "after clicking on copy username to clipboard button on home page"
},
"popup_html_wrong_key_tooltip_text": {
"message": "This key doesn't seem to match your account. You won't be able to perform transactions with it. If you've changed it, remove this key and replace it with the new one.",
"description": "after hoover on red wrong key -> manage accounts -> account keys list item"
Expand Down Expand Up @@ -1445,7 +1449,7 @@
"message": "Powered up $1 HIVE on @$2."
},
"bgd_ops_pd": {
"message": "Started a $1 HP power down on @$2."
"message": "Started a $1 power down on @$2."
},
"bgd_ops_pd_stop": {
"message": "Stopped Power Down on @$1."
Expand Down Expand Up @@ -1722,6 +1726,18 @@
"message": "Setup automated tasks that will run every hour if fitting your conditions.",
"description": "When on automated tasks page"
},
"popup_html_automated_hive_section_title": {
"message": "Hive",
"description": "When on automated tasks page"
},
"popup_html_automated_hive_engine_section_title": {
"message": "Hive Engine",
"description": "When on automated tasks page"
},
"popup_html_automated_hive_engine_list_title": {
"message": "Tokens set for automatic staking",
"description": "When on automated tasks page"
},
"popup_html_favorite_accounts_intro": {
"message": "Setup accounts that you use the most, when doing transfers, hive engine operations, exchange operations, and more.",
"description": "When on favorite accounts page"
Expand All @@ -1730,10 +1746,22 @@
"message": "Claim Rewards",
"description": "When on automated tasks page"
},
"popup_html_enable_autostake_tokens": {
"message": "Auto Staking",
"description": "When on automated tasks page"
},
"popup_html_automated_hive_section_default_option_message": {
"message": "Add a token to auto-staking",
"description": "When on automated tasks page > auto staking default option"
},
"popup_html_enable_autoclaim_rewards_info": {
"message": "Regularly claiming your rewards can increase your gains.",
"description": "When on automated tasks page"
},
"popup_html_enable_autostake_tokens_info": {
"message": "Automatically staking your tokens can increase your gains",
"description": "When on automated tasks page"
},
"popup_html_enable_autoclaim_accounts": {
"message": "Claim Accounts",
"description": "When on automated tasks page"
Expand Down Expand Up @@ -3483,6 +3511,10 @@
"message": "Token",
"description": "Value of token in USD"
},
"tokens": {
"message": "Tokens",
"description": "common use in extension referring to HE tokes"
},
"liquid_balance": {
"message": "Liquid balance",
"description": "Value of token in USD"
Expand Down Expand Up @@ -4055,7 +4087,10 @@
"message": "@$1 reblogged @$2's post <a classname='notification-link' target='__blank' href='https://peakd.com/@$2/$3'>$2/$3</a>",
"description": "Notification reblog"
},

"notification_unreblog": {
"message": "@$1 unreblogged @$2's post <a classname='notification-link' target='__blank' href='https://peakd.com/@$2/$3'>$2/$3</a>",
"description": "Notification unreblog"
},
"notification_account_update": {
"message": "@$1's notification settings have been updated",
"description": "Notification account updated"
Expand Down Expand Up @@ -4113,15 +4148,15 @@
"description": "Notification comment reward"
},
"notification_hbd_interest": {
"message": "$@1 received $2 as interest",
"message": "@$1 received $2 as interest",
"description": "Notification HBD interest received"
},
"notification_fill_power_down": {
"message": "$@1 received $2 as part of power down",
"message": "@$1 received $2 as part of power down",
"description": "Notification power down received"
},
"notification_fill_power_down_other_account": {
"message": "$@1 received $2 as part of power down of @$3",
"message": "@$1 received $2 as part of power down of @$3",
"description": "Notification power down received"
},
"notification_changed_recovery_account": {
Expand Down
91 changes: 91 additions & 0 deletions public/assets/extra-styles/detached_window.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
html,
body {
display: flex;
height: 100%;
align-items: center;
justify-content: center;
}
html {
background-image: url('assets/images/background/detached-popup-background.png');
background-repeat: no-repeat;
background-size: cover;
}
#root {
display: flex;
height: 100%;
align-items: center;
justify-content: center;
.theme {
border: solid 1px var(--card-border-color);
border-radius: 8px;
width: 435px;
height: 600px;
color: var(--main-font-color);
padding: 0px !important;
box-sizing: border-box;
display: flex;
flex-direction: column;
row-gap: 24px;
font-size: 16px;
position: relative;
.App {
margin-left: unset !important;
.splashscreen {
width: 435px !important;
height: 600px !important;
position: relative !important;
.loading-animation-container {
width: unset !important;
}
.overlay {
border: solid 1px grey !important;
border-radius: 8px !important;
width: 435px !important;
height: 600px !important;
.top {
position: relative !important;
}
.bottom {
top: 0px;
position: absolute;
left: 0px;
}
}
}
.home-page-content {
border-radius: 0 0 8px 8px !important;
}
.custom-select-handle {
height: unset !important;
}
/* common-styles */
.select-account-section {
margin: 0px !important;
}
.fullsize {
width: 100% !important;
}
.automated-tasks-page {
.select-account-section {
margin: 0px !important;
width: 100% !important;
}
}
.favorite-accounts-page,
.export-transactions-page,
.settings-manage-account,
.settings-manage-account-authorities {
.select-account-section {
margin: 0px 20px !important;
width: calc(100% - 40px) !important;
}
}
}
}
}

@-moz-document url-prefix() {
div:not(.scrollable) {
scrollbar-width: none;
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions public/assets/images/menu/user-preferences/detach.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions public/assets/images/select/delete.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions public/detached_window.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>

<link rel="preconnect" href="https://fonts.gstatic.com" />
<link href="assets/fonts/googleFonts.css" rel="stylesheet" />

<!-- <link rel="stylesheet" href="https://unpkg.com/@djthoms/pretty-checkbox" /> -->
<link rel="stylesheet" href="assets/pretty-checkbox.min.css" />
<link rel="stylesheet" href="assets/extra-styles/detached_window.css" />
<title>Hive Keychain</title>
</head>

<body>
<div id="root"></div>
<noscript> You need to enable JavaScript to run this app. </noscript>
<script src="hiveTxBundle.js"></script>
<script src="popupBundle.js"></script>
</body>
</html>
Loading

0 comments on commit a09ec21

Please sign in to comment.