Merge pull request #18 from oxygenpay/develop

merge: develop

Author: swift1337

ui-dashboard/src/components/link-input/link-input.tsx

@@ -1,5 +1,5 @@
 import * as React from "react";
-import {Form, Select, Space, FormRule, Input} from "antd";
+import {Form, Select, FormRule, Input} from "antd";
 
 interface Props {
     placeholder: string;
@@ -44,16 +44,18 @@ const LinkInput: React.FC<Props> = (props: Props) => {
             style={{width: 300}}
             required={props.required}
         >
-            <Space.Compact>
-                <Select
-                    defaultValue="https://"
-                    options={[{value: "https://", label: "https://"}]}
-                    className="withdraw-form__currency-selection"
-                    disabled
-                    showArrow={false}
-                />
-                <Input placeholder={props.placeholder} />
-            </Space.Compact>
+            <Input
+                addonBefore={
+                    <Select
+                        defaultValue="https://"
+                        options={[{value: "https://", label: "https://"}]}
+                        className="withdraw-form__currency-selection"
+                        disabled
+                        showArrow={false}
+                    />
+                }
+                placeholder={props.placeholder}
+            />
         </Form.Item>
     );
 };

ui-dashboard/src/components/merchant-form/merchant-form.tsx

@@ -1,5 +1,4 @@
 import * as React from "react";
-import {useMount} from "react-use";
 import {Form, Input, Button, Space, FormInstance} from "antd";
 import {Merchant, MerchantBase} from "src/types";
 import {sleep} from "src/utils";
@@ -17,14 +16,9 @@ const linkPrefix = "https://";
 const MerchantForm: React.FC<Props> = (props: Props) => {
     const [form] = Form.useForm<MerchantBase>();
 
-    useMount(() => {
-        if (props.activeMerchant) {
-            form.setFieldsValue(props.activeMerchant);
-        }
-    });
-
     React.useEffect(() => {
         if (props.activeMerchant) {
+            props.activeMerchant.website = props.activeMerchant.website.slice(8);
             form.setFieldsValue(props.activeMerchant);
         }
     }, [props.activeMerchant]);

ui-dashboard/src/components/webhook-settings-form/webhook-settings-form.tsx

@@ -18,7 +18,7 @@ const WebhookSettingsForm: React.FC<Props> = (props: Props) => {
 
     React.useEffect(() => {
         if (props.webhookSettings) {
-            form.setFieldsValue(props.webhookSettings);
+            form.setFieldsValue({...props.webhookSettings, url: props.webhookSettings.url.slice(8)});
         }
     }, [props.webhookSettings]);