Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
"desktop:dev": "yarn build:desktop:dev && yarn tauri dev",
"desktop:build": "yarn build:desktop && yarn tauri build",
"desktop:reset": "rm -rf ~/Library/WebKit/com.miden.wallet ~/Library/Caches/com.miden.wallet ~/Library/Application\\ Support/com.miden.wallet",
"build:devnet": "rimraf ./dist && yarn clear:webpack-cache && cross-env MIDEN_NETWORK=devnet DISABLE_TS_CHECKER=true NODE_ENV=development MODE_ENV=production MANIFEST_VERSION=3 webpack",
"dev:devnet": "cross-env MIDEN_NETWORK=devnet DISABLE_TS_CHECKER=true NODE_ENV=development MODE_ENV=development MANIFEST_VERSION=3 webpack --watch --progress",
"build:mobile:devnet": "rimraf ./dist/mobile && cross-env MIDEN_NETWORK=devnet DISABLE_TS_CHECKER=true NODE_ENV=development MODE_ENV=production webpack --config webpack.mobile.config.js",
"build:desktop:devnet": "rimraf ./dist/desktop && cross-env MIDEN_NETWORK=devnet DISABLE_TS_CHECKER=true NODE_ENV=development MODE_ENV=production webpack --config webpack.desktop.config.js",
"tauri": "tauri"
},
"dependencies": {
Expand Down
4 changes: 3 additions & 1 deletion src/app/atoms/Spinner/Spinner.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import React, { FC } from 'react';

import { PRIMARY_HEX } from 'utils/brand-colors';

import CircularProgress from '../CircularProgress';

type SpinnerProps = {
color?: string;
};

const Spinner: FC<SpinnerProps> = ({ color = '#FF5500' }) => {
const Spinner: FC<SpinnerProps> = ({ color = PRIMARY_HEX }) => {
return <CircularProgress borderWeight={2} progress={40} circleColor={color} circleSize={24} spin={true} />;
};

Expand Down
3 changes: 2 additions & 1 deletion src/app/atoms/ToggleSwitch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import classNames from 'clsx';
import { AnalyticsEventCategory, TestIDProps, useAnalytics } from 'lib/analytics';
import { hapticMedium } from 'lib/mobile/haptics';
import { checkedHandler } from 'lib/ui/inputHandlers';
import { ACCENT_HEX } from 'utils/brand-colors';

type ToggleSwitchProps = InputHTMLAttributes<HTMLInputElement> &
TestIDProps & {
Expand Down Expand Up @@ -55,7 +56,7 @@ const ToggleSwitch = forwardRef<HTMLInputElement, ToggleSwitchProps>(
style={{
width: '40px',
height: '22px',
backgroundColor: localChecked ? '#EE622F' : '#E5E7EB',
backgroundColor: localChecked ? ACCENT_HEX : '#E5E7EB',
pointerEvents: 'none'
}}
/>
Expand Down
3 changes: 3 additions & 0 deletions src/app/icons/logos/miden-devnet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/app/icons/settings/address-book-devnet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/app/icons/settings/advanced-settings-devnet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/app/icons/settings/dapp-devnet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/app/icons/settings/encrypted-wallet-file-devnet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/app/icons/settings/general-devnet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/app/icons/settings/language-devnet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/app/icons/settings/privacy-policy-devnet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/app/icons/settings/secret-key-devnet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/app/icons/settings/seed-phrase-devnet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/app/icons/settings/tos-devnet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading