Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ArConnect 1.9.0 #301

Merged
merged 77 commits into from
Apr 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
896c45f
refactor: update contact settings buttons
elehma4 Feb 20, 2024
6a744d2
refactor: update buttons for applications
elehma4 Feb 20, 2024
341212d
refactor: application modal pop-up
elehma4 Feb 20, 2024
40d2905
refactor: update buttons in settings
elehma4 Feb 20, 2024
87bcdaa
feat: update buttons with v2
elehma4 Feb 20, 2024
a5cb4c7
refactor: update inputs
elehma4 Feb 21, 2024
22cb781
Merge branch 'development' into feat/arconnect-components-v2
elehma4 Feb 23, 2024
cd7eae7
Merge branch 'development' into feat/arconnect-components-v2
elehma4 Feb 26, 2024
b874f86
chore: update dependencies
elehma4 Feb 26, 2024
b53be80
style: update search input with v2
elehma4 Feb 26, 2024
37ab044
style: contact & wallet settings
elehma4 Feb 26, 2024
3fcfd08
style: update no balance screen
elehma4 Feb 27, 2024
cf9fcd2
style: update buttons and inputs with v2
elehma4 Feb 27, 2024
34f59c3
style: update buttons to v2
elehma4 Feb 27, 2024
cfab684
style: update contact inputs and buttons with v2
elehma4 Feb 28, 2024
416bdd8
refactor: replace BaseElements with ListItems
elehma4 Feb 28, 2024
ada75fa
refactor: update receive page styles and copy
elehma4 Feb 28, 2024
4887554
Merge branch 'development' into ARC-276-receive-screen-remove-share-m…
elehma4 Feb 29, 2024
9e808c5
refactor: receive screen
elehma4 Feb 29, 2024
03beab0
style: update qr code svg
elehma4 Feb 29, 2024
c565930
Merge branch 'development' into feat/arconnect-components-v2
elehma4 Feb 29, 2024
6892f1c
refactor: use v2 components
elehma4 Feb 29, 2024
bfdba17
style: use v2 components
elehma4 Feb 29, 2024
21bacf1
style: use v2 components
elehma4 Feb 29, 2024
7e96bd7
style: use listitem for contacts
elehma4 Mar 1, 2024
df7728e
style: update display
elehma4 Mar 1, 2024
6ee7f1b
style: button display
elehma4 Mar 1, 2024
953c751
style: use modal v2
elehma4 Mar 1, 2024
f5ed263
style: use v2 buttons in wallet header
elehma4 Mar 1, 2024
04c41e4
style: use tooltip v2
elehma4 Mar 1, 2024
f1cd3c4
style: use tooltip v2
elehma4 Mar 1, 2024
51dce57
style: update connect components to v2
elehma4 Mar 4, 2024
a1195f1
refactor: copy receive address btn
elehma4 Mar 5, 2024
128e285
chore: update dependencies
elehma4 Mar 5, 2024
864194f
style: update search wrapper
elehma4 Mar 5, 2024
3621e1b
style: fix search input
elehma4 Mar 6, 2024
d51c692
Merge branch 'development' into feat/arconnect-components-v2
elehma4 Mar 8, 2024
d423521
style: update input to v2
elehma4 Mar 8, 2024
350cabe
style: update wallet header display
elehma4 Mar 12, 2024
b337bbb
feat: add wallet menu to wallet header
elehma4 Mar 12, 2024
f0ce838
Merge branch 'development' into feat/arc-291-wallet-header-v2
elehma4 Mar 13, 2024
2699c3d
ci: wallet menu items and display
elehma4 Mar 13, 2024
87451d1
styles: wallet header component update
elehma4 Mar 13, 2024
036aa89
Merge branch 'feat/arc-291-wallet-header-v2' into feat/arconnect-comp…
elehma4 Mar 13, 2024
6b0172a
fix: clean up components v2
elehma4 Mar 14, 2024
97f8c2d
Merge branch 'development' into feat/arconnect-components-v2
elehma4 Mar 14, 2024
70d62e6
Merge branch 'ARC-276-receive-screen-remove-share-move-address' into …
elehma4 Mar 14, 2024
4d5551a
fix: wallet avatars
elehma4 Mar 14, 2024
652fee0
chore: update dependencies
elehma4 Mar 14, 2024
638015d
Merge branch 'development' into feat/arconnect-components-v2
elehma4 Mar 14, 2024
ab631e2
fix: components v2
elehma4 Apr 1, 2024
27c0a7a
ci: update theme colors
elehma4 Apr 1, 2024
7d35bad
chore: update dependency
elehma4 Apr 1, 2024
9f2b37c
Merge branch 'development' into arc-317-component-v2-polishing
elehma4 Apr 2, 2024
36eafb0
refactor: button v2
elehma4 Apr 2, 2024
4e71b68
styles: icon button
elehma4 Apr 2, 2024
8c45f26
fix: added v2 components to arlocal
nicholaswma Apr 2, 2024
45f82cd
Merge pull request #282 from arconnectio/arc-317/arlocal-v2-components
elehma4 Apr 2, 2024
26e7c36
refactor: max and currency btns
elehma4 Apr 2, 2024
9b72bd2
Merge branch 'arc-317-component-v2-polishing' of https://github.com/a…
elehma4 Apr 2, 2024
9641c66
Merge pull request #283 from arconnectio/arc-317-component-v2-polishing
elehma4 Apr 3, 2024
7602986
fix: notification dot
elehma4 Apr 3, 2024
3a85c36
Merge pull request #244 from arconnectio/feat/arconnect-components-v2
elehma4 Apr 3, 2024
03a4f35
chore: version bump for beta
nicholaswma Apr 2, 2024
4839bde
fix: updated select to v2 in addtoken
nicholaswma Apr 5, 2024
c4fa203
Merge branch 'staging' into development
nicholaswma Apr 5, 2024
d438db5
Merge pull request #288 from arconnectio/development
nicholaswma Apr 5, 2024
61b7a3e
chore: version bump for beta
nicholaswma Apr 5, 2024
953fe5f
feat: revert invalid algo name
martonlederer Apr 5, 2024
105f2e3
Merge pull request #289 from arconnectio/fix/sign-message
martonlederer Apr 5, 2024
b988e2f
fix: re-added loading states to buttons
nicholaswma Apr 12, 2024
e3a6c3a
chore: reverted a deletion
nicholaswma Apr 12, 2024
5fd7daf
Merge pull request #299 from arconnectio/fix/misc-components-v2
nicholaswma Apr 12, 2024
4dc5440
Merge branch 'staging' into development
nicholaswma Apr 12, 2024
ee70163
Merge pull request #300 from arconnectio/development
nicholaswma Apr 12, 2024
a19200b
Merge branch 'production' into staging
nicholaswma Apr 12, 2024
d63e2c8
chore: version bump for beta
nicholaswma Apr 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions assets/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@
"description": "Remove app button"
},
"removeAppNote": {
"message": "This will remove all permissions from the app and disconnect it from ArConnect.",
"message": "Remove all permissions and disconnect the app from ArConnect.",
"description": "Remove app note paragraph"
},
"remove": {
Expand Down Expand Up @@ -517,6 +517,10 @@
}
}
},
"copied_address_2": {
"message": "address copied",
"description": "Address copy notification 2"
},
"cannot_edit_with_ans": {
"message": "Cannot edit nickname. Wallet already has an ANS label.",
"description": "Explainer for disabled edits for wallets with ANS profiles"
Expand All @@ -542,7 +546,7 @@
"description": "Password input placeholder"
},
"enter_password_again": {
"message": "Re-enter your passwor...",
"message": "Re-enter your password...",
"description": "Re-enter password input placeholder"
},
"passwords_match": {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "arconnect",
"displayName": "ArConnect",
"version": "1.8.0",
"version": "1.9.0",
"description": "__MSG_extensionDescription__",
"author": "th8ta",
"packageManager": "[email protected]",
Expand Down Expand Up @@ -47,7 +47,7 @@
]
},
"dependencies": {
"@arconnect/components": "^0.2.8",
"@arconnect/components": "^0.3.7",
"@arconnect/keystone-sdk": "^0.0.5",
"@arconnect/warp-dre": "^0.0.1",
"@arconnect/webext-bridge": "^5.0.6",
Expand Down
6 changes: 4 additions & 2 deletions src/components/IconButton.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import styled, { css, keyframes } from "styled-components";
import { Button } from "@arconnect/components";
import { ButtonV2 } from "@arconnect/components";

export const IconButton = styled(Button)`
export const IconButton = styled(ButtonV2)`
padding: 1.2rem;
transition: all 0.23s ease-in-out;
height: 52px;
width: 100px;
`;

export const RefreshButton = styled(IconButton)<{ refreshing: boolean }>`
Expand Down
43 changes: 20 additions & 23 deletions src/components/Recipient.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import { useInput, Text, Button, Input } from "@arconnect/components";
import {
useInput,
Text,
ButtonV2,
ListItem,
InputV2
} from "@arconnect/components";
import { ChevronDownIcon, ChevronUpIcon } from "@iconicicons/react";
import { useStorage } from "@plasmohq/storage/hook";
import { useMemo, useState } from "react";
Expand Down Expand Up @@ -125,9 +131,8 @@ export default function Recipient({ onClick, onClose }: RecipientProps) {
return (
<>
<SearchBarWrapper>
<Input
<InputV2
small
alternative={true}
{...targetInput.bindings}
type="text"
placeholder={browser.i18n.getMessage(
Expand All @@ -140,15 +145,14 @@ export default function Recipient({ onClick, onClose }: RecipientProps) {
return;
}}
/>
<Button
small
<ButtonV2
style={{ borderRadius: "10px", width: "56px", padding: 0 }}
onClick={() => {
submit();
}}
>
{browser.i18n.getMessage("add")}
</Button>
</ButtonV2>
</SearchBarWrapper>
<AddressesList>
<Recents onClick={() => setShow(!show)}>
Expand All @@ -175,28 +179,21 @@ export default function Recipient({ onClick, onClose }: RecipientProps) {
<ContactAddress style={{ color: "white" }}>{letter}</ContactAddress>

{filteredAndGroupedContacts[letter].map((contact) => (
<ContactItem
<ListItem
small
title={contact?.name}
description={formatAddress(contact.address)}
img={
contact.profileIcon
? contact.profileIcon
: generateProfileIcon(contact?.name || contact.address)
}
key={contact.address}
onClick={() => {
onClick({ contact, address: contact.address });
onClose();
}}
>
{contact.profileIcon ? (
<ProfilePicture src={contact.profileIcon} alt="Profile" />
) : (
<AutoContactPic>
{generateProfileIcon(contact?.name || contact.address)}
</AutoContactPic>
)}

<div>
<Name>{contact?.name}</Name>
<ContactAddress>
{formatAddress(contact.address)}
</ContactAddress>
</div>
</ContactItem>
/>
))}
</ContactList>
))}
Expand Down
5 changes: 2 additions & 3 deletions src/components/arlocal/InputWrapper.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import { IconButton } from "~components/IconButton";
import { Button } from "@arconnect/components";
import { ButtonV2 } from "@arconnect/components";
import styled from "styled-components";

export const InputWithBtn = styled.div`
display: flex;
align-items: flex-end;
gap: 0.8rem;

${Button} {
${ButtonV2} {
padding-top: 0.9rem;
padding-bottom: 0.9rem;
border-radius: 18px;
}

${IconButton} {
Expand Down
6 changes: 3 additions & 3 deletions src/components/arlocal/Mint.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
Button,
Input,
ButtonV2 as Button,
InputV2 as Input,
Text,
useInput,
useToasts
Expand Down Expand Up @@ -70,7 +70,7 @@ export default function Mint({ arweave }: Props) {
fullWidth
/>
</InputWrapper>
<Button secondary onClick={mint}>
<Button secondary onClick={mint} style={{ height: "52px" }}>
{browser.i18n.getMessage("mint")}
</Button>
</InputWithBtn>
Expand Down
6 changes: 3 additions & 3 deletions src/components/arlocal/Transaction.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { readFileBinary } from "~utils/file";
import { useRef, useState } from "react";
import { unlock } from "~wallets/auth";
import {
Button,
Input,
ButtonV2 as Button,
InputV2 as Input,
Spacer,
useInput,
Text,
Expand Down Expand Up @@ -289,7 +289,7 @@ export default function Transaction({ arweave }: Props) {
secondary
onClick={() => setTags((val) => val.filter((_, j) => j !== i))}
>
<TrashIcon />
<TrashIcon /> Trash
</IconButton>
</InputWithBtn>
<Spacer y={1} />
Expand Down
7 changes: 6 additions & 1 deletion src/components/arlocal/Tutorial.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import { Input, type InputStatus, Spacer, Text } from "@arconnect/components";
import {
InputV2 as Input,
type InputStatus,
Spacer,
Text
} from "@arconnect/components";
import { InputWithBtn, InputWrapper } from "./InputWrapper";
import { IconButton } from "~components/IconButton";
import { CopyIcon } from "@iconicicons/react";
Expand Down
20 changes: 15 additions & 5 deletions src/components/dashboard/Applications.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,12 @@ export default function Applications() {

return (
<Wrapper>
<SearchInput
placeholder={browser.i18n.getMessage("search_apps")}
{...searchInput.bindings}
sticky
/>
<SearchWrapper>
<SearchInput
placeholder={browser.i18n.getMessage("search_apps")}
{...searchInput.bindings}
/>
</SearchWrapper>
<Spacer y={1} />
<SettingsList>
{apps.filter(filterSearchResults).map((app, i) => (
Expand Down Expand Up @@ -117,6 +118,15 @@ const Wrapper = styled.div`
position: relative;
`;

const SearchWrapper = styled.div`
position: sticky;
top: 0;
left: 0;
right: 0;
z-index: 20;
background-color: rgb(${(props) => props.theme.cardBackground});
`;

const NoAppsText = styled(Text)`
text-align: center;
padding-top: 0.5rem;
Expand Down
18 changes: 6 additions & 12 deletions src/components/dashboard/Contacts.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Spacer, useInput } from "@arconnect/components";
import { ButtonV2, Spacer, useInput } from "@arconnect/components";
import React, { useState, useEffect, useMemo } from "react";
import { useStorage } from "@plasmohq/storage/hook";
import { ExtensionStorage } from "~utils/storage";
Expand All @@ -8,7 +8,6 @@ import { useLocation, useRoute } from "wouter";
import browser from "webextension-polyfill";
import SearchInput from "./SearchInput";
import styled from "styled-components";
import { IconButton } from "~components/IconButton";
import { formatAddress } from "~utils/format";
import { multiSort } from "~utils/multi_sort";
import { enrichContact } from "~contacts/hooks";
Expand Down Expand Up @@ -200,21 +199,16 @@ const LetterHeader = styled.div`
const SearchWrapper = styled.div`
position: sticky;
display: grid;
gap: 5px;
gap: 8px;
top: 0;
left: 0;
right: 0;
z-index: 20;
grid-template-columns: auto auto;
background-color: rgb(${(props) => props.theme.cardBackground});
`;

const AddContactButton = styled(IconButton).attrs({
secondary: true
})`
background: linear-gradient(
0deg,
rgba(${(props) => props.theme.theme}, 0.2),
rgba(${(props) => props.theme.theme}, 0.2)
),
rgb(${(props) => props.theme.background});
const AddContactButton = styled(ButtonV2)`
width: 100%;
height: 100%;
`;
42 changes: 26 additions & 16 deletions src/components/dashboard/Reset.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import {
Text,
Spacer,
Button,
ButtonV2,
useModal,
Modal,
useToasts
ModalV2,
useToasts,
type DisplayTheme
} from "@arconnect/components";
import { ExtensionStorage } from "~utils/storage";
import { TrashIcon } from "@iconicicons/react";
import browser from "webextension-polyfill";
import styled from "styled-components";
import { useTheme } from "~utils/theme";

export default function Reset() {
// reset modal
Expand All @@ -18,6 +20,8 @@ export default function Reset() {
// toasts
const { setToast } = useToasts();

const theme = useTheme();

// reset ArConnect
async function reset() {
try {
Expand Down Expand Up @@ -58,23 +62,28 @@ export default function Reset() {
<b>{browser.i18n.getMessage("irreversible_action")}</b>
</Warning>
<Spacer y={4} />
<ResetButton onClick={() => resetModal.setOpen(true)}>
<TrashIcon />
<ResetButton
displayTheme={theme}
onClick={() => resetModal.setOpen(true)}
>
<TrashIcon style={{ marginRight: "5px" }} />
{browser.i18n.getMessage("reset")}
</ResetButton>
<Modal
<ModalV2
{...resetModal.bindings}
root={document.getElementById("__plasmo")}
actions={
<ResetButton displayTheme={theme} onClick={reset}>
{browser.i18n.getMessage("confirm")}
</ResetButton>
}
>
<ModalText heading>{browser.i18n.getMessage("reset")}</ModalText>
<ModalText>
{browser.i18n.getMessage("setting_reset_description")}
</ModalText>
<Spacer y={0.75} />
<ResetButton onClick={reset}>
{browser.i18n.getMessage("confirm")}
</ResetButton>
</Modal>
</ModalV2>
</>
);
}
Expand All @@ -83,15 +92,16 @@ const Warning = styled(Text)`
color: #ff0000;
`;

const ResetButton = styled(Button).attrs({
const ResetButton = styled(ButtonV2).attrs({
secondary: true,
fullWidth: true
})`
background-color: rgba(255, 0, 0, 0.2);
color: #ff0000;
})<{ displayTheme: DisplayTheme }>`
background-color: ${(props) => props.theme.delete};
border: 1.5px solid ${(props) => props.theme.fail};
color: #ffffff;

&:hover:not(:active):not(:disabled) {
box-shadow: 0 0 0 0.19rem rgb(255, 0, 0, 0.2);
&:hover {
background-color: ${(props) => props.theme.secondaryDelete};
}
`;

Expand Down
Loading
Loading