Skip to content

Commit

Permalink
Merge branch 'master' into add-github-action
Browse files Browse the repository at this point in the history
  • Loading branch information
zencephalon committed Sep 20, 2023
2 parents 6ff0048 + eefc1d2 commit 8dae970
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 27 deletions.
11 changes: 9 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
all:
make web & make docs & make bridge
all: web docs bridge

web:
yarn workspace @app/web dev --port 3000
Expand All @@ -9,3 +8,11 @@ docs:

bridge:
yarn workspace @app/bridge dev --port 3002

lint: lint-web lint-bridge

lint-web:
yarn workspace @app/web lint

lint-bridge:
yarn workspace @app/bridge lint
2 changes: 0 additions & 2 deletions apps/bridge/pages/_app.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import './global.css';
import '@rainbow-me/rainbowkit/styles.css';

// eslint-disable-next-line @cbhq/react-prefer-named-module-import
import React, { Fragment } from 'react';
import { QueryClient, QueryClientProvider } from 'react-query';
import Bugsnag from '@bugsnag/js';
Expand All @@ -19,7 +18,6 @@ import getConfig from 'next/config';
import { useRouter } from 'next/router';
import { WagmiConfig } from 'wagmi';

const DEFAULT_LOCALE = 'en';
const { publicRuntimeConfig } = getConfig();

if (publicRuntimeConfig.bugsnagApiKey) {
Expand Down
19 changes: 11 additions & 8 deletions apps/bridge/src/components/BridgeInput/BridgeInput.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Dispatch, SetStateAction, useRef } from 'react';
import { Dispatch, SetStateAction, useCallback, useRef } from 'react';
import { ArrowRightIcon } from '@heroicons/react/24/outline';
import { AssetList } from 'apps/bridge/src/components/AssetList/AssetList';
import { Asset, CustomChain } from 'apps/bridge/src/types/Asset';
Expand Down Expand Up @@ -82,13 +82,15 @@ export function BridgeInput({
setAmount(e.target.value);
}

function handleChangeAsset(asset: Asset) {
return () => {
onClose();
setSelectedAsset(asset);
setAmount('0');
};
}
const handleChangeAsset = useCallback(
(asset: Asset) => {
return () => {
onClose();
setSelectedAsset(asset);
setAmount('0');
};
}
, [onClose, setAmount, setSelectedAsset]);

function setMaxBalance() {
setAmount((parseFloat(balance) * 0.99).toFixed(6).toString());
Expand Down Expand Up @@ -134,6 +136,7 @@ export function BridgeInput({
</div>
</div>
<span className="mt-8 font-mono text-sm font-medium text-white">AMOUNT</span>
{/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */}
<div
className="flex max-w-[100vw] cursor-text flex-row items-center justify-between"
onClick={handleFocus}
Expand Down
8 changes: 4 additions & 4 deletions apps/bridge/src/components/Faq/FaqSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ export function FaqSidebar() {
/>
<QuestionAccordion
question="What if I have a question, issue or problem?"
answer={
answer={(
<>
The{' '}
<a href="https://base.org/discord" className="underline">
Base Discord
</a>{' '}
community is available around the clock for general questions, assistance and support!
</>
}
)}
/>
<QuestionAccordion
question="How do you withdraw from Base?"
answer={
answer={(
<div className="flex flex-col space-y-4">
<p>
Connect your wallet and confirm that it is set to Base network. Choose the digital
Expand Down Expand Up @@ -55,7 +55,7 @@ export function FaqSidebar() {
.
</p>
</div>
}
)}
/>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ export const DepositRow = memo(function WithdrawalRow({ transaction }: DepositRo
: undefined;
const dateMonthDayOnly = transaction.blockTimestamp
? new Date(Number(transaction.blockTimestamp) * 1000).toLocaleDateString('en-US', {
month: 'short',
day: 'numeric',
})
month: 'short',
day: 'numeric',
})
: undefined;
const time = transaction.blockTimestamp
? new Date(Number(transaction.blockTimestamp) * 1000).toLocaleTimeString('en-US', {
Expand All @@ -55,7 +55,7 @@ export const DepositRow = memo(function WithdrawalRow({ transaction }: DepositRo
const amountFiat =
conversionRateData && depositAmount
? usdFormatter(conversionRateData * +depositAmount)
: `$0.00`;
: '$0.00';

const { isLoading: isDepositLoading, isSuccess: isDepositSuccess } = useWaitForTransaction({
chainId: parseInt(publicRuntimeConfig.l1ChainID),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ export const WithdrawalRow = memo(function WithdrawalRow({
: undefined;
const dateMonthDayOnly = transaction.blockTimestamp
? new Date(Number(transaction.blockTimestamp) * 1000).toLocaleDateString('en-US', {
month: 'short',
day: 'numeric',
})
month: 'short',
day: 'numeric',
})
: undefined;
const time = transaction.blockTimestamp
? new Date(Number(transaction.blockTimestamp) * 1000).toLocaleTimeString('en-US', {
Expand All @@ -81,7 +81,7 @@ export const WithdrawalRow = memo(function WithdrawalRow({
const amountFiat =
conversionRateData && withdrawalAmount
? usdFormatter(conversionRateData * +withdrawalAmount)
: `$0.00`;
: '$0.00';

const explorerURL =
transaction.type === 'Deposit'
Expand Down
4 changes: 4 additions & 0 deletions apps/bridge/src/http/fetchJSON.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint-disable @typescript-eslint/no-unsafe-argument */
/* eslint-disable @typescript-eslint/no-parameter-properties */
export class HTTPError extends Error {
constructor(
readonly status: number,
Expand Down Expand Up @@ -53,6 +55,7 @@ export async function request<T>(
const response = await fetch(fullURL, init);

if (response.status >= 400) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const { error } = await response.json();
throw new HTTPError(
response.status,
Expand All @@ -65,6 +68,7 @@ export async function request<T>(

return {
status: response.status,
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
body: response.ok ? await response.json() : null,
headers: Object.fromEntries((response.headers as ResponseHeaders)?.entries() ?? []),
};
Expand Down
2 changes: 1 addition & 1 deletion apps/web/pages/api/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ import type { NextApiRequest, NextApiResponse } from 'next';
export default function handler(_: NextApiRequest, res: NextApiResponse) {
res.setHeader('WWW-authenticate', 'Basic realm="Secure Area"');
res.statusCode = 401;
res.end(`Auth Required.`);
res.end('Auth Required.');
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"description": "Base web monorepo",
"repository": "[email protected]::base-org/base-web.git",
"license": "Apache-2.0",
"private": false,
"scripts": {
"build": ""
"build": "",
"lint": "make lint"
},
"workspaces": [
"apps/*",
Expand Down

0 comments on commit 8dae970

Please sign in to comment.