Merge branch 'main' into feat/remove-authenticators

Signed-off-by: Burnt Val <[email protected]>
burnt-labs · May 16, 2024 · c92be87 · c92be87
2 parents 045be59 + 47e5d0a
commit c92be87
Show file tree

Hide file tree

Showing 41 changed files with 1,787 additions and 1,771 deletions.
diff --git a/.changeset/nine-parrots-doubt.md b/.changeset/nine-parrots-doubt.md
@@ -0,0 +1,6 @@
+---
+"abstraxion-dashboard": minor
+"@burnt-labs/ui": minor
+---
+
+Added UI Fixes and new button style
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -53,6 +53,7 @@
     "neat-pillows-lie",
     "new-shrimps-listen",
     "new-timers-sleep",
+    "nine-parrots-doubt",
     "odd-bananas-drum",
     "odd-planets-hammer",
     "poor-papayas-grin",
@@ -77,6 +78,7 @@
     "tame-cows-add",
     "tasty-masks-kiss",
     "three-oranges-retire",
+    "tiny-steaks-wink",
     "tough-dolls-count",
     "tough-radios-look",
     "twelve-bulldogs-collect",

diff --git a/.changeset/tiny-steaks-wink.md b/.changeset/tiny-steaks-wink.md
@@ -0,0 +1,6 @@
+---
+"@burnt-labs/abstraxion-core": minor
+"@burnt-labs/abstraxion": minor
+---
+
+Refactor abstraxion to implement core; clean up and fix AbstraxionAuth class; impl unit tests for AbstraxionAuth
diff --git a/apps/abstraxion-dashboard/CHANGELOG.md b/apps/abstraxion-dashboard/CHANGELOG.md
@@ -1,5 +1,17 @@
 # abstraxion-dashboard
 
+## 0.2.0-alpha.26
+
+### Minor Changes
+
+- [#176](https://github.com/burnt-labs/xion.js/pull/176) [`a80ed9c`](https://github.com/burnt-labs/xion.js/commit/a80ed9c32f0c5c91a8ec7aacfba5bddddfc43f84) Thanks [@BurntNerve](https://github.com/BurntNerve)! - Added UI Fixes and new button style
+
+### Patch Changes
+
+- Updated dependencies [[`a80ed9c`](https://github.com/burnt-labs/xion.js/commit/a80ed9c32f0c5c91a8ec7aacfba5bddddfc43f84), [`b3ecf24`](https://github.com/burnt-labs/xion.js/commit/b3ecf24cf8c240c2b0c721ed803decca9f6a91a4)]:
+  - @burnt-labs/ui@0.1.0-alpha.12
+  - @burnt-labs/abstraxion@1.0.0-alpha.45
+
 ## 0.2.0-alpha.25
 
 ### Minor Changes

diff --git a/apps/abstraxion-dashboard/components/AbstraxionSignin/index.tsx b/apps/abstraxion-dashboard/components/AbstraxionSignin/index.tsx
@@ -109,7 +109,7 @@ export const AbstraxionSignin = () => {
   }, [timeLeft]);
 
   return (
-    <ModalSection>
+    <ModalSection className="!ui-justify-center sm:ui-py-5 sm:ui-px-7">
       {isOnOtpStep ? (
         <>
           <div className="ui-flex ui-flex-col ui-w-full ui-text-center">
@@ -129,17 +129,30 @@ export const AbstraxionSignin = () => {
             onKeyDown={(e) => e.key === "Enter" && handleOtp(e)}
           />
           <div className="ui-flex ui-w-full ui-flex-col ui-items-center ui-gap-4">
-            <Button fullWidth={true} onClick={handleOtp} disabled={!!otpError}>
-              Confirm
-            </Button>
             <Button
-              structure="outlined"
+              className="ui-mt-7"
               fullWidth={true}
-              onClick={handleEmail}
-              disabled={!!timeLeft}
+              onClick={handleOtp}
+              disabled={!!otpError}
             >
-              Resend Code {timeLeft && `in ${timeLeft} seconds`}
+              Confirm
             </Button>
+
+            {timeLeft ? (
+              <div className="ui-text-sm ui-pt-3 ui-mt-3 ui-text-inactive">
+                RESEND {`IN ${timeLeft}S`}
+              </div>
+            ) : (
+              <Button
+                className="ui-mt-2"
+                structure="outlined"
+                fullWidth={true}
+                onClick={handleEmail}
+                disabled={!!timeLeft}
+              >
+                Resend Code {timeLeft && `in ${timeLeft} seconds`}
+              </Button>
+            )}
           </div>
         </>
       ) : (

diff --git a/apps/abstraxion-dashboard/components/AbstraxionWallets/index.tsx b/apps/abstraxion-dashboard/components/AbstraxionWallets/index.tsx
@@ -140,7 +140,7 @@ export const AbstraxionWallets = () => {
               Welcome
             </h1>
             <h2 className="ui-font-akkuratLL ui-w-full ui-mb-4 ui-text-center ui-text-sm ui-font-normal ui-leading-tight ui-text-white/50">
-              Select an account to continue
+              Choose an account to continue
             </h2>
           </div>
           <div className="ui-flex ui-w-full ui-flex-col ui-items-start ui-justify-center ui-gap-4">
@@ -209,7 +209,7 @@ export const AbstraxionWallets = () => {
               </Button>
             ) : null}
             <Button
-              structure="destructive"
+              structure="destructive-outline"
               fullWidth={true}
               onClick={handleDisconnect}
             >

diff --git a/apps/abstraxion-dashboard/components/AccountInfo.tsx b/apps/abstraxion-dashboard/components/AccountInfo.tsx
@@ -5,6 +5,10 @@ import {
   EmailIcon,
   AccountWalletLogo,
   EthereumLogo,
+  TrashIcon,
+  Popover,
+  PopoverTrigger,
+  PopoverContent,
 } from "@burnt-labs/ui";
 import { CopyIcon } from "@/components/Icons";
 import { truncateAddress } from "@/utils";
@@ -14,7 +18,6 @@ import type {
   AuthenticatorNodes,
   authenticatorTypes,
 } from "@/types";
-import { TrashIcon } from "@burnt-labs/ui";
 
 const AddAuthenticatorsModal = dynamic<{
   isOpen: boolean;
@@ -123,7 +126,14 @@ export const AccountInfo = ({ account }: { account?: AbstraxionAccount }) => {
         <p className="ui-text-white ui-text-base ui-font-normal ui-font-akkuratLL ui-leading-normal">
           {truncateAddress(account?.id)}
         </p>
-        <CopyIcon color="white" />
+        <Popover>
+          <PopoverTrigger>
+            <CopyIcon color="white" />
+          </PopoverTrigger>
+          <PopoverContent>
+            <p>Copied!</p>
+          </PopoverContent>
+        </Popover>
       </div>
       <div className="ui-flex">
         <div className="ui-flex ui-flex-1 ui-flex-col">

diff --git a/apps/abstraxion-dashboard/components/Icons/Xion.tsx b/apps/abstraxion-dashboard/components/Icons/Xion.tsx
@@ -0,0 +1,24 @@
+export const XionIcon = () => (
+  <svg
+    width="40"
+    height="40"
+    viewBox="0 0 40 40"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <rect width="40" height="40" rx="20" fill="black" />
+    <rect
+      x="0.5"
+      y="0.5"
+      width="39"
+      height="39"
+      rx="19.5"
+      stroke="white"
+      stroke-opacity="0.2"
+    />
+    <path
+      d="M18.4173 20.7147C17.1692 19.2613 16.6361 17.9667 16.6361 16.6853C16.6361 15.928 16.7162 15.4533 16.8218 15.016C16.2111 16.3093 16 17.2773 16 18.1893C16 23.02 20.439 23.6427 20.439 27.0613C20.439 27.8867 20.0007 29.008 18.5188 31.1093C22.9832 25.164 24.119 23.0253 24.119 21.5413C24.119 17.3893 19.6974 16.692 19.6974 12.0227C19.6974 10.9573 20.308 9.67467 21.4505 8C21.4505 8 20.3642 9.524 19.7776 10.3387C17.689 13.24 16.8806 17.0067 18.4146 20.7173L18.4173 20.7147Z"
+      fill="white"
+    />
+  </svg>
+);
diff --git a/apps/abstraxion-dashboard/components/Icons/index.ts b/apps/abstraxion-dashboard/components/Icons/index.ts
@@ -7,3 +7,4 @@ export { AvatarIcon } from "./Avatar";
 export { ChevronDownIcon } from "./ChevronDown";
 export { WalletIcon } from "./Wallet";
 export { CloseIcon } from "./Close";
+export { XionIcon } from "./Xion";
diff --git a/apps/abstraxion-dashboard/components/WalletSend/WalletSendForm.tsx b/apps/abstraxion-dashboard/components/WalletSend/WalletSendForm.tsx
@@ -6,6 +6,7 @@ import { ErrorDisplay } from "@/components/ErrorDisplay";
 import { useAbstraxionAccount } from "@/hooks";
 import { formatBalance, isValidWalletAddress } from "@/utils";
 import { USDCIcon } from "../Icons/USDC";
+import { XionIcon } from "../Icons";
 
 export function WalletSendForm({
   sendTokens,
@@ -191,13 +192,16 @@ export function WalletSendForm({
         </>
       ) : (
         <>
-          <div className="ui-flex ui-flex-col ui-p-0 ui-gap-8">
+          <div className="ui-flex ui-flex-col ui-p-0 ui-gap-8 ui-max-h-full ui-overflow-y-auto ui-mt-2">
             <h1 className="ui-w-full ui-text-center ui-text-3xl ui-font-akkuratLL ui-font-thin">
               SEND
             </h1>
             <div className="ui-flex ui-flex-col">
               <div className="ui-flex ui-items-center ui-p-4 ui-bg-black ui-rounded-lg">
-                <USDCIcon color="black" />
+                <div className="ui-mr-2">
+                  <XionIcon />
+                </div>
+
                 <div className="ui-flex ui-flex-col ui-items-start">
                   <p className="ui-text-md ui-font-bold ui-text-white">XION</p>
                   <p className="ui-text-md ui-text-white">

diff --git a/apps/abstraxion-dashboard/package.json b/apps/abstraxion-dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "abstraxion-dashboard",
-  "version": "0.2.0-alpha.25",
+  "version": "0.2.0-alpha.26",
   "private": true,
   "scripts": {
     "dev": "next dev --port 3000",

diff --git a/apps/abstraxion-dashboard/tailwind.config.ts b/apps/abstraxion-dashboard/tailwind.config.ts
@@ -15,6 +15,7 @@ const config: Config = {
         "mainnet-bg": "rgba(4, 199, 0, 0.2)",
         testnet: "#FFAA4A",
         "testnet-bg": "rgba(255, 170, 74, 0.2)",
+        inactive: "#BDBDBD",
       },
       flexGrow: {
         "2": "2",

diff --git a/apps/abstraxion-settings/CHANGELOG.md b/apps/abstraxion-settings/CHANGELOG.md
@@ -1,5 +1,13 @@
 # abstraxion-settings
 
+## 1.1.0-alpha.4
+
+### Patch Changes
+
+- Updated dependencies [[`a80ed9c`](https://github.com/burnt-labs/xion.js/commit/a80ed9c32f0c5c91a8ec7aacfba5bddddfc43f84), [`b3ecf24`](https://github.com/burnt-labs/xion.js/commit/b3ecf24cf8c240c2b0c721ed803decca9f6a91a4)]:
+  - @burnt-labs/ui@0.1.0-alpha.12
+  - @burnt-labs/abstraxion@1.0.0-alpha.45
+
 ## 1.1.0-alpha.3
 
 ### Minor Changes

diff --git a/apps/abstraxion-settings/package.json b/apps/abstraxion-settings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "abstraxion-settings",
-  "version": "1.1.0-alpha.3",
+  "version": "1.1.0-alpha.4",
   "private": true,
   "type": "module",
   "scripts": {

diff --git a/apps/demo-app/CHANGELOG.md b/apps/demo-app/CHANGELOG.md
@@ -1,5 +1,13 @@
 # demo-app
 
+## 1.1.0-alpha.30
+
+### Patch Changes
+
+- Updated dependencies [[`a80ed9c`](https://github.com/burnt-labs/xion.js/commit/a80ed9c32f0c5c91a8ec7aacfba5bddddfc43f84), [`b3ecf24`](https://github.com/burnt-labs/xion.js/commit/b3ecf24cf8c240c2b0c721ed803decca9f6a91a4)]:
+  - @burnt-labs/ui@0.1.0-alpha.12
+  - @burnt-labs/abstraxion@1.0.0-alpha.45
+
 ## 1.1.0-alpha.29
 
 ### Patch Changes

diff --git a/apps/demo-app/package.json b/apps/demo-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "demo-app",
-  "version": "1.1.0-alpha.29",
+  "version": "1.1.0-alpha.30",
   "private": true,
   "scripts": {
     "dev": "next dev --port 3001",

diff --git a/packages/abstraxion-core/CHANGELOG.md b/packages/abstraxion-core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @burnt-labs/abstraxion-core
 
+## 1.0.0-alpha.41
+
+### Minor Changes
+
+- [#174](https://github.com/burnt-labs/xion.js/pull/174) [`b3ecf24`](https://github.com/burnt-labs/xion.js/commit/b3ecf24cf8c240c2b0c721ed803decca9f6a91a4) Thanks [@BurntVal](https://github.com/BurntVal)! - Refactor abstraxion to implement core; clean up and fix AbstraxionAuth class; impl unit tests for AbstraxionAuth
+
 ## 1.0.0-alpha.40
 
 ### Minor Changes

diff --git a/packages/abstraxion-core/babel.config.js b/packages/abstraxion-core/babel.config.js
@@ -0,0 +1,6 @@
+module.exports = {
+  presets: [
+    ["@babel/preset-env", { targets: { node: "current" } }],
+    "@babel/preset-typescript",
+  ],
+};