Skip to content

Commit

Permalink
fix: temp remove audit check during development
Browse files Browse the repository at this point in the history
  • Loading branch information
kyranjamie committed Sep 25, 2020
1 parent 9d6fa48 commit 0ae3692
Show file tree
Hide file tree
Showing 15 changed files with 183 additions and 108 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,5 @@ jobs:
with:
path: '**/node_modules'
key: ${{ hashFiles('**/yarn.lock') }}

- name: Audit dependencies
run: yarn audit
# - name: Audit dependencies
# run: yarn audit
2 changes: 1 addition & 1 deletion app/components/home/balance-card.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { FC } from 'react';
import { Box, Button, Text, ArrowIcon } from '@blockstack/ui';
import { humanReadableStx } from '../../utils/format-stx';
import { humanReadableStx } from '../../utils/unit-convert';

interface BalanceCardProps {
balance: string | null;
Expand Down
2 changes: 1 addition & 1 deletion app/crypto/create-stx-tx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import BigNumber from 'bignumber.js';
import { deriveRootKeychainFromMnemonic } from '@blockstack/keychain';
import { makeSTXTokenTransfer } from '@blockstack/stacks-transactions';

import { stacksNetwork } from './environment';
import { stacksNetwork } from '../environment';
import { deriveStxAddressKeychain } from './derive-address-keychain';

interface CreateStxTxArgs {
Expand Down
2 changes: 1 addition & 1 deletion app/crypto/derive-address-keychain.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { deriveStxAddressChain } from '@blockstack/keychain';
import { chain } from './environment';
import { chain } from '../environment';

export const deriveStxAddressKeychain = deriveStxAddressChain(chain);
2 changes: 1 addition & 1 deletion app/crypto/validate-address-net.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { chain, ChainID } from './environment';
import { chain, ChainID } from '../environment';

export function validateAddressChain(address: string) {
const prefix = address.substr(0, 2);
Expand Down
2 changes: 1 addition & 1 deletion app/crypto/environment.ts → app/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
StacksTestnet,
StacksMainnet,
} from '@blockstack/stacks-transactions';
import { ENV } from '../constants';
import { ENV } from './constants';

export { ChainID };

Expand Down
2 changes: 1 addition & 1 deletion app/modals/receive-stx/receive-stx-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const ReceiveStxModal: FC<ReceiveStxModalProps> = ({ address }) => {
const onCopyAddress = () => {
copyAddressToClipboard.onCopy();
setButtonText('Copied');
setTimeout(() => setButtonText('Copy address'), 1000);
setTimeout(() => setButtonText('Copy address'), 800);
};
const closeModal = () => dispatch(homeActions.closeReceiveModal());
if (!modalOpen) return null;
Expand Down
2 changes: 1 addition & 1 deletion app/modals/transaction/transaction-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ErrorLabel } from '../../components/error-label';
import { ErrorText } from '../../components/error-text';
import { FormikProps } from 'formik';
import { capitalize } from '../../utils/capitalize';
import { humanReadableStx } from '../../utils/format-stx';
import { humanReadableStx } from '../../utils/unit-convert';

interface TxModalFormProps {
balance: string;
Expand Down
4 changes: 2 additions & 2 deletions app/modals/transaction/transaction-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { useSelector, useDispatch } from 'react-redux';
import { useFormik } from 'formik';
import * as yup from 'yup';
import BN from 'bn.js';
import { BigNumber } from 'bignumber.js';
import { Modal, Text, Button } from '@blockstack/ui';
import { StacksTransaction } from '@blockstack/stacks-transactions';

Expand All @@ -23,8 +24,7 @@ import {
import { createStxTransaction } from '../../crypto/create-stx-tx';
import { validateAddressChain } from '../../crypto/validate-address-net';
import { broadcastStxTransaction } from '../../store/transaction';
import { humanReadableStx, stxToMicroStx } from '../../utils/format-stx';
import { BigNumber } from 'bignumber.js';
import { humanReadableStx, stxToMicroStx } from '../../utils/unit-convert';

interface TxModalProps {
balance: string;
Expand Down
4 changes: 2 additions & 2 deletions app/store/transaction/transaction.actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import { Transaction } from '@blockstack/stacks-blockchain-sidecar-types';

import { broadcastTransaction, StacksTransaction } from '@blockstack/stacks-transactions';

import { Dispatch, RootState } from '../index';
import { Dispatch } from '../index';
import { Api } from '../../api/api';

import { stacksNetwork } from '../../crypto/environment';
import { stacksNetwork } from '../../environment';

export const pendingTransactionSuccessful = createAction<Transaction>(
'transactions/pending-transaction-successful'
Expand Down
2 changes: 1 addition & 1 deletion app/utils/safe-handle-txid.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export function safelyFormatHexTxid(id: string) {
const prefix = '0x';
if (id.startsWith('0x')) return id;
if (id.startsWith(prefix)) return id;
return prefix + id;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { humanReadableStx, microStxToStx, stxToMicroStx } from './format-stx';
import { humanReadableStx, microStxToStx, stxToMicroStx } from './unit-convert';
import BN from 'bn.js';

describe(microStxToStx.name, () => {
Expand Down
File renamed without changes.
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,20 +85,20 @@
},
"devDependencies": {
"@actions/core": "1.2.4",
"@babel/core": "7.10.4",
"@babel/core": "7.10.5",
"@babel/plugin-proposal-class-properties": "7.10.4",
"@babel/plugin-proposal-decorators": "7.10.4",
"@babel/plugin-proposal-decorators": "7.10.5",
"@babel/plugin-proposal-do-expressions": "7.10.4",
"@babel/plugin-proposal-export-default-from": "7.10.4",
"@babel/plugin-proposal-export-namespace-from": "7.10.4",
"@babel/plugin-proposal-function-bind": "7.10.4",
"@babel/plugin-proposal-function-bind": "7.10.5",
"@babel/plugin-proposal-function-sent": "7.10.4",
"@babel/plugin-proposal-json-strings": "7.10.4",
"@babel/plugin-proposal-logical-assignment-operators": "7.10.4",
"@babel/plugin-proposal-nullish-coalescing-operator": "7.10.4",
"@babel/plugin-proposal-numeric-separator": "7.10.4",
"@babel/plugin-proposal-optional-chaining": "7.10.4",
"@babel/plugin-proposal-pipeline-operator": "7.10.4",
"@babel/plugin-proposal-pipeline-operator": "7.10.5",
"@babel/plugin-proposal-throw-expressions": "7.10.4",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/plugin-syntax-import-meta": "7.10.4",
Expand All @@ -107,7 +107,7 @@
"@babel/preset-env": "7.10.4",
"@babel/preset-react": "7.10.4",
"@babel/preset-typescript": "7.10.4",
"@babel/register": "7.10.4",
"@babel/register": "7.10.5",
"@blockstack/eslint-config": "1.0.5",
"@blockstack/prettier-config": "0.0.6",
"@blockstack/stacks-blockchain-sidecar-types": "0.0.20",
Expand All @@ -119,26 +119,26 @@
"@types/enzyme": "3.10.5",
"@types/enzyme-adapter-react-16": "1.0.6",
"@types/history": "4.7.6",
"@types/jest": "26.0.4",
"@types/node": "14.0.18",
"@types/jest": "26.0.5",
"@types/node": "14.0.24",
"@types/qrcode.react": "1.0.1",
"@types/ramda": "types/npm-ramda#dist",
"@types/react": "16.9.41",
"@types/react": "16.9.43",
"@types/react-dom": "16.9.8",
"@types/react-redux": "7.1.9",
"@types/react-router": "5.1.8",
"@types/react-router-dom": "5.1.5",
"@types/react-test-renderer": "16.9.2",
"@types/redux-logger": "3.0.8",
"@types/source-map-support": "0.5.1",
"@types/source-map-support": "0.5.2",
"@types/terser-webpack-plugin": "3.0.0",
"@types/vfile-message": "2.0.0",
"@types/webpack": "4.41.20",
"@types/webpack": "4.41.21",
"@types/webpack-merge": "4.1.5",
"@types/yup": "0.29.3",
"@types/zxcvbn": "4.4.0",
"@typescript-eslint/eslint-plugin": "3.6.0",
"@typescript-eslint/parser": "3.6.0",
"@typescript-eslint/eslint-plugin": "3.7.0",
"@typescript-eslint/parser": "3.7.0",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "10.1.0",
"babel-jest": "26.1.0",
Expand Down
Loading

0 comments on commit 0ae3692

Please sign in to comment.