Merge pull request #18 from AplaProject/release/1.0.2

Release/1.0.2

Author: Saurer

public/settings.json.dist

@@ -1,7 +1,7 @@
 {
     "key": "DEFAULT_NETWORK",
     "name": "Default Network",
-    "networkID": 100,
+    "networkID": 1,
     "fullNodes": [
         "http://127.0.0.1:7079"
     ],

src/app/components/Main/UserMenu.tsx

@@ -85,7 +85,7 @@ class UserMenu extends React.Component<IUserMenuProps> {
                                 <>
                                     <li>
                                         <CloseDropdownButton onClick={this.props.onChangePassword}>
-                                            <em className="icon icon-key text-muted." />
+                                            <em className="icon icon-key text-muted" />
                                             <span>
                                                 <FormattedMessage id="general.wallet.changepassword" defaultMessage="Change password" />
                                             </span>
@@ -117,9 +117,9 @@ class UserMenu extends React.Component<IUserMenuProps> {
                         </div>
                         <ul className="dropdown-group">
                             {this.props.walletEcosystems.map(value => (
-                                <li key={value.ecosystem} style={{ overflow: 'hidden', textOverflow: 'ellipsis' }}>
+                                <li key={value.ecosystem}>
                                     {/*wallet.ecosystem !== this.props.wallet.ecosystem && this.props.switchWallet.bind(this, wallet)*/}
-                                    <CloseDropdownButton onClick={() => this.props.onSwitchEcosystem(value.ecosystem, !value.roles.length)}>
+                                    <CloseDropdownButton style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }} onClick={() => this.props.onSwitchEcosystem(value.ecosystem, !value.roles.length)}>
                                         {value.name ?
                                             (
                                                 value.name

src/app/components/Modal/PageModal.tsx

@@ -10,6 +10,7 @@ import Protypo from 'containers/Widgets/Protypo';
 import { TProtypoElement } from 'apla/protypo';
 
 export interface IPageModalProps {
+    name: string;
     title: string;
     width?: number;
     tree: TProtypoElement[];

src/app/components/Modal/Wrapper.tsx

@@ -121,7 +121,20 @@ class ModalWrapper extends React.Component<IModalWrapperProps, IModalWrapperStat
     }
 
     componentWillReceiveProps(props: IModalWrapperProps & { children: React.ReactNode }) {
-        this.enqueueModal(props.children);
+        if (!this.props.children) {
+            this.enqueueModal(props.children);
+        }
+        else {
+            const updateProc = (this.props.children as any || {}).key === (props.children as any || {}).key;
+            if (updateProc) {
+                this.setState({
+                    activeModal: props.children
+                });
+            }
+            else {
+                this.enqueueModal(props.children);
+            }
+        }
     }
 
     onEntered = () => {
@@ -184,7 +197,7 @@ class ModalWrapper extends React.Component<IModalWrapperProps, IModalWrapperStat
                         </Transition>
                     </StyledModalWrapper>
                 )}
-            </Transition >
+            </Transition>
 
         );
     }

src/app/components/Validation/ValidatedRadioGroup.tsx

@@ -71,6 +71,8 @@ export default class ValidatedRadioGroup extends React.Component<IValidatedRadio
         if (this.props.onChange) {
             this.props.onChange(e);
         }
+
+        (this.context.form as ValidatedForm).emitUpdate(this.props.name, (e.target as any).value);
     }
 
     onBlur = (e: React.FocusEvent<HTMLInputElement>) => {

src/app/modules/modal/epics/modalPageEpic.ts

@@ -23,9 +23,10 @@ const modalPageEpic: Epic = (action$, store, { api }) => action$.ofAction(modalP
 
         })).map(payload =>
             modalShow({
-                id: 'PAGE_MODAL',
+                id: 'PAGE_MODAL:' + action.payload.name,
                 type: 'PAGE_MODAL',
                 params: {
+                    name: action.payload.name,
                     title: action.payload.title || action.payload.name,
                     width: action.payload.width,
                     tree: payload.tree