diff --git a/frontend/src/basic/RobotPage/RobotProfile.tsx b/frontend/src/basic/RobotPage/RobotProfile.tsx index 9dcd6069..3df7bb54 100644 --- a/frontend/src/basic/RobotPage/RobotProfile.tsx +++ b/frontend/src/basic/RobotPage/RobotProfile.tsx @@ -336,45 +336,20 @@ const RobotProfile = ({ - {mobileView && ( - - - - )} - - {!mobileView && ( - - - - + + - )} + diff --git a/frontend/src/components/SettingsForm/index.tsx b/frontend/src/components/SettingsForm/index.tsx index 309176e8..65661a98 100644 --- a/frontend/src/components/SettingsForm/index.tsx +++ b/frontend/src/components/SettingsForm/index.tsx @@ -28,9 +28,6 @@ import { NotificationsActive, } from '@mui/icons-material'; import { systemClient } from '../../services/System'; -import { TorIcon } from '../Icons'; -import { apiClient } from '../../services/api'; -import { websocketClient } from '../../services/Websocket'; interface SettingsFormProps { dense?: boolean; @@ -242,32 +239,6 @@ const SettingsForm = ({ dense = false }: SettingsFormProps): React.JSX.Element = - {window.navigator.userAgent.includes('robosats') && ( - - - - - { - setSettings({ ...settings, useProxy }); - systemClient.setItem('settings_use_proxy', String(useProxy)); - apiClient.useProxy = useProxy; - websocketClient.useProxy = useProxy; - }} - > - - {t('Build-in')} - - - {t('Disabled')} - - - - )} - {client == 'mobile' && ( diff --git a/frontend/src/contexts/AppContext.tsx b/frontend/src/contexts/AppContext.tsx index 1f3db1d4..a1c39ffc 100644 --- a/frontend/src/contexts/AppContext.tsx +++ b/frontend/src/contexts/AppContext.tsx @@ -161,7 +161,7 @@ export interface UseAppStoreType { export const initialAppContext: UseAppStoreType = { theme: undefined, - torStatus: 'OFF', + torStatus: 'STARTING', settings: getSettings(), setSettings: () => {}, page: entryPage, diff --git a/frontend/static/locales/ca.json b/frontend/static/locales/ca.json index 423457c1..6d990025 100644 --- a/frontend/static/locales/ca.json +++ b/frontend/static/locales/ca.json @@ -524,7 +524,6 @@ "finished order": "Ordre finalitzada", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "Build-in", "Dark": "Fosc", "Light": "Clar", "Mainnet": "Mainnet", diff --git a/frontend/static/locales/cs.json b/frontend/static/locales/cs.json index 14bc1cc0..163a17fe 100644 --- a/frontend/static/locales/cs.json +++ b/frontend/static/locales/cs.json @@ -524,7 +524,6 @@ "finished order": "dokončená objednávka", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "Vylepšené", "Dark": "Tmavé", "Light": "Světlé", "Mainnet": "Mainnet", diff --git a/frontend/static/locales/de.json b/frontend/static/locales/de.json index 54b70ad5..2c2dbaf1 100644 --- a/frontend/static/locales/de.json +++ b/frontend/static/locales/de.json @@ -524,7 +524,6 @@ "finished order": "abgeschlossene Bestellung", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "Eingebaut", "Dark": "Dunkel", "Light": "Hell", "Mainnet": "Mainnet", diff --git a/frontend/static/locales/en.json b/frontend/static/locales/en.json index 8f0b42a4..7ed4a66e 100644 --- a/frontend/static/locales/en.json +++ b/frontend/static/locales/en.json @@ -524,7 +524,6 @@ "finished order": "finished order", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "Build-in", "Dark": "Dark", "Light": "Light", "Mainnet": "Mainnet", diff --git a/frontend/static/locales/es.json b/frontend/static/locales/es.json index 30bf7c12..0ce48149 100644 --- a/frontend/static/locales/es.json +++ b/frontend/static/locales/es.json @@ -524,7 +524,6 @@ "finished order": "orden finalizada", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "Integrado", "Dark": "Oscuro", "Light": "Claro", "Mainnet": "Mainnet", diff --git a/frontend/static/locales/eu.json b/frontend/static/locales/eu.json index 083c0509..c8980e4d 100644 --- a/frontend/static/locales/eu.json +++ b/frontend/static/locales/eu.json @@ -524,7 +524,6 @@ "finished order": "eskaera amaituta", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "Integratua", "Dark": "Iluna", "Light": "Argia", "Mainnet": "Mainnet", diff --git a/frontend/static/locales/fr.json b/frontend/static/locales/fr.json index 42e753d3..63392b2c 100644 --- a/frontend/static/locales/fr.json +++ b/frontend/static/locales/fr.json @@ -524,7 +524,6 @@ "finished order": "commande terminée", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "Intégré", "Dark": "Sombre", "Light": "Clair", "Mainnet": "Mainnet", diff --git a/frontend/static/locales/it.json b/frontend/static/locales/it.json index 21fa6400..45fd09db 100644 --- a/frontend/static/locales/it.json +++ b/frontend/static/locales/it.json @@ -524,7 +524,6 @@ "finished order": "ordine completato", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "Integrato", "Dark": "Scuro", "Light": "Chiaro", "Mainnet": "Mainnet", diff --git a/frontend/static/locales/ja.json b/frontend/static/locales/ja.json index b8e48bbe..39e3f584 100644 --- a/frontend/static/locales/ja.json +++ b/frontend/static/locales/ja.json @@ -524,7 +524,6 @@ "finished order": "終了したオーダー", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "ビルトイン", "Dark": "ダーク", "Light": "ライト", "Mainnet": "メインネット", diff --git a/frontend/static/locales/pl.json b/frontend/static/locales/pl.json index fac388fc..77795b98 100644 --- a/frontend/static/locales/pl.json +++ b/frontend/static/locales/pl.json @@ -524,7 +524,6 @@ "finished order": "zakończone zamówienie", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "Wbudowany", "Dark": "Ciemny", "Light": "Jasny", "Mainnet": "Mainnet", diff --git a/frontend/static/locales/pt.json b/frontend/static/locales/pt.json index f2aefb67..ce9cd19f 100644 --- a/frontend/static/locales/pt.json +++ b/frontend/static/locales/pt.json @@ -524,7 +524,6 @@ "finished order": "ordem finalizada", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "Integrado", "Dark": "Escuro", "Light": "Claro", "Mainnet": "Mainnet", diff --git a/frontend/static/locales/ru.json b/frontend/static/locales/ru.json index 208e0827..e43a9826 100644 --- a/frontend/static/locales/ru.json +++ b/frontend/static/locales/ru.json @@ -524,7 +524,6 @@ "finished order": "завершенный ордер", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "Встроенный", "Dark": "Темный", "Light": "Светлый", "Mainnet": "Основная сеть", diff --git a/frontend/static/locales/sv.json b/frontend/static/locales/sv.json index 18b6111c..33d4d2a2 100644 --- a/frontend/static/locales/sv.json +++ b/frontend/static/locales/sv.json @@ -524,7 +524,6 @@ "finished order": "avslutad order", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "Inbyggd", "Dark": "Mörk", "Light": "Ljusa", "Mainnet": "Mainnet", diff --git a/frontend/static/locales/sw.json b/frontend/static/locales/sw.json index a8e018d4..3acc91ac 100644 --- a/frontend/static/locales/sw.json +++ b/frontend/static/locales/sw.json @@ -524,7 +524,6 @@ "finished order": "agizo lililokamilika", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "Jengwa ndani", "Dark": "Giza", "Light": "Mwanga", "Mainnet": "Mainnet", diff --git a/frontend/static/locales/th.json b/frontend/static/locales/th.json index b8275011..f661f47b 100644 --- a/frontend/static/locales/th.json +++ b/frontend/static/locales/th.json @@ -524,7 +524,6 @@ "finished order": "คำสั่งซื้อเสร็จสิ้น", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "ในตัว", "Dark": "มืด", "Light": "สว่าง", "Mainnet": "Mainnet", diff --git a/frontend/static/locales/zh-SI.json b/frontend/static/locales/zh-SI.json index 31909184..917d1a97 100644 --- a/frontend/static/locales/zh-SI.json +++ b/frontend/static/locales/zh-SI.json @@ -524,7 +524,6 @@ "finished order": "已完成的订单", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "内置", "Dark": "黑色", "Light": "浅色", "Mainnet": "主网", diff --git a/frontend/static/locales/zh-TR.json b/frontend/static/locales/zh-TR.json index 769f7414..21b90997 100644 --- a/frontend/static/locales/zh-TR.json +++ b/frontend/static/locales/zh-TR.json @@ -524,7 +524,6 @@ "finished order": "完成的訂單", "#50": "Phrases in components/SettingsForm/index.tsx", "API": "API", - "Build-in": "內建", "Dark": "深色", "Light": "淺色", "Mainnet": "主網", diff --git a/mobile_new/app/src/main/res/drawable/ic_launcher_background.xml b/mobile_new/app/src/main/res/drawable/ic_launcher_background.xml index 07d5da9c..b5cd46e1 100644 --- a/mobile_new/app/src/main/res/drawable/ic_launcher_background.xml +++ b/mobile_new/app/src/main/res/drawable/ic_launcher_background.xml @@ -5,166 +5,6 @@ android:viewportWidth="108" android:viewportHeight="108"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mobile_new/app/src/main/res/drawable/ic_launcher_foreground.xml b/mobile_new/app/src/main/res/drawable/ic_launcher_foreground.xml index 7706ab9e..d2d78361 100644 --- a/mobile_new/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/mobile_new/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -4,27 +4,180 @@ android:height="108dp" android:viewportWidth="108" android:viewportHeight="108"> - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mobile_new/app/src/main/res/mipmap-hdpi/ic_icon.png b/mobile_new/app/src/main/res/mipmap-hdpi/ic_icon.png new file mode 100644 index 00000000..ab5e6f08 Binary files /dev/null and b/mobile_new/app/src/main/res/mipmap-hdpi/ic_icon.png differ diff --git a/mobile_new/app/src/main/res/mipmap-hdpi/ic_launcher.png b/mobile_new/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..14778be0 Binary files /dev/null and b/mobile_new/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/mobile_new/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/mobile_new/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78e..00000000 Binary files a/mobile_new/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/mobile_new/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/mobile_new/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 00000000..185b2941 Binary files /dev/null and b/mobile_new/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/mobile_new/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/mobile_new/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1..00000000 Binary files a/mobile_new/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/mobile_new/app/src/main/res/mipmap-mdpi/ic_launcher.png b/mobile_new/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..789e5e69 Binary files /dev/null and b/mobile_new/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/mobile_new/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/mobile_new/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64..00000000 Binary files a/mobile_new/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/mobile_new/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/mobile_new/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 00000000..f7a3f4e7 Binary files /dev/null and b/mobile_new/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/mobile_new/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/mobile_new/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611da..00000000 Binary files a/mobile_new/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/mobile_new/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/mobile_new/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..46f76340 Binary files /dev/null and b/mobile_new/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/mobile_new/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/mobile_new/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070..00000000 Binary files a/mobile_new/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/mobile_new/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/mobile_new/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 00000000..1acd5bd2 Binary files /dev/null and b/mobile_new/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/mobile_new/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/mobile_new/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956..00000000 Binary files a/mobile_new/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/mobile_new/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/mobile_new/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..99d79b0d Binary files /dev/null and b/mobile_new/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/mobile_new/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/mobile_new/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77f..00000000 Binary files a/mobile_new/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/mobile_new/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/mobile_new/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..5cb357f2 Binary files /dev/null and b/mobile_new/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/mobile_new/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/mobile_new/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f508..00000000 Binary files a/mobile_new/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/mobile_new/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/mobile_new/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..6125b521 Binary files /dev/null and b/mobile_new/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/mobile_new/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/mobile_new/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d6427..00000000 Binary files a/mobile_new/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/mobile_new/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/mobile_new/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..83eb4001 Binary files /dev/null and b/mobile_new/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/mobile_new/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/mobile_new/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae37..00000000 Binary files a/mobile_new/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ