Skip to content

Commit e516a10

Browse files
committed
Merge branch 'develop' into dependabot/npm_and_yarn/types/node-18.7.18
2 parents 1633de4 + e5194b3 commit e516a10

File tree

10 files changed

+4183
-1277
lines changed

10 files changed

+4183
-1277
lines changed

package-lock.json

Lines changed: 4152 additions & 1253 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"@iota/iota.js": "^1.9.0-stardust.25",
1414
"classnames": "^2.3.1",
15-
"humanize-duration": "^3.25.2",
15+
"humanize-duration": "^3.27.3",
1616
"moment": "^2.29.1",
1717
"react": "^17.0.2",
1818
"react-dom": "^17.0.2",
@@ -27,7 +27,7 @@
2727
"start": "cross-env PORT=9090 WDS_SOCKET_PORT=9090 REACT_APP_SOCKET=8081 REACT_APP_BRAND_ID=hornet craco start",
2828
"start-bee": "cross-env PORT=9090 WDS_SOCKET_PORT=9090 REACT_APP_SOCKET=8081 REACT_APP_BRAND_ID=bee craco start",
2929
"lint": "eslint src --ext .tsx,.ts",
30-
"sass-lint": "stylelint ./src/**/*.scss",
30+
"sass-lint": "stylelint ./src/**/*.scss --custom-syntax postcss-scss",
3131
"build-internal": "craco build",
3232
"build": "cross-env REACT_APP_BRAND_ID=hornet run-s lint sass-lint build-internal",
3333
"build-bee": "cross-env REACT_APP_BRAND_ID=bee run-s lint sass-lint build-internal",
@@ -58,13 +58,14 @@
5858
"eslint-plugin-react": "^7.30.1",
5959
"eslint-plugin-unicorn": "^43.0.2",
6060
"npm-run-all": "^4.1.5",
61+
"postcss-scss": "^4.0.5",
6162
"sass": "^1.53.0",
62-
"stylelint": "^13.13.0",
63+
"stylelint": "^14.9.1",
6364
"stylelint-config-property-sort-order-smacss": "^7.1.0",
64-
"stylelint-config-recommended": "^5.0.0",
65+
"stylelint-config-recommended": "^8.0.0",
6566
"stylelint-config-recommended-scss": "^4.2.0",
66-
"stylelint-config-sass-guidelines": "^8.0.0",
67-
"stylelint-config-standard": "^22.0.0",
67+
"stylelint-config-sass-guidelines": "^9.0.0",
68+
"stylelint-config-standard": "^26.0.0",
6869
"stylelint-scss": "^3.19.0",
6970
"typescript": "^4.7.4"
7071
}

src/app/App.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import '../scss/media-queries';
2-
@import '../scss/variables';
1+
@import "../scss/media-queries";
2+
@import "../scss/variables";
33

44
.app {
55
display: flex;

src/app/routes/explorer/Address.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ALIAS_ADDRESS_TYPE, NFT_ADDRESS_TYPE, TransactionHelper } from "@iota/iota.js";
1+
import { ALIAS_ADDRESS_TYPE, Bech32Helper, NFT_ADDRESS_TYPE, TransactionHelper } from "@iota/iota.js";
22
import React, { ReactNode } from "react";
33
import { Link, RouteComponentProps } from "react-router-dom";
44
import { ReactComponent as ChevronLeftIcon } from "../../../assets/chevron-left.svg";
@@ -42,6 +42,10 @@ class Address extends AsyncComponent<RouteComponentProps<AddressProps>, AddressS
4242
const nodeConfigService = ServiceFactory.get<NodeConfigService>("node-config");
4343
this._bech32Hrp = nodeConfigService.getBech32Hrp();
4444

45+
if (!Bech32Helper.matches(this.props.match.params.address, this._bech32Hrp)) {
46+
this.props.history.push(`/explorer/search/${this.props.match.params.address}`);
47+
}
48+
4549
this.state = {
4650
address: { ...Bech32AddressHelper.buildAddress(props.match.params.address, this._bech32Hrp) },
4751
outputs: [],

src/scss/card.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
@import './fonts';
2-
@import './variables';
3-
@import './media-queries';
1+
/* stylelint-disable selector-class-pattern, function-no-unknown */
2+
@import "./fonts";
3+
@import "./variables";
4+
@import "./media-queries";
45

56
.card {
67
padding: 10px;

src/scss/fonts.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
@import './fonts/dm-sans';
2-
@import './fonts/ibm-plex-mono';
1+
@import "./fonts/dm-sans";
2+
@import "./fonts/ibm-plex-mono";
33

4-
$font-sans: 'DM Sans', sans-serif;
5-
$font-mono: 'IBM Plex Mono', monospace;
4+
$font-sans: "DM Sans", sans-serif;
5+
$font-mono: "IBM Plex Mono", monospace;
66

77
$rem-base-font: 16px !default;
88

src/scss/forms.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
@import './fonts';
2-
@import './variables';
1+
/* stylelint-disable selector-class-pattern */
2+
@import "./fonts";
3+
@import "./variables";
34

45
.select-wrapper {
56
display: inline-block;

src/scss/layout.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import './variables';
2-
@import './media-queries';
1+
@import "./variables";
2+
@import "./media-queries";
33

44
.row {
55
display: flex;

src/scss/standard.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import './fonts';
2-
@import './variables';
1+
@import "./fonts";
2+
@import "./variables";
33

44
h1 {
55
@include font-size(24px);

src/utils/outputsHelper.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class OutputsHelper {
5050
// Basic output -> storage return address
5151
this.tryFetchOutputs(
5252
async query => indexerPlugin.basicOutputs(query),
53-
{ storageReturnAddressBech32: this.query },
53+
{ storageDepositReturnAddressBech32: this.query },
5454
AssociationType.BASIC_STORAGE_RETURN
5555
),
5656

@@ -113,7 +113,7 @@ export class OutputsHelper {
113113
// Nft output -> storage return address
114114
this.tryFetchOutputs(
115115
async query => indexerPlugin.nfts(query),
116-
{ storageReturnAddressBech32: this.query },
116+
{ storageDepositReturnAddressBech32: this.query },
117117
AssociationType.NFT_STORAGE_RETURN
118118
),
119119

0 commit comments

Comments
 (0)