summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2024-04-15 17:03:59 +0200
committerOskar Nyberg <oskar@mullvad.net>2024-04-15 17:03:59 +0200
commit65d7fa78f7d3c49aa5dcdf5484ce699619812420 (patch)
treeb44cd6a2baa19f52227028c59482903f1f481512
parent71b9e7fbe4a00a37975b35d6d646cec125a9884b (diff)
parentc396d7099944ae2e4f096c9fdedbe64e6242e75e (diff)
downloadmullvadvpn-65d7fa78f7d3c49aa5dcdf5484ce699619812420.tar.xz
mullvadvpn-65d7fa78f7d3c49aa5dcdf5484ce699619812420.zip
Merge branch 'fix-test_custom_access_methods_gui-des-821'
-rw-r--r--gui/src/renderer/components/ProxyForm.tsx14
1 files changed, 9 insertions, 5 deletions
diff --git a/gui/src/renderer/components/ProxyForm.tsx b/gui/src/renderer/components/ProxyForm.tsx
index 5fbcf34d0f..7e006f65c0 100644
--- a/gui/src/renderer/components/ProxyForm.tsx
+++ b/gui/src/renderer/components/ProxyForm.tsx
@@ -80,7 +80,7 @@ export function ProxyForm(props: ProxyFormContextProviderProps) {
<ProxyFormContextProvider {...props}>
<SettingsForm>
<ProxyFormInner />
- <ProxyFormButtons />
+ <ProxyFormButtons new={props.proxy === undefined} />
</SettingsForm>
</ProxyFormContextProvider>
);
@@ -128,7 +128,7 @@ export function NamedProxyForm(props: NamedProxyFormContainerProps) {
<SettingsForm>
<ProxyFormNameField />
<ProxyFormInner />
- <ProxyFormButtons />
+ <ProxyFormButtons new={props.proxy === undefined} />
</SettingsForm>
</ProxyFormContextProvider>
</namedProxyFormContext.Provider>
@@ -149,8 +149,12 @@ function ProxyFormNameField() {
);
}
-export function ProxyFormButtons() {
- const { proxy, onSave, onCancel, onDelete } = useContext(proxyFormContext);
+interface ProxyFormButtonsProps {
+ new: boolean;
+}
+
+export function ProxyFormButtons(props: ProxyFormButtonsProps) {
+ const { onSave, onCancel, onDelete } = useContext(proxyFormContext);
// Contains form submittability to know whether or not to enable the Add/Save button.
const formSubmittable = useSettingsFormSubmittable();
@@ -166,7 +170,7 @@ export function ProxyFormButtons() {
)}
<SmallButton onClick={onCancel}>{messages.gettext('Cancel')}</SmallButton>
<SmallButton onClick={onSave} disabled={!formSubmittable}>
- {proxy === undefined ? messages.gettext('Add') : messages.gettext('Save')}
+ {props.new ? messages.gettext('Add') : messages.gettext('Save')}
</SmallButton>
</SmallButtonGroup>
);