Merge branch 'main' into styles/fix-failed-pill

iotaledger · May 15, 2024 · 138a94e · 138a94e
2 parents e7413cd + 11bf3d9
commit 138a94e
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 14 deletions.
diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/package.json b/api/package.json
@@ -1,7 +1,7 @@
 {
     "name": "explorer-api",
     "description": "API for Tangle Explorer",
-    "version": "4.0.0-rc.2",
+    "version": "4.0.0",
     "author": "Martyn Janes <[email protected]>",
     "repository": {
         "type": "git",

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,7 +1,7 @@
 {
     "name": "explorer-client",
     "description": "Tangle Explorer UI",
-    "version": "4.0.0-rc.2",
+    "version": "4.0.0",
     "author": "Martyn Janes <[email protected]>",
     "type": "module",
     "repository": {

diff --git a/client/src/app/components/nova/OutputView.scss b/client/src/app/components/nova/OutputView.scss
@@ -33,6 +33,10 @@
                 height: auto;
             }
 
+            @include phone-down {
+                flex-wrap: wrap;
+            }
+
             .output-header {
                 display: flex;
                 width: 100%;
@@ -62,6 +66,9 @@
                 }
             }
 
+            .row.middle {
+                margin: 5px 10px;
+            }
             .amount-size {
                 width: min-content;
                 text-align: end;

diff --git a/client/src/app/components/nova/OutputView.tsx b/client/src/app/components/nova/OutputView.tsx
@@ -92,14 +92,14 @@ const OutputView: React.FC<OutputViewProps> = ({ outputId, output, showCopyAmoun
 
     const header = (
         <div onClick={() => setIsExpanded(!isExpanded)} className="card--value card-header--wrapper">
-            <div
-                className={classNames("card--content--dropdown", {
-                    opened: isExpanded,
-                })}
-            >
-                <DropdownIcon />
-            </div>
             <div className="output-header">
+                <div
+                    className={classNames("card--content--dropdown", {
+                        opened: isExpanded,
+                    })}
+                >
+                    <DropdownIcon />
+                </div>
                 <button type="button" className="output-type--name color">
                     {NameHelper.getOutputTypeName(output.type)}
                 </button>

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "explorer",
     "description": "Tangle Explorer",
-    "version": "4.0.0-rc.2",
+    "version": "4.0.0",
     "scripts": {
         "setup:client": "cd client && npm install && npm run postinstall",
         "setup:api": "cd api && npm install && npm run build-compile && npm run build-config",