fix(ui): ensure select value from items list

LN-Zap · Sep 4, 2019 · f3423d4 · f3423d4
1 parent 242b2bd
commit f3423d4
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/renderer/components/Form/Select.js b/renderer/components/Form/Select.js
@@ -165,18 +165,30 @@ const Select = props => {
         openMenu,
         toggleMenu,
       }) => {
+        /**
+         * getInitialValue - Get the initial selected value.
+         *
+         * @returns {string} Initial selected value.
+         */
         const getInitialValue = () => {
           if (selectedItem) {
             return selectedItem.value
           }
-
           if (initialSelectedItem) {
-            initialSelectedItem.value
+            return initialSelectedItem.value
           }
-
           return ''
         }
 
+        /**
+         * getValue - Get the current selected value.
+         *
+         * @returns {string} Current selected value.
+         */
+        const getValue = () => {
+          return selectedItem ? selectedItem.value : ''
+        }
+
         return (
           <div style={{ position: 'relative' }}>
             {label && (
@@ -199,6 +211,7 @@ const Select = props => {
                 fieldApi={fieldApi}
                 fieldState={fieldState}
                 forwardedRef={inputRef}
+                value={getValue()}
               />
               <Box>
                 {isOpen ? <ArrowIconOpen width={iconSize} /> : <ArrowIconClosed width={iconSize} />}