Merge pull request #300 from arconnectio/development

ArConnect BETA 1.9.0
arconnectio · Apr 12, 2024 · ee70163 · ee70163
2 parents 61b7a3e + 4dc5440
commit ee70163
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 42 deletions.
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     ]
   },
   "dependencies": {
-    "@arconnect/components": "^0.3.6",
+    "@arconnect/components": "^0.3.7",
     "@arconnect/keystone-sdk": "^0.0.5",
     "@arconnect/warp-dre": "^0.0.1",
     "@arconnect/webext-bridge": "^5.0.6",

diff --git a/src/api/modules/sign_message/sign_message.background.ts b/src/api/modules/sign_message/sign_message.background.ts
@@ -56,7 +56,7 @@ const background: ModuleFunction<number[]> = async (
     // hashing 2 times ensures that the app is not draining the user's wallet
     // credits to Arweave.app
     const signature = await crypto.subtle.sign(
-      { name: "RSA-RSS", saltLength: 32 },
+      { name: "RSA-PSS", saltLength: 32 },
       cryptoKey,
       hash
     );

diff --git a/src/components/arlocal/Transaction.tsx b/src/components/arlocal/Transaction.tsx
@@ -320,7 +320,7 @@ export default function Transaction({ arweave }: Props) {
         </>
       )}
       <Spacer y={1.35} />
-      <Button fullWidth onClick={sendTransaction}>
+      <Button fullWidth loading={sendingTx} onClick={sendTransaction}>
         {browser.i18n.getMessage("sendTransaction")}
       </Button>
     </>

diff --git a/src/components/dashboard/Contacts.tsx b/src/components/dashboard/Contacts.tsx
@@ -208,9 +208,7 @@ const SearchWrapper = styled.div`
   background-color: rgb(${(props) => props.theme.cardBackground});
 `;
 
-const AddContactButton = styled(ButtonV2).attrs({
-  secondary: true
-})`
+const AddContactButton = styled(ButtonV2)`
   width: 100%;
   height: 100%;
 `;
diff --git a/src/components/dashboard/Wallets.tsx b/src/components/dashboard/Wallets.tsx
@@ -165,7 +165,7 @@ const SearchWrapper = styled.div`
 `;
 
 const AddWalletButton = styled(ButtonV2).attrs({
-  secondary: true
+  secondary: false
 })`
   width: 100%;
   height: 100%;

diff --git a/src/components/dashboard/subsettings/AddWallet.tsx b/src/components/dashboard/subsettings/AddWallet.tsx
@@ -242,6 +242,7 @@ export default function AddWallet() {
         <ButtonV2
           fullWidth
           onClick={handleAddButton}
+          loading={loading}
           disabled={generating && isAddGeneratedWallet}
         >
           <PlusIcon />

diff --git a/src/components/dashboard/subsettings/WalletSettings.tsx b/src/components/dashboard/subsettings/WalletSettings.tsx
@@ -213,7 +213,7 @@ export default function WalletSettings({ address }: Props) {
               disabled={!!ansLabel}
             />
           </InputWrapper>
-          <IconButton secondary onClick={updateNickname} disabled={!!ansLabel}>
+          <IconButton onClick={updateNickname} disabled={!!ansLabel}>
             Save
           </IconButton>
         </InputWithBtn>

diff --git a/src/routes/welcome/load/wallets.tsx b/src/routes/welcome/load/wallets.tsx
@@ -191,7 +191,7 @@ export default function Wallets() {
       <Spacer y={1.25} />
       <KeystoneButton onSuccess={keystoneDone} />
       <Spacer y={1} />
-      <ButtonV2 fullWidth onClick={done}>
+      <ButtonV2 fullWidth onClick={done} loading={loading}>
         {browser.i18n.getMessage("next")}
         <ArrowRightIcon style={{ marginLeft: "5px" }} />
       </ButtonV2>

diff --git a/src/routes/welcome/start/index.tsx b/src/routes/welcome/start/index.tsx
@@ -33,11 +33,6 @@ export default function Start() {
 
   return (
     <Wrapper>
-      <Skip>
-        <ButtonV2 secondary onClick={() => setLocation("/generate/1")}>
-          {browser.i18n.getMessage("skip")}
-        </ButtonV2>
-      </Skip>
       <ExplainerSection>
         <ExplainTitle>{browser.i18n.getMessage(activePage.title)}</ExplainTitle>
         <Spacer y={0.5} />
@@ -59,15 +54,24 @@ export default function Start() {
           )}
         </ExplainerContent>
         <Spacer y={1.25} />
-        <ButtonV2
-          fullWidth
-          onClick={() =>
-            setLocation(page === 3 ? "/generate/1" : `/start/${page + 1}`)
-          }
-        >
-          {browser.i18n.getMessage("next")}
-          <ArrowRightIcon style={{ marginLeft: "5px" }} />
-        </ButtonV2>
+        <ButtonWrapper>
+          <ButtonV2
+            fullWidth
+            onClick={() =>
+              setLocation(page === 3 ? "/generate/1" : `/start/${page + 1}`)
+            }
+          >
+            {browser.i18n.getMessage("next")}
+            <ArrowRightIcon style={{ marginLeft: "5px" }} />
+          </ButtonV2>
+          <ButtonV2
+            secondary
+            fullWidth
+            onClick={() => setLocation("/generate/1")}
+          >
+            {browser.i18n.getMessage("skip")}
+          </ButtonV2>
+        </ButtonWrapper>
       </ExplainerSection>
       <Pagination>
         {Array(3)
@@ -158,10 +162,10 @@ const Page = styled.span<{ active?: boolean }>`
   transition: all 0.23s ease-in-out;
 `;
 
-const Skip = styled.div`
-  position: absolute;
-  top: 3rem;
-  right: 3rem;
+const ButtonWrapper = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
 `;
 
 interface PageInterface {

diff --git a/src/tabs/arlocal.tsx b/src/tabs/arlocal.tsx
@@ -194,7 +194,7 @@ function ArLocal() {
             <Spacer y={1} />
             <Transaction arweave={arweave} />
             <Spacer y={1} />
-            <Button fullWidth secondary onClick={mine}>
+            <Button fullWidth secondary loading={mining} onClick={mine}>
               {browser.i18n.getMessage("mine")}
             </Button>
           </>

diff --git a/yarn.lock b/yarn.lock
@@ -15,14 +15,14 @@
   resolved "https://registry.yarnpkg.com/@apocentre/alias-sampling/-/alias-sampling-0.5.3.tgz#897ff181b48ad7b2bcb4ecf29400214888244f08"
   integrity sha512-7UDWIIF9hIeJqfKXkNIzkVandlwLf1FWTSdrb9iXvOP8oF544JRXQjCbiTmCv2c9n44n/FIWtehhBfNuAx2CZA==
 
-"@arconnect/components@^0.3.6":
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/@arconnect/components/-/components-0.3.6.tgz#19ac4c35386f212fbb8729146d073cafe0ecad51"
-  integrity sha512-3xLPkApb5wc8pXSv9v/W9J2NtukO9dXtF6p6IdKrR/0m4ozeY5CFbBjE/eylPGsCaBLUaKdJZ7k7fj94AdxZww==
+"@arconnect/components@^0.3.7":
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/@arconnect/components/-/components-0.3.7.tgz#1f4b077885304e3e438e0fe2dd1d51ba88cec212"
+  integrity sha512-vNrWcmk+MoAeRVfSRagq1txL5sRcx863Zlm+Li7sxwgwkw6xqCRvGl8pso+KVcEObBHcNdZQ6E44pE680ttGSQ==
   dependencies:
     "@iconicicons/react" "^1.5.1"
     axios "^1.6.7"
-    framer-motion "^10.5.0"
+    framer-motion "^7.5.3"
     nanoid "^4.0.1"
     uuid "^9.0.1"
 
@@ -6571,15 +6571,6 @@ formidable@^1.2.2:
   resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.6.tgz#d2a51d60162bbc9b4a055d8457a7c75315d1a168"
   integrity sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==
 
-framer-motion@^10.5.0:
-  version "10.18.0"
-  resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-10.18.0.tgz#1f4fc51403996ea7170af885bd44a7079d255950"
-  integrity sha512-oGlDh1Q1XqYPksuTD/usb0I70hq95OUzmL9+6Zd+Hs4XV0oaISBa/UUMSjYiq6m8EUF32132mOJ8xVZS+I0S6w==
-  dependencies:
-    tslib "^2.4.0"
-  optionalDependencies:
-    "@emotion/is-prop-valid" "^0.8.2"
-
 framer-motion@^7.5.3:
   version "7.5.3"
   resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-7.5.3.tgz#a1de7d6c4abbf7333619d4a6c8df74c12240be43"