Skip to content

Commit

Permalink
Merge pull request #584 from arconnectio/development
Browse files Browse the repository at this point in the history
ArConnect BETA 1.20.6
  • Loading branch information
nicholaswma authored Dec 17, 2024
2 parents 297f1d7 + b51f41c commit c1156ae
Show file tree
Hide file tree
Showing 274 changed files with 9,227 additions and 5,776 deletions.
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
. "$(dirname -- "$0")/_/husky.sh"

yarn fmt
git add -A
git add -A
130 changes: 114 additions & 16 deletions assets/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -615,11 +615,11 @@
},
"enter_new_password": {
"message": "Enter your new password...",
"description": "Password input placeholder"
"description": "Password input placeholder"
},
"reenter_new_password": {
"message": "Re-enter your new password...",
"description": "Re-enter input placeholder"
"description": "Re-enter input placeholder"
},
"enter_password": {
"message": "Enter your password...",
Expand Down Expand Up @@ -1333,12 +1333,16 @@
"message": "Click to view your last signed transaction",
"description": "View last tx prompt content"
},
"view_transaction_details": {
"message": "View transaction details",
"description": "View transaction details link text"
},
"sign_item": {
"message": "Sign Item",
"message": "Sign item",
"description": "Sign message popup title"
},
"batch_sign_items": {
"message": "Batch Sign Items",
"message": "Sign items",
"description": "Batch sign message popup title"
},
"titles_signature": {
Expand Down Expand Up @@ -1391,6 +1395,10 @@
"message": "Authorize",
"description": "Authorize button label"
},
"sign_authorize_all": {
"message": "Authorize all",
"description": "Authorize all button label"
},
"sign_enter_password": {
"message": "Enter password to sign transaction",
"description": "Request to enter password to sign transaction"
Expand Down Expand Up @@ -1604,7 +1612,7 @@
"description": "Lock wallet and terminate current session icon button"
},
"home": {
"message":"Home",
"message":"Home",
"description": "Home Button"
},
"home_no_balance": {
Expand Down Expand Up @@ -1673,11 +1681,11 @@
"message": "Toggle to receive alerts for new transactions in your wallet.",
"description": "Toggle notifications description text"
},
"get_started":{
"get_started":{
"message": "Get Started",
"description": "Get started title"
},
"get_started_description":{
"get_started_description":{
"message": "Explore the endless possibilities on Arweave and aoComputer through ArConnect",
"description": "Get started description"
},
Expand Down Expand Up @@ -1806,7 +1814,7 @@
"description": "Currency search placeholder text"
},
"receive_AR_button": {
"message": "Receive AR",
"message": "Receive AR",
"description": "Button text for the receive AR button"
},
"search_contacts": {
Expand Down Expand Up @@ -1925,7 +1933,7 @@
"description": "Input title for the password allowance label"
},
"add": {
"message": "Add",
"message": "Add",
"description" : "add button text"
},
"your_contacts": {
Expand All @@ -1941,24 +1949,24 @@
"description": "Error message for invalid ANS"
},
"arns_added": {
"message": " ar://$ADDRESS$ added",
"message": " ar://$ADDRESS$ added",
"description": "ArNS recipient added",
"placeholders": {
"address": {
"content": "$1",
"example": "Address"
}
}
}
},
"ans_added": {
"message": "$ADDRESS$ added",
"message": "$ADDRESS$ added",
"description": "ANS recipient added",
"placeholders": {
"address": {
"content": "$1",
"example": "Address"
}
}
}
},
"setting_ao_support": {
"message": "ao support",
Expand Down Expand Up @@ -2110,7 +2118,7 @@
"description": "Address where payment will be made to"
},


"subscription_recurring_amount": {
"message": "Recurring payment amount",
"description": "Recurring payment amount"
Expand All @@ -2128,12 +2136,12 @@
"message": "Confirm Subscription",
"description": "confirm subscription"
},

"continue": {
"message": "Continue",
"description": "Continue"
},

"end": {
"message": "End",
"description": "end"
Expand Down Expand Up @@ -2285,5 +2293,95 @@
"new_transaction": {
"message": "New transaction",
"description": "New transaction description"
},
"batchSignDataItemRequestLoading": {
"message": "Signing...",
"description": "Loading message for AuthRequest of type batchSignDataItem"
},
"connectRequestLoading": {
"message": "Connecting...",
"description": "Loading message for AuthRequest of type connect"
},
"allowanceRequestLoading": {
"message": "Updating allowance...",
"description": "Loading message for AuthRequest of type allowance"
},
"tokenRequestLoading": {
"message": "Adding token...",
"description": "Loading message for AuthRequest of type token"
},
"signRequestLoading": {
"message": "Signing...",
"description": "Loading message for AuthRequest of type sign"
},
"subscriptionRequestLoading": {
"message": "Subscribing...",
"description": "Loading message for AuthRequest of type subscription"
},
"signKeystoneRequestLoading": {
"message": "Signing...",
"description": "Loading message for AuthRequest of type signKeystone"
},
"signatureRequestLoading": {
"message": "Signing...",
"description": "Loading message for AuthRequest of type signature"
},
"signDataItemRequestLoading": {
"message": "Signing...",
"description": "Loading message for AuthRequest of type signDataItem"
},
"abortingRequestLoading": {
"message": "Aborting...",
"description": "Loading message for rejected/aborted AuthRequests"
},
"pendingTransactionStatusAt": {
"message": "Requested",
"description": "Label to display next to the elapsed time since the AuthRequest was created"
},
"acceptedTransactionStatusAt": {
"message": "Accepted",
"description": "Label to display next to the elapsed time since the AuthRequest was accepted"
},
"rejectedTransactionStatusAt": {
"message": "Rejected",
"description": "Label to display next to the elapsed time since the AuthRequest was rejected"
},
"abortedTransactionStatusAt": {
"message": "Aborted",
"description": "Label to display next to the elapsed time since the AuthRequest was aborted"
},
"errorTransactionStatusAt": {
"message": "Failed",
"description": "Label to display next to the elapsed time since the AuthRequest was aborted"
},
"formattedElapsedSeconds": {
"message": "$SECONDS$ seconds ago",
"description": "Format elapsed seconds",
"placeholders": {
"seconds": {
"content": "$1",
"example": "10"
}
}
},
"formattedElapsedMinutes": {
"message": "$MINUTES$ minutes ago",
"description": "Format elapsed minutes",
"placeholders": {
"minutes": {
"content": "$1",
"example": "10"
}
}
},
"formattedElapsedHours": {
"message": "$HOURS$ hours ago",
"description": "Format elapsed hours",
"placeholders": {
"hours": {
"content": "$1",
"example": "10"
}
}
}
}
98 changes: 98 additions & 0 deletions assets/_locales/zh_CN/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -1321,6 +1321,10 @@
"message": "点击查看您最近签署的交易",
"description": "View last tx prompt content"
},
"view_transaction_details": {
"message": "查看交易详情",
"description": "View transaction details link text"
},
"sign_item": {
"message": "签署项目",
"description": "Sign message popup title"
Expand Down Expand Up @@ -1379,6 +1383,10 @@
"message": "授权",
"description": "Authorize button label"
},
"sign_authorize_all": {
"message": "Authorize all",
"description": "Authorize all button label"
},
"sign_enter_password": {
"message": "输入密码以签署交易",
"description": "Request to enter password to sign transaction"
Expand Down Expand Up @@ -2271,5 +2279,95 @@
"new_transaction": {
"message": "新交易",
"description": "New transaction description"
},
"batchSignDataItemRequestLoading": {
"message": "Signing...",
"description": "Loading message for AuthRequest of type batchSignDataItem"
},
"connectRequestLoading": {
"message": "Connecting...",
"description": "Loading message for AuthRequest of type connect"
},
"allowanceRequestLoading": {
"message": "Updating allowance...",
"description": "Loading message for AuthRequest of type allowance"
},
"tokenRequestLoading": {
"message": "Adding token...",
"description": "Loading message for AuthRequest of type token"
},
"signRequestLoading": {
"message": "Signing...",
"description": "Loading message for AuthRequest of type sign"
},
"subscriptionRequestLoading": {
"message": "Subscribing...",
"description": "Loading message for AuthRequest of type subscription"
},
"signKeystoneRequestLoading": {
"message": "Signing...",
"description": "Loading message for AuthRequest of type signKeystone"
},
"signatureRequestLoading": {
"message": "Signing...",
"description": "Loading message for AuthRequest of type signature"
},
"signDataItemRequestLoading": {
"message": "Signing...",
"description": "Loading message for AuthRequest of type signDataItem"
},
"abortingRequestLoading": {
"message": "Aborting...",
"description": "Loading message for rejected/aborted AuthRequests"
},
"pendingTransactionStatusAt": {
"message": "Requested",
"description": "Label to display next to the elapsed time since the AuthRequest was created"
},
"acceptedTransactionStatusAt": {
"message": "Accepted",
"description": "Label to display next to the elapsed time since the AuthRequest was accepted"
},
"rejectedTransactionStatusAt": {
"message": "Rejected",
"description": "Label to display next to the elapsed time since the AuthRequest was rejected"
},
"abortedTransactionStatusAt": {
"message": "Aborted",
"description": "Label to display next to the elapsed time since the AuthRequest was aborted"
},
"errorTransactionStatusAt": {
"message": "Failed",
"description": "Label to display next to the elapsed time since the AuthRequest was aborted"
},
"formattedElapsedSeconds": {
"message": "$SECONDS$ seconds ago",
"description": "Format elapsed seconds",
"placeholders": {
"seconds": {
"content": "$1",
"example": "10"
}
}
},
"formattedElapsedMinutes": {
"message": "$MINUTES$ minutes ago",
"description": "Format elapsed minutes",
"placeholders": {
"minutes": {
"content": "$1",
"example": "10"
}
}
},
"formattedElapsedHours": {
"message": "$HOURS$ hours ago",
"description": "Format elapsed hours",
"placeholders": {
"hours": {
"content": "$1",
"example": "10"
}
}
}
}
Binary file added assets/placeholder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions assets/popup.css
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,21 @@

:root {
--defaultBackgroundColor: white;
--defaultTextColor: black;
}

@media (prefers-color-scheme: dark) {
:root {
--defaultBackgroundColor: black;
--defaultTextColor: white;
}
}

body {
margin: 0;
padding: 0;
background-color: var(--backgroundColor, var(--defaultBackgroundColor, white));
color: var(--textColor, var(--defaultTextColor, black));
}

body#popup {
Expand Down Expand Up @@ -97,6 +101,7 @@ input,
select,
textarea {
font-family: "ManropeLocal", "Manrope VF", "Manrope", sans-serif !important;
letter-spacing: .5px;
}

button {
Expand Down
6 changes: 4 additions & 2 deletions assets/popup.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const backgroundColor = localStorage.getItem("ARCONNECT_THEME_BACKGROUND_COLOR");

if (backgroundColor) document.documentElement.style.setProperty('--backgroundColor', backgroundColor);
const textColor = localStorage.getItem("ARCONNECT_THEME_TEXT_COLOR");

if (backgroundColor) document.documentElement.style.setProperty('--backgroundColor', backgroundColor);
if (textColor) document.documentElement.style.setProperty('--textColor', textColor);
Loading

0 comments on commit c1156ae

Please sign in to comment.