Merge branch 'main' into add-logging

Concordium · Jan 17, 2022 · f68df84 · f68df84
2 parents ff36971 + 8673ab8
commit f68df84
Show file tree

Hide file tree

Showing 279 changed files with 2,997 additions and 2,327 deletions.
diff --git a/.github/workflows/build-lint-test.yml b/.github/workflows/build-lint-test.yml
@@ -3,9 +3,9 @@ name: Build, lint and test
 on:
     # Triggers the workflow on push or pull request events but only for the main branch
     push:
-        branches: [main]
+        branches: [main, release**]
     pull_request:
-        branches: [main]
+        branches: [main, release**]
 
     # Allows us to run the workflow manually from the Actions tab
     workflow_dispatch:
@@ -77,7 +77,7 @@ jobs:
               run: yarn build-proto
 
             - name: Build
-              run: yarn build
+              run: yarn build-ci
 
             - name: Save build artifacts in cache
               uses: actions/cache@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@
 ### Added
 
 -   Added logging, which can be exported from the application menu.
+-   Allow users to verify address on Ledger device.
+
+## 1.3.1
+
+### Fixed
+
+-   Fixed identity issuance with dts.
 
 ## 1.3.0
 
@@ -21,6 +28,7 @@
 -   Updated UI to reflect the rename of GTU to CCD, meaning anywhere tokens were referred to as GTU, it now says CCD. The GTU icon has also been replaced with the icon representing CCD.
 -   Datetimes are now selected with a date picker from a calendar.
 -   Finalized transactions are no longer stored in the local database, but are instead always fetched from the wallet proxy when needed.
+-   Updated the default node configuration to point to concordiumwalletnode.com.
 
 ### Fixed
 

diff --git a/app/components/AccountCard/AccountCard.tsx b/app/components/AccountCard/AccountCard.tsx
@@ -57,7 +57,7 @@ function ShieldedBalance({
         </>
     );
 
-    const rowLeftSide = <h3>Shielded Balance:</h3>;
+    const rowLeftSide = <h3>Shielded balance:</h3>;
 
     const closeInfo = (e: SyntheticEvent) => {
         e.stopPropagation(); // So that we avoid triggering the parent's onClick
@@ -219,7 +219,7 @@ export function AccountCardView({
             />
             <SidedRow
                 className={styles.row}
-                left={<h3>Account Total:</h3>}
+                left={<h3>Account total:</h3>}
                 right={
                     <h3>
                         {displayAsGTU(shielded + unShielded)}
@@ -235,7 +235,7 @@ export function AccountCardView({
             />
             <SidedRow
                 className={styles.row}
-                left="- At Disposal:"
+                left="- At disposal:"
                 right={displayAsGTU(amountAtDisposal)}
             />
             <SidedRow

diff --git a/app/components/AddressBookEntryButton/AddressBookEntryButton.module.scss b/app/components/AddressBookEntryButton/AddressBookEntryButton.module.scss
@@ -13,7 +13,7 @@
 }
 
 .comment {
-    font-size: $font-size-body4;
+    font-size: $font-size-body5;
     color: $color-text-faded;
 }
 

diff --git a/app/components/ButtonNavLink/ButtonNavLink.tsx b/app/components/ButtonNavLink/ButtonNavLink.tsx
@@ -19,10 +19,12 @@ export default function ButtonNavLink({
     size = 'huge',
     ...props
 }: ButtonNavLinkProps): JSX.Element {
+    if (!disabled) {
+        props.activeClassName = 'active';
+    }
     return (
         <Button
             as={disabled ? undefined : NavLink}
-            activeClassName="active"
             className={clsx(styles.root, className)}
             disabled={disabled}
             inverted={inverted}

diff --git a/app/components/DisplayAccountCredentialUpdate/DisplayAccountCredentialUpdate.tsx b/app/components/DisplayAccountCredentialUpdate/DisplayAccountCredentialUpdate.tsx
@@ -29,11 +29,11 @@ export default function DisplayAccountCredentialUpdate({
                 estimatedFee={transaction.estimatedFee}
             />
             <h5>
-                New Threshold: <b>{transaction.payload.threshold}</b>
+                New threshold: <b>{transaction.payload.threshold}</b>
             </h5>
             {removedCredIds.length > 0 ? (
                 <>
-                    <h5>Removed Credentials:</h5>
+                    <h5>Removed credentials:</h5>
                     {removedCredIds.map((removedId) => (
                         <p key={removedId} className={styles.credId}>
                             {removedId}
@@ -43,7 +43,7 @@ export default function DisplayAccountCredentialUpdate({
             ) : null}
             {addedCredentials.length > 0 ? (
                 <>
-                    <h5>Added Credentials:</h5>
+                    <h5>Added credentials:</h5>
                     {addedCredentials.map((addedCredential) => (
                         <p
                             key={addedCredential.value.credId}

diff --git a/app/components/DisplayAddress.tsx b/app/components/DisplayAddress.tsx
@@ -3,23 +3,52 @@ import React from 'react';
 import clsx from 'clsx';
 import { chunkString } from '~/utils/basicHelpers';
 
+export enum AddressDisplayFormat {
+    Ledger,
+    DoubleLine,
+}
+
+interface DisplayFormatConfig {
+    baseClassName?: string;
+    baseLineClassName?: string;
+    lineLength: number;
+}
+
+const formatMap: {
+    [k in AddressDisplayFormat]: DisplayFormatConfig;
+} = {
+    [AddressDisplayFormat.Ledger]: {
+        baseClassName: 'flex flexWrap justifyCenter',
+        baseLineClassName: 'mH5',
+        lineLength: 10,
+    },
+    [AddressDisplayFormat.DoubleLine]: {
+        baseClassName: 'textCenter',
+        lineLength: 25,
+    },
+};
+
 interface Props {
     address: string;
     lineClassName?: string;
-    outerClassName?: string;
-    lineLength?: number;
+    className?: string;
+    format?: AddressDisplayFormat;
 }
 
 export default function DisplayAddress({
     address,
     lineClassName,
-    outerClassName,
-    lineLength = 10,
+    className,
+    format = AddressDisplayFormat.Ledger,
 }: Props) {
+    const { baseClassName, baseLineClassName, lineLength } = formatMap[format];
     return (
-        <div className={clsx(outerClassName, 'textCenter mono')}>
+        <div className={clsx(baseClassName, 'mono', className)}>
             {chunkString(address, lineLength).map((text) => (
-                <div className={clsx(lineClassName, 'm0')} key={text}>
+                <div
+                    className={clsx(baseLineClassName, lineClassName)}
+                    key={text}
+                >
                     {text}
                 </div>
             ))}

diff --git a/app/components/DisplayEstimatedFee/DisplayEstimatedFee.tsx b/app/components/DisplayEstimatedFee/DisplayEstimatedFee.tsx
@@ -1,10 +1,11 @@
 import React from 'react';
 import clsx from 'clsx';
-import styles from './DisplayEstimatedFee.module.scss';
 import { displayAsGTU } from '~/utils/gtu';
 import { Fraction } from '~/utils/types';
 import { collapseFraction } from '~/utils/basicHelpers';
 
+import styles from './DisplayEstimatedFee.module.scss';
+
 interface Props {
     estimatedFee: Fraction | undefined;
     className?: string;
@@ -22,5 +23,9 @@ export default function DisplayEstimatedFee({
     } else {
         fee = 'To be determined';
     }
-    return <p className={clsx(styles.root, className)}>Estimated fee: {fee}</p>;
+    return (
+        <p className={clsx(styles.root, 'mono', className)}>
+            Estimated fee: {fee}
+        </p>
+    );
 }
diff --git a/app/components/DisplayFee.tsx b/app/components/DisplayFee.tsx
@@ -15,7 +15,7 @@ interface Props {
 export default function DisplayFee({ className, transaction }: Props) {
     if (transaction.cost) {
         return (
-            <p className={clsx('body4', className)}>
+            <p className={clsx('body5', className)}>
                 {' '}
                 Fee: {displayAsGTU(transaction.cost)}{' '}
             </p>

diff --git a/app/components/DisplayTransactionExpiryTime/DisplayTransactionExpiryTime.module.scss b/app/components/DisplayTransactionExpiryTime/DisplayTransactionExpiryTime.module.scss
@@ -16,10 +16,13 @@
 }
 
 .value {
-    font-size: $font-size-body2;
+    font-family: $font-family-mono;
+    font-size: $font-size-body3;
     margin: 0;
 }
 
 .note {
-    composes: textFaded from global, body3 from global, mT5 from global;
+    composes: textFaded from global, mT5 from global;
+    font-family: $font-family-mono;
+    font-size: $font-size-body4;
 }
diff --git a/app/components/DisplayTransactionExpiryTime/DisplayTransactionExpiryTime.tsx b/app/components/DisplayTransactionExpiryTime/DisplayTransactionExpiryTime.tsx
@@ -13,7 +13,7 @@ export default function DisplayTransactionExpiryTime({
 }: Props) {
     return (
         <>
-            <p className={styles.title}>Transaction expiry time</p>
+            <p className={styles.title}>Transaction expiry time:</p>
             <p className={styles.value}>
                 {expiryTime === undefined
                     ? placeholder

diff --git a/app/components/ExportBakerCredentials.tsx b/app/components/ExportBakerCredentials.tsx
@@ -43,7 +43,7 @@ export default function ExportBakerCredentials({
         );
 
         const success = await saveFile(fileString, {
-            title: 'Save Baker Credentials',
+            title: 'Save baker credentials',
             defaultPath: 'baker-credentials.json',
         });
         if (success) {
@@ -58,7 +58,7 @@ export default function ExportBakerCredentials({
                 className={clsx('mT50', buttonClassName)}
                 onClick={onExport}
             >
-                Export Baker Credentials
+                Export baker credentials
             </Button>
         </div>
     );

diff --git a/app/components/FailedIdentityModal.tsx b/app/components/FailedIdentityModal.tsx
@@ -56,7 +56,7 @@ export default function FailedIdentityModal({ identity }: Props) {
             open={modalOpen}
             actions={[
                 {
-                    label: 'Try Again',
+                    label: 'Try again',
                     location: {
                         pathname: routes.IDENTITYISSUANCE,
                         state: {

diff --git a/app/components/Form/Input/Input.tsx b/app/components/Form/Input/Input.tsx
@@ -21,7 +21,7 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
     ) => {
         return (
             <label className={clsx(styles.root, className)}>
-                <Label>{label}</Label>
+                <Label className="mB5">{label}</Label>
                 <input
                     className={clsx(
                         styles.field,

diff --git a/app/components/Form/TextArea/TextArea.tsx b/app/components/Form/TextArea/TextArea.tsx
@@ -88,7 +88,7 @@ const TextArea = forwardRef<HTMLTextAreaElement, TextAreaProps>(
 
         return (
             <label className={clsx(styles.root, className)}>
-                <Label>{label}</Label>
+                <Label className="mB5">{label}</Label>
                 <textarea
                     className={clsx(
                         styles.field,

diff --git a/app/components/IdentityCard/FailedIdentityDetails.tsx b/app/components/IdentityCard/FailedIdentityDetails.tsx
@@ -53,7 +53,7 @@ export default function FailedIdentityDetails({
     );
     const identityProviderName = identityProvider.ipInfo.ipDescription.name;
     const cc = '[email protected]';
-    const subject = `Issuance Reference: ${sessionId}`;
+    const subject = `Issuance reference: ${sessionId}`;
     const body = `Hi! My identity issuance failed.
 
 Here is my info:

diff --git a/app/components/PageLayout/PageContainer/PageContainer.module.scss b/app/components/PageLayout/PageContainer/PageContainer.module.scss
@@ -15,17 +15,17 @@
 .back,
 .close {
     position: absolute;
-    top: $page-container-padding-vertical;
+    top: $page-container-padding-vertical - 5px;
 }
 
 .back {
-    left: $page-container-padding-vertical;
+    left: $page-container-padding-vertical - 5px;
     padding-left: 11px;
     padding-right: 13px;
 }
 
 .close {
-    right: $page-container-padding-vertical;
+    right: $page-container-padding-vertical - 5px;
 }
 
 .paddingVertical {

diff --git a/app/components/PageLayout/PageLayout.stories.tsx b/app/components/PageLayout/PageLayout.stories.tsx
@@ -61,7 +61,7 @@ WithHeaderButtons.args = {
             <PageLayout.HeaderButton align="left">
                 <PlusIcon height="20" />
             </PageLayout.HeaderButton>
-            <h1>Page Title</h1>
+            <h1>Page title</h1>
             <PageLayout.HeaderButton align="right">
                 <PlusIcon height="20" />
             </PageLayout.HeaderButton>

diff --git a/app/components/PickAccount.tsx b/app/components/PickAccount.tsx
@@ -74,7 +74,7 @@ export default function PickAccount({
         <>
             <SimpleErrorModal
                 show={Boolean(error)}
-                header="Unable to load Accounts"
+                header="Unable to load accounts"
                 content={error}
                 onClick={() => dispatch(push(routes.MULTISIGTRANSACTIONS))}
             />

diff --git a/app/components/PickBakerStakeAmount.tsx b/app/components/PickBakerStakeAmount.tsx
@@ -56,7 +56,7 @@ export default function PickBakerStakeAmount({
     return (
         <div className="mV30">
             <Label>{header}</Label>
-            <div className="body1">
+            <div className="h1 mV5">
                 {getGTUSymbol()}
                 <Form.GtuInput
                     defaultValue={initial}

diff --git a/app/components/PrintButton/PrintButton.tsx b/app/components/PrintButton/PrintButton.tsx
@@ -7,7 +7,7 @@ import IconButton from '~/cross-app-components/IconButton';
 import SimpleErrorModal, {
     ModalErrorInput,
 } from '~/components/SimpleErrorModal';
-import { alreadyPrinting } from '~/constants/errorMessages.json';
+import errorMessages from '~/constants/errorMessages.json';
 import { RootState } from '~/store/store';
 import { setPrinting } from '~/features/MiscSlice';
 
@@ -63,16 +63,16 @@ export default function PrintButton({
                             .catch((error) =>
                                 setShowError({
                                     show: true,
-                                    header: 'Print Failed',
+                                    header: 'Print failed',
                                     content: error.toString(),
                                 })
                             )
                             .finally(() => dispatch(setPrinting(false)));
                     }
                     return setShowError({
                         show: true,
-                        header: 'Already Printing',
-                        content: alreadyPrinting,
+                        header: 'Already printing',
+                        content: errorMessages.alreadyPrinting,
                     });
                 }}
             />

diff --git a/app/components/PrintFormat/ScheduledTransfer.tsx b/app/components/PrintFormat/ScheduledTransfer.tsx
@@ -73,7 +73,7 @@ function PrintFormatScheduledTransfer({
             {table(
                 <thead>
                     <tr>
-                        <th>Release Time</th>
+                        <th>Release time</th>
                         <th>Amount</th>
                     </tr>
                 </thead>,

diff --git a/app/components/TransactionHash.tsx b/app/components/TransactionHash.tsx
@@ -19,7 +19,7 @@ export default function TransactionHashView({ transaction }: Props) {
 
     return (
         <>
-            <h5>Transaction Hash</h5>
+            <h5>Transaction hash</h5>
             {transactionHash}
         </>
     );