Merge pull request #521 from arconnectio/development

ArConnect BETA 1.19.3

.editorconfig

@@ -0,0 +1,16 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{sh,bash}]
+end_of_line = lf

.env.example

@@ -0,0 +1 @@
+PLASMO_PUBLIC_APP_TYPE=extension

.github/CONTRIBUTING.md

@@ -2,6 +2,8 @@
 
 Thank you for your interest in contributing to the ArConnect extension! Below are the guidelines to help you get started.
 
+> **Important:** Always work from the "development" branch when making contributions. This ensures your changes are based on the latest development version.
+
 ## Building the Project
 
 1. **Clone the Repository:** Clone this repository to your local machine.

.gitignore

@@ -39,4 +39,4 @@ keys.json
 .tsbuildinfo
 
 # temporary remove development icon
-assets/icon.development.png
+assets/icon.development.png

assets/_locales/en/messages.json

@@ -2225,5 +2225,65 @@
   "transak_unavailable": {
     "message": "Transak is unavailable at the moment. Please try again later.",
     "description": "Transak unavailable error message"
+  },
+  "print_archived": {
+    "message": "Print archived",
+    "description": "Print archived description"
+  },
+  "new_data_uploaded": {
+    "message": "New data uploaded",
+    "description": "New data uploaded description"
+  },
+  "sent_balance": {
+      "message": "Sent $QTY$ $TICKER$ to $ADDRESS$",
+      "description": "Sent balance description",
+      "placeholders": {
+          "qty": {
+              "content": "$1",
+              "example": "10"
+          },
+          "ticker": {
+            "content": "$2",
+            "example": "AR"
+          },
+          "address": {
+              "content": "$3",
+              "example": "ljvCPN31...-CS-6Iho8U"
+          }
+      }
+  },
+  "received_balance": {
+    "message": "Received $QTY$ $TICKER$ from $ADDRESS$",
+    "description": "Received balance description",
+    "placeholders": {
+        "qty": {
+            "content": "$1",
+            "example": "10"
+        },
+        "ticker": {
+          "content": "$2",
+          "example": "AR"
+        },
+        "address": {
+            "content": "$3",
+            "example": "ljvCPN31...-CS-6Iho8U"
+        }
+    }
+  },
+  "notification_from": {
+    "message": "from",
+    "description": "From description"
+  },
+  "notification_to": {
+    "message": "to",
+    "description": "To description"
+  },
+  "new_message": {
+    "message": "New message",
+    "description": "New message description"
+  },
+  "new_transaction": {
+    "message": "New transaction",
+    "description": "New transaction description"
   }
 }

assets/_locales/zh_CN/messages.json

@@ -2211,5 +2211,65 @@
   "transak_unavailable": {
     "message": "Transak 目前不可用。请稍后再试。",
     "description": "Transak unavailable error message"
-  }
+  },
+   "print_archived": {
+    "message": "打印已归档",
+    "description": "Print archived description"
+  },
+  "new_data_uploaded": {
+    "message": "新数据已上传",
+    "description": "New data uploaded description"
+  },
+  "sent_balance": {
+      "message": "已发送 $QTY$ $TICKER$ 给 $ADDRESS$",
+      "description": "Sent balance description",
+      "placeholders": {
+          "qty": {
+              "content": "$1",
+              "example": "10"
+          },
+          "ticker": {
+            "content": "$2",
+            "example": "AR"
+          },
+          "address": {
+              "content": "$3",
+              "example": "ljvCPN31...-CS-6Iho8U"
+          }
+      }
+  },
+  "received_balance": {
+      "message": "收到 $QTY$ $TICKER$ 来自 $ADDRESS$",
+      "description": "Received balance description",
+      "placeholders": {
+          "qty": {
+              "content": "$1",
+              "example": "10"
+          },
+          "ticker": {
+            "content": "$2",
+            "example": "AR"
+          },
+          "address": {
+              "content": "$3",
+              "example": "ljvCPN31...-CS-6Iho8U"
+          }
+      }
+  },
+    "notification_from": {
+        "message": "来自",
+        "description": "From description"
+    },
+    "notification_to": {
+        "message": "至",
+        "description": "To description"
+    },
+    "new_message": {
+        "message": "新消息",
+        "description": "New message description"
+    },
+    "new_transaction": {
+        "message": "新交易",
+        "description": "New transaction description"
+    }
 }

assets/popup.css

@@ -0,0 +1,122 @@
+@font-face {
+    font-family: "ManropeLocal";
+    font-style: normal;
+    font-weight: 300;
+    src: url(/assets/fonts/Manrope-Light.woff2) format('woff2');
+}
+
+@font-face {
+    font-family: "ManropeLocal";
+    font-style: normal;
+    font-weight: 400;
+    src: url(/assets/fonts/Manrope-Regular.woff2) format('woff2');
+}
+
+@font-face {
+    font-family: "ManropeLocal";
+    font-style: normal;
+    font-weight: 500;
+    src: url(/assets/fonts/Manrope-Medium.woff2) format('woff2');
+}
+
+@font-face {
+    font-family: "ManropeLocal";
+    font-style: normal;
+    font-weight: 600;
+    src: url(/assets/fonts/Manrope-SemiBold.woff2) format('woff2');
+}
+
+@font-face {
+    font-family: "ManropeLocal";
+    font-style: normal;
+    font-weight: 600;
+    src: url(/assets/fonts/Manrope-Bold.woff2) format('woff2');
+}
+
+@font-face {
+    font-family: "ManropeLocal";
+    font-style: normal;
+    font-weight: 700;
+    src: url(/assets/fonts/Manrope-ExtraBold.woff2) format('woff2');
+}
+
+* {
+    scrollbar-width: none;
+}
+
+*::-webkit-scrollbar {
+    display: none
+}
+
+::selection {
+    background-color: rgba(171, 154, 255, .6);
+    color: #fff;
+}
+
+:root {
+    --defaultBackgroundColor: white;
+}
+
+@media (prefers-color-scheme: dark) {
+    :root {
+        --defaultBackgroundColor: black;
+    }
+}
+
+body {
+    margin: 0;
+    padding: 0;
+}
+
+body#popup {
+    width: 377px;
+    height: 600px;
+}
+
+body.fullscreen {
+    width: 377px;
+    height: 100vh;
+    margin: 0 auto;
+}
+
+body.fullscreen::before {
+    content: "";
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    width: 377px;
+    height: 100vh;
+    transform: translate(-50%, -50%);
+    pointer-events: none;
+    box-shadow: 0 0 128px 0 rgba(171, 154, 255, .4);
+}
+
+body,
+button,
+input,
+select,
+textarea {
+    font-family: "ManropeLocal", "Manrope VF", "Manrope", sans-serif !important;
+}
+
+button {
+    background: transparent;
+    border: 0;
+    padding: 0;
+}
+
+#cover {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 99999999;
+    background-color: var(--backgroundColor, var(--defaultBackgroundColor, white));
+    transition: background-color linear 230ms;
+}
+
+#cover[aria-hidden] {
+    background: transparent;
+    pointer-events: none;
+}

assets/popup.js

@@ -0,0 +1,3 @@
+const backgroundColor = localStorage.getItem("ARCONNECT_THEME_BACKGROUND_COLOR");
+
+if (backgroundColor) document.documentElement.style.setProperty('--backgroundColor', backgroundColor);

package.json

@@ -7,10 +7,11 @@
   "packageManager": "[email protected]",
   "homepage": "https://arconnect.io",
   "scripts": {
-    "dev:chrome": "plasmo dev",
+    "dev:chrome": "plasmo dev --verbose",
     "build:chrome": "plasmo build --no-hoist",
     "dev:firefox": "plasmo dev --target=firefox-mv2",
     "build:firefox": "plasmo build --target=firefox-mv2 --no-hoist",
+    "nuke": "rm -rf node_modules build .plasmo",
     "fmt": "prettier --write .",
     "fmt:check": "prettier --check .",
     "prepare": "husky install"
@@ -70,7 +71,7 @@
     "check-password-strength": "^2.0.7",
     "copy-to-clipboard": "^3.3.2",
     "dayjs": "^1.11.6",
-    "framer-motion": "7.5.3",
+    "framer-motion": "^11.11.7",
     "human-crypto-keys": "^0.1.4",
     "js-confetti": "^0.11.0",
     "mitt": "^3.0.0",

src/components/SliderMenu.tsx

@@ -7,13 +7,15 @@ import styled, { useTheme } from "styled-components";
 
 interface SliderMenuProps {
   title: string;
+  hasNav?: boolean;
   isOpen: boolean;
   onClose?: () => void;
   children?: React.ReactNode;
 }
 
 export default function SliderMenu({
   title,
+  hasNav,
   isOpen,
   onClose,
   children
@@ -37,6 +39,7 @@ export default function SliderMenu({
 
       <Wrapper
         displayTheme={theme.displayTheme}
+        hasNav={hasNav}
         ref={wrapperElementRef}
         variants={animationSlideFromBottom}
         initial="hidden"
@@ -61,12 +64,15 @@ const ExitButton = styled(CloseIcon)`
   cursor: pointer;
 `;
 
-const Wrapper = styled(motion.div)<{ displayTheme: DisplayTheme }>`
+const Wrapper = styled(motion.div)<{
+  displayTheme: DisplayTheme;
+  hasNav: boolean;
+}>`
   position: fixed;
   bottom: 0;
   left: 0;
   height: auto;
-  max-height: 93%;
+  max-height: calc(100% - 66px);
   border-top: ${(props) =>
     props.displayTheme === "light"
       ? `1px solid ${props.theme.primary}`
@@ -79,6 +85,8 @@ const Wrapper = styled(motion.div)<{ displayTheme: DisplayTheme }>`
   background-color: ${(props) =>
     props.displayTheme === "light" ? "#ffffff" : "#191919"};
   border-radius: 10px 10px 0 0;
+  padding-bottom: ${(props) => (props.hasNav ? "66px" : "0")};
+  box-sizing: border-box;
 `;
 
 export const animationSlideFromBottom: Variants = {

src/components/dashboard/Wallets.tsx

@@ -5,7 +5,6 @@ import { useStorage } from "@plasmohq/storage/hook";
 import { type AnsUser, getAnsProfile } from "~lib/ans";
 import { ExtensionStorage } from "~utils/storage";
 import { useLocation, useRoute } from "wouter";
-import { PlusIcon } from "@iconicicons/react";
 import type { StoredWallet } from "~wallets";
 import { Reorder } from "framer-motion";
 import WalletListItem from "./list/WalletListItem";