Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8c8ab9c
SD-106: Update tokens for rebranding
rAskVAL Jul 14, 2025
a8f2555
SD-106: Update font tokens for rebranding
rAskVAL Jul 15, 2025
ed68683
Merge pull request #93 from Cardinal-Cryptography/SD-106-rebranding
rAskVAL Jul 15, 2025
fc0e186
SD-106: Replace CIcon with BIcon and update app name
rAskVAL Jul 16, 2025
fe5111c
SD-106: Adjust button styling
rAskVAL Jul 16, 2025
47baf6e
SD-106: Update logos
rAskVAL Jul 16, 2025
277698a
Merge pull request #94 from Cardinal-Cryptography/SD-106-update-metadata
rAskVAL Jul 16, 2025
3cfaea3
Merge pull request #97 from Cardinal-Cryptography/SD-106-adjust-button
rAskVAL Jul 17, 2025
3029221
Merge pull request #98 from Cardinal-Cryptography/SD-106-update-logos
rAskVAL Jul 17, 2025
3b1479c
SD-106: Remove double border from wrapper
rAskVAL Jul 15, 2025
9e5ba90
Merge pull request #95 from Cardinal-Cryptography/remove-doubleborder
rAskVAL Jul 17, 2025
2c241c4
SD-106: Remove animated background
rAskVAL Jul 17, 2025
bd4bacc
SD-106: Remove DEX and Bridge button from footer
rAskVAL Jul 17, 2025
5726f44
Merge pull request #100 from Cardinal-Cryptography/remove-animated-ba…
rAskVAL Jul 18, 2025
86b57bf
SD-106: Remove last traces of Common
jalooc Jul 18, 2025
9c11697
SD-106: Rename Shielding Dapp to BlankSquare WebApp
jalooc Jul 18, 2025
6eceaae
Merge pull request #101 from Cardinal-Cryptography/SD-106-remove-last…
jalooc Jul 18, 2025
4ed4ee3
SD-106: Remove NPM_TOKEN
jalooc Jul 18, 2025
c29d478
Merge pull request #102 from Cardinal-Cryptography/SD-106-remove-npm-…
jalooc Jul 18, 2025
5363716
Merge branch 'main' into blanksquare-rebranding
Jul 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/actions/build-and-push/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,6 @@ runs:
with:
node-version: ${{ inputs.node-version }}

- name: Set NPM_TOKEN
env:
NPM_TOKEN: ${{ inputs.npm-token }}
shell: bash
run: npm config set '//registry.npmjs.org/:_authToken' "${{ env.NPM_TOKEN }}"

- name: Clean install
shell: bash
run: npm ci
Expand Down
11 changes: 1 addition & 10 deletions .github/actions/setup-project/action.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: Setup project
description: Setup npm project in Node.js

inputs:
NPM_TOKEN:
required: true
description: NPM_TOKEN

outputs:
node-version:
description: The resolved and installed Node.js version.
Expand All @@ -32,12 +27,8 @@ runs:
key: os-${{ runner.os }}/node-${{ steps.node.outputs.version }}/node_modules-${{ hashFiles('package-lock.json') }}
- name: Install dependencies
if: ${{ steps.cache-node-modules.outputs.cache-hit != 'true' }}
run: |
echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc
npm ci
run: npm ci
shell: bash
env:
NPM_TOKEN: ${{ inputs.NPM_TOKEN }}
- name: Cache node_modules
if: ${{ steps.cache-node-modules.outputs.cache-hit != 'true' }}
uses: actions/cache@v4
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/build-and-push-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,4 @@ jobs:
aws-access-key-id: ${{ secrets.AWS_S3_PROD_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_S3_PROD_SECRET_ACCESS_KEY }}
s3-bucket-name: ${{ secrets.AWS_S3_PROD_BUCKET_NAME }}
amplify-app-id: ${{ secrets.AWS_AMPLIFY_PROD_APP_ID }}
npm-token: ${{ secrets.NPM_TOKEN }}
amplify-app-id: ${{ secrets.AWS_AMPLIFY_PROD_APP_ID }}
3 changes: 1 addition & 2 deletions .github/workflows/build-and-push-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,4 @@ jobs:
aws-access-key-id: ${{ secrets.AWS_S3_STAGE_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_S3_STAGE_SECRET_ACCESS_KEY }}
s3-bucket-name: ${{ secrets.AWS_S3_STAGE_BUCKET_NAME }}
amplify-app-id: ${{ secrets.AWS_AMPLIFY_STAGE_APP_ID }}
npm-token: ${{ secrets.NPM_TOKEN }}
amplify-app-id: ${{ secrets.AWS_AMPLIFY_STAGE_APP_ID }}
2 changes: 0 additions & 2 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-project
with:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

storybook:
name: Chromatic toolset initialization
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-project
with:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

lint-commits:
name: Lint commits
Expand All @@ -23,8 +21,6 @@ jobs:
with:
fetch-depth: 0
- uses: ./.github/actions/setup-project
with:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- run: npx commitlint --from ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to ${{ github.event.pull_request.head.sha }} --verbose

type-check:
Expand All @@ -34,8 +30,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-project
with:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- run: npm run type-check

lint:
Expand All @@ -45,8 +39,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-project
with:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- run: npm run lint

test:
Expand All @@ -57,8 +49,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup-project
with:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Export variables
shell: bash
env:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# Shielding dApp
# BlankSquare WebApp
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description" content="Privacy for all crypto.">
<link rel="icon" type="image/svg+xm" href="/favicon.svg">
<title>Common Web App</title>
<title>Blanksquare Web App</title>

<meta property="og:title" content="Common Web App" />
<meta property="og:title" content="Blanksquare Web App" />
<meta property="og:description" content="Privacy for all crypto." />
<meta property="og:image" content="%PUBLIC_VAR_OG_IMAGE_URL%" />

<meta name="twitter:title" content="Common Web App">
<meta name="twitter:title" content="Blanksquare Web App">
<meta name="twitter:description" content="Privacy for all crypto.">
<meta name="twitter:image" content="%PUBLIC_VAR_OG_IMAGE_URL%">

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "shielding-dapp",
"name": "blanksquare-webapp",
"private": true,
"version": "0.0.0",
"type": "module",
Expand Down
12 changes: 10 additions & 2 deletions public/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions scripts/generateIcons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { fileURLToPath } from 'url';
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const rootDir = path.resolve(__dirname, '..');
const iconsDir = path.join(rootDir, 'src/domains/misc/components/CIcon/icons');
const iconsDir = path.join(rootDir, 'src/domains/misc/components/BIcon/icons');

if (!fs.existsSync(iconsDir)) {
console.error(`Icons directory not found: ${iconsDir}`);
Expand Down Expand Up @@ -40,7 +40,7 @@ export type IconName = keyof typeof icons;
`;

fs.writeFileSync(
path.join(rootDir, 'src/domains/misc/components/CIcon/icons.ts'),
path.join(rootDir, 'src/domains/misc/components/BIcon/icons.ts'),
content
);

Expand Down
13 changes: 7 additions & 6 deletions src/domains/chains/components/ChainSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import ChainIcon from 'src/domains/chains/components/ChainIcon';
import { Definition } from 'src/domains/chains/utils/definitions';
import supportedChains from 'src/domains/chains/utils/supportedChains';
import useChain from 'src/domains/chains/utils/useChain';
import BIcon from 'src/domains/misc/components/BIcon';
import Button from 'src/domains/misc/components/Button';
import CIcon from 'src/domains/misc/components/CIcon';
import SelectBox from 'src/domains/misc/components/SelectBox';
import { BOTTOM_MENU_BREAKPOINT, BREAKPOINTS } from 'src/domains/misc/consts/consts';
import { typography } from 'src/domains/styling/utils/tokens';
Expand All @@ -29,7 +29,7 @@ const ChainSelector = () => {
<Option>
<ChainIcon size={20} chainId={chain.id} />
<p>{chain.name}</p>
{chainConfig?.id === chain.id && <CIcon size={20} icon="CheckmarkRegular" />}
{chainConfig?.id === chain.id && <BIcon size={20} icon="CheckmarkRegular" />}
</Option>
),
});
Expand All @@ -51,7 +51,7 @@ const ChainSelector = () => {
) : (
'Select Network'
)}
<CIcon icon="Chevron" color={vars('--color-neutral-foreground-3-rest')} />
<BIcon icon="Chevron" color={vars('--color-neutral-foreground-3-rest')} />
<UnderLine />
</StyledButton>
</StyledSelectBox>
Expand Down Expand Up @@ -82,11 +82,12 @@ const StyledButton = styled(Button)`
padding-inline: ${vars('--spacing-s')};
width: ${CHAIN_SELECTOR_WIDTH}px;

border-radius: ${vars('--spacing-s')};
background: ${vars('--color-neutral-background-1-rest')};
border-color: ${vars('--color-neutral-stroke-2-rest')};
overflow: hidden;

${typography.web.body1};
${typography.body1};

@media (width <= ${BOTTOM_MENU_BREAKPOINT}) { /* stylelint-disable-line media-query-no-invalid */
width: fit-content;
Expand All @@ -99,9 +100,9 @@ const Option = styled.div`
gap: ${vars('--spacing-s')};
width: 100%;

${typography.web.body1Strong};
${typography.body1Strong};

& > ${CIcon} {
& > ${BIcon} {
margin-left: auto;
}
`;
Expand Down
23 changes: 10 additions & 13 deletions src/domains/chains/components/ConnectModal.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import styled from 'styled-components';

import { useWallet } from 'src/domains/chains/components/WalletProvider';
import BIcon from 'src/domains/misc/components/BIcon';
import Button from 'src/domains/misc/components/Button';
import CIcon from 'src/domains/misc/components/CIcon';
import Modal, { useModalControls } from 'src/domains/misc/components/Modal';
import CheckedContainer from 'src/domains/misc/components/PatternContainer';
import { PRIVACY_POLICY_LINK, TERMS_OF_CONDITIONS_LINK, TERMS_OF_SERVICE_LINK } from 'src/domains/misc/consts/consts';
Expand All @@ -28,9 +28,9 @@ const ConnectModal = () => {
<CheckedContainer>
<Branding>
<LogoContainer>
<CIcon icon="Common" size={26} color="#406EB2" />
<BIcon icon="Blanksquare" size={26} />
</LogoContainer>
<p>Common Web App</p>
<p>Blanksquare Web App</p>
</Branding>
</CheckedContainer>
<Title>
Expand All @@ -42,15 +42,15 @@ const ConnectModal = () => {
</Text>
<LinksWrapper>
<Link href={TERMS_OF_SERVICE_LINK} target="_blank" rel="noopener noreferrer">
<CIcon icon="DocumentText" size={20} />
<BIcon icon="DocumentText" size={20} />
<p>Terms of service</p>
</Link>
<Link href={TERMS_OF_CONDITIONS_LINK} target="_blank" rel="noopener noreferrer">
<CIcon icon="DocumentText" size={20} />
<BIcon icon="DocumentText" size={20} />
<p>Terms and Conditions</p>
</Link>
<Link href={PRIVACY_POLICY_LINK} target="_blank" rel="noopener noreferrer">
<CIcon icon="DocumentText" size={20} />
<BIcon icon="DocumentText" size={20} />
<p>Privacy policy</p>
</Link>
</LinksWrapper>
Expand Down Expand Up @@ -81,7 +81,7 @@ const Content = styled.div`
`;

const Title = styled.h3`
${typography.decorative.subtitle1};
${typography.subtitle1};
`;

const Text = styled.p`
Expand All @@ -92,7 +92,7 @@ const Text = styled.p`

text-wrap: pretty;

${typography.decorative.body1};
${typography.body1};
`;

const Buttons = styled.div`
Expand All @@ -115,7 +115,7 @@ const Link = styled.a`
display: flex;
gap: ${vars('--spacing-xs')};
color: ${vars('--color-brand-foreground-link-rest')};
${typography.web.body1};
${typography.body1};

& > a {
color: ${vars('--color-brand-foreground-link-rest')};
Expand All @@ -128,14 +128,11 @@ const Branding = styled.div`
position: relative;
gap: ${vars('--spacing-s')};
align-items: center;
color: ${vars('--color-neutral-foreground-2-rest')};
${typography.web.subtitle1};
${typography.subtitle1};
`;

const LogoContainer = styled.div`
display: grid;
place-items: center;
padding: ${vars('--spacing-xxs')};
border-radius: ${vars('--spacing-s-nudge')};
background: #E5EFFF;
`;
4 changes: 2 additions & 2 deletions src/domains/misc/components/AccountTypeIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled, { css } from 'styled-components';

import ChainIcon from 'src/domains/chains/components/ChainIcon';
import CIcon from 'src/domains/misc/components/CIcon';
import BIcon from 'src/domains/misc/components/BIcon';
import vars from 'src/domains/styling/utils/vars';

type Props = {
Expand All @@ -15,7 +15,7 @@ type Props = {
const AccountTypeIcon = ({ type, size, className, withBorder, chainId }: Props) => (
<Wrapper>
<IconWrapper className={className} $size={size} $withBorder={withBorder}>
<CIcon
<BIcon
icon={type === 'public' ? 'PersonFilled' : 'ShieldedFilled'}
size={size / 1.6}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type Props = {
className?: string,
} & ComponentProps<'svg'>;

const CIcon = forwardRef<SVGSVGElement, Props>(({
const BIcon = forwardRef<SVGSVGElement, Props>(({
icon,
size = 24,
color,
Expand All @@ -36,9 +36,9 @@ const CIcon = forwardRef<SVGSVGElement, Props>(({
);
});

CIcon.displayName = 'CIcon';
BIcon.displayName = 'BIcon';

export default styled(CIcon)``;
export default styled(BIcon)``;

const Icon = styled.div<{
$size: Size,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* @warning Do not modify this file directly. Add or update SVG files in the icons directory and run the generator
*/

import Blanksquare from './icons/Blanksquare.svg?react';
import Add from './icons/add.svg?react';
import AddCircle from './icons/addCircle.svg?react';
import AddSquare from './icons/addSquare.svg?react';
Expand All @@ -27,7 +28,6 @@ import Chevron from './icons/chevron.svg?react';
import ChevronDoubleDownRegular from './icons/chevronDoubleDownRegular.svg?react';
import ChevronLeft from './icons/chevronLeft.svg?react';
import ClipboardPaste from './icons/clipboardPaste.svg?react';
import Common from './icons/common.svg?react';
import CompassNorthWest from './icons/compassNorthWest.svg?react';
import Copied from './icons/copied.svg?react';
import Copy from './icons/copy.svg?react';
Expand Down Expand Up @@ -76,6 +76,7 @@ import WarningRegular from './icons/warningRegular.svg?react';
import XSM from './icons/xSM.svg?react';

export const icons = {
Blanksquare,
Add,
AddCircle,
AddSquare,
Expand All @@ -99,7 +100,6 @@ export const icons = {
ChevronDoubleDownRegular,
ChevronLeft,
ClipboardPaste,
Common,
CompassNorthWest,
Copied,
Copy,
Expand Down
3 changes: 3 additions & 0 deletions src/domains/misc/components/BIcon/icons/Blanksquare.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading