LaconicNetwork/vega-frontend-monorepo
6
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into chore/2764-link-to-mainnet-incident-reports

Browse Source
This commit is contained in:
maciek
2023-03-21 15:33:59 +01:00
parent 68d9e54a84 b2dd053621
commit ddd60cfbda
6 changed files with 67 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/explorer/src/app/app.tsx
+1 -1
View File
@@ -71,8 +71,8 @@ function App() {
)}
>
<div>
<Header />
<MainnetSimAd />
<Header />
</div>
<div>
<Main />
apps/governance/src/components/page-templates/template-sidebar.tsx
+3 -3
View File
@@ -21,9 +21,9 @@ export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
<>
<AnnouncementBanner>
<div className="font-alpha calt uppercase text-center text-lg text-white">
<span className="pr-4">Mainnet sim 3 is live!</span>
<ExternalLink href="https://fairground.wtf/">
Come help stress test the network
<span className="pr-4">Wait no longer, SIM3 is here!</span>
<ExternalLink href="https://fairground.wtf/sim3">
Learn more
</ExternalLink>
</div>
</AnnouncementBanner>
apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx
+7 -2
View File
@@ -2,7 +2,7 @@ import type { Dispatch, SetStateAction } from 'react';
import { forwardRef, useMemo, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
import { Button } from '@vegaprotocol/ui-toolkit';
import { Button, Icon } from '@vegaprotocol/ui-toolkit';
import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
import { useAppState } from '../../../../contexts/app-state/app-state-context';
import { BigNumber } from '../../../../lib/bignumber';
@@ -87,7 +87,12 @@ const TopThirdCellRenderer = (
<div className="mb-4">
<Button
data-testid="show-all-validators"
rightIcon="arrow-right"
rightIcon={
<Icon
name="arrow-right"
className="fill-current mr-2 align-text-top"
/>
}
className="inline-flex items-center"
>
{t('Reveal top validators')}
apps/static/src/assets/mainnet-tranches.json
+49 -26
View File
@@ -397,7 +397,7 @@
"tranche_end": "2023-04-06T00:00:00.000Z",
"total_added": "14099",
"total_removed": "103.66810558436",
"locked_amount": "7501.242824820788581",
"locked_amount": "7046.25213448327308393",
"deposits": [
{
"amount": "30",
@@ -3150,7 +3150,7 @@
"tranche_end": "2023-12-05T00:00:00.000Z",
"total_added": "86666.297",
"total_removed": "0",
"locked_amount": "61614.5761032707477280162",
"locked_amount": "61377.0380077229517145266",
"deposits": [
{
"amount": "86666.297",
@@ -3216,7 +3216,7 @@
"tranche_end": "2023-06-01T00:00:00.000Z",
"total_added": "2500",
"total_removed": "0",
"locked_amount": "995.78659188034185",
"locked_amount": "982.04476368538875",
"deposits": [
{
"amount": "2500",
@@ -3337,7 +3337,7 @@
"tranche_end": "2023-09-01T00:00:00.000Z",
"total_added": "17500",
"total_removed": "0",
"locked_amount": "15644.7397720410615",
"locked_amount": "15549.59254856078925",
"deposits": [
{
"amount": "12500",
@@ -3604,7 +3604,7 @@
"tranche_end": "2023-08-01T00:00:00.000Z",
"total_added": "37500",
"total_removed": "4168.8799683",
"locked_amount": "27657.44417587477125",
"locked_amount": "27450.177927409455",
"deposits": [
{
"amount": "7500",
@@ -3858,7 +3858,7 @@
"tranche_end": "2023-12-05T00:00:00.000Z",
"total_added": "129999.45",
"total_removed": "0",
"locked_amount": "61558.360555219738687428",
"locked_amount": "61321.03918329595155663",
"deposits": [
{
"amount": "129999.45",
@@ -3924,7 +3924,7 @@
"tranche_end": "2023-09-03T00:00:00.000Z",
"total_added": "62600",
"total_removed": "0",
"locked_amount": "28554.73512176560218",
"locked_amount": "28383.158796296293004",
"deposits": [
{
"amount": "10000",
@@ -4117,7 +4117,7 @@
"tranche_end": "2023-09-17T00:00:00.000Z",
"total_added": "5000",
"total_removed": "0",
"locked_amount": "2472.5104642313545",
"locked_amount": "2458.80628488077125",
"deposits": [
{
"amount": "5000",
@@ -4328,7 +4328,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "97499.58",
"total_removed": "0",
"locked_amount": "3605.2189069112998031292",
"locked_amount": "3372.42874853983868872152",
"deposits": [
{
"amount": "97499.58",
@@ -4361,7 +4361,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "135173.4239508",
"total_removed": "98230.390980249184455396",
"locked_amount": "4927.711830669167463838379676",
"locked_amount": "4609.52787371962804593148614",
"deposits": [
{
"amount": "135173.4239508",
@@ -4407,7 +4407,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "32499.86",
"total_removed": "0",
"locked_amount": "1516.65333533718349853464",
"locked_amount": "1418.7225357813199840908",
"deposits": [
{
"amount": "32499.86",
@@ -4440,7 +4440,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "10833.29",
"total_removed": "0",
"locked_amount": "493.6559433966499033786",
"locked_amount": "461.78041843920188694336",
"deposits": [
{
"amount": "10833.29",
@@ -4473,7 +4473,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "22749.93",
"total_removed": "4720.860935375",
"locked_amount": "1845.3961724803675845138",
"locked_amount": "1726.238340919501820208",
"deposits": [
{
"amount": "6500",
@@ -4625,7 +4625,7 @@
"tranche_end": "2023-05-01T00:00:00.000Z",
"total_added": "22500",
"total_removed": "5705.915726625",
"locked_amount": "5158.00241712707175",
"locked_amount": "5033.64266804788245",
"deposits": [
{
"amount": "7500",
@@ -4999,7 +4999,7 @@
"tranche_end": "2023-06-02T00:00:00.000Z",
"total_added": "1939928.38",
"total_removed": "928642.9598472029154",
"locked_amount": "390607.3105668073434008876",
"locked_amount": "385290.2852774460795546444",
"deposits": [
{
"amount": "1852091.69",
@@ -38560,7 +38560,7 @@
"tranche_end": "2023-06-05T00:00:00.000Z",
"total_added": "3732368.4671",
"total_removed": "700133.348465855088393",
"locked_amount": "624728.766049120329868954865",
"locked_amount": "616558.254844245203029416604",
"deposits": [
{
"amount": "1998.95815",
@@ -39942,7 +39942,7 @@
"tranche_end": "2023-12-05T00:00:00.000Z",
"total_added": "15870102.715470999700000001",
"total_removed": "807976.47753785751485452",
"locked_amount": "7514935.67863045306513944505981554181184104",
"locked_amount": "7485963.5704949245127701049400142159529602",
"deposits": [
{
"amount": "16249.93",
@@ -46124,7 +46124,7 @@
"tranche_end": "2023-05-05T00:00:00.000Z",
"total_added": "14597706.0446472999",
"total_removed": "5739280.046176576455435006",
"locked_amount": "1216295.408903970030331419919234392",
"locked_amount": "1189548.543661907897106390566352888",
"deposits": [
{
"amount": "129284.449",
@@ -53501,7 +53501,7 @@
"tranche_end": "2023-04-05T00:00:00.000Z",
"total_added": "5778205.3912159303",
"total_removed": "3381706.364737906998719578",
"locked_amount": "163662.268611167760817574213190939",
"locked_amount": "153094.4203903347145197084296756042",
"deposits": [
{
"amount": "552496.6455",
@@ -55628,8 +55628,8 @@
"tranche_start": "2022-06-05T00:00:00.000Z",
"tranche_end": "2023-06-05T00:00:00.000Z",
"total_added": "472355.6199999996",
"total_removed": "38160.8304770401949",
"locked_amount": "98991.844082355328981811201217648",
"total_removed": "38333.9918862181949",
"locked_amount": "97697.179877309680164045233181108",
"deposits": [
{
"amount": "3000",
@@ -62313,6 +62313,16 @@
"user": "0xDE11ed98FeDe5253d2352272292C72B5bD5A10c1",
"tx": "0xb0e33a0a4f5b9fd30341e399361470089901580f1e8e2c2dd54f2bc272dffe4c"
},
{
"amount": "15.02267884",
"user": "0x4eD2b3c68BB4fda084ce1591a210F4aC8b71234A",
"tx": "0x96b4489c1be11b1cca095af84ce8f0e1a90a8750cdf0f941da686fa2febfe402"
},
{
"amount": "158.138730338",
"user": "0x059564aD4400a54D8442d59746A89ac5B51bD502",
"tx": "0xf906b4925d5b67c8e516612123d88ec03235d6edd91d7a380d595659851f2540"
},
{
"amount": "129.867928716",
"user": "0x09996E1a67c371400bD5f52DF841f77B1741eB9d",
@@ -75616,10 +75626,17 @@
"tx": "0x716a7be06da5a7a3d8038907974887a31805ea8eeab5d130cba528e4d2094d9f"
}
],
"withdrawals": [],
"withdrawals": [
{
"amount": "158.138730338",
"user": "0x059564aD4400a54D8442d59746A89ac5B51bD502",
"tranche_id": 5,
"tx": "0xf906b4925d5b67c8e516612123d88ec03235d6edd91d7a380d595659851f2540"
}
],
"total_tokens": "200",
"withdrawn_tokens": "0",
"remaining_tokens": "200"
"withdrawn_tokens": "158.138730338",
"remaining_tokens": "41.861269662"
},
{
"address": "0x86a3b7ED5EA887Bd0262ED6C4d2AD17dB3301530",
@@ -76047,6 +76064,12 @@
}
],
"withdrawals": [
{
"amount": "15.02267884",
"user": "0x4eD2b3c68BB4fda084ce1591a210F4aC8b71234A",
"tranche_id": 5,
"tx": "0x96b4489c1be11b1cca095af84ce8f0e1a90a8750cdf0f941da686fa2febfe402"
},
{
"amount": "18.456316592",
"user": "0x4eD2b3c68BB4fda084ce1591a210F4aC8b71234A",
@@ -76139,8 +76162,8 @@
}
],
"total_tokens": "400",
"withdrawn_tokens": "301.206075596",
"remaining_tokens": "98.793924404"
"withdrawn_tokens": "316.228754436",
"remaining_tokens": "83.771245564"
},
{
"address": "0x5c90765F50629570738fEe7b7FA82ae118f81Ed1",
libs/ui-toolkit/package.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"name": "@vegaprotocol/ui-toolkit",
"version": "0.7.0"
"version": "0.8.0"
}
libs/ui-toolkit/src/components/button/button.tsx
+6 -12
View File
@@ -4,8 +4,6 @@ import type {
ReactNode,
} from 'react';
import { forwardRef } from 'react';
import type { IconName } from '../icon';
import { Icon } from '../icon';
import classnames from 'classnames';
export type ButtonVariant = 'default' | 'primary' | 'secondary' | 'ternary';
@@ -76,8 +74,8 @@ interface CommonProps {
disabled?: boolean;
fill?: boolean;
size?: ButtonSize;
icon?: IconName;
rightIcon?: IconName;
icon?: ReactNode;
rightIcon?: ReactNode;
}
export interface ButtonProps
extends ButtonHTMLAttributes<HTMLButtonElement>,
@@ -151,17 +149,13 @@ export const ButtonLink = forwardRef<HTMLButtonElement, ButtonLinkProps>(
interface ButtonContentProps {
children: ReactNode;
icon?: IconName;
rightIcon?: IconName;
icon?: ReactNode;
rightIcon?: ReactNode;
}
const ButtonContent = ({ children, icon, rightIcon }: ButtonContentProps) => {
const iconEl = icon ? (
<Icon name={icon} className="fill-current mr-2 align-text-top" />
) : null;
const rightIconEl = rightIcon ? (
<Icon name={rightIcon} className="fill-current ml-2 align-text-top" />
) : null;
const iconEl = icon ? icon : null;
const rightIconEl = rightIcon ? rightIcon : null;
return (
<>