Merge branch 'local' into develop

@@ -263,58 +263,6 @@ function parseBoards(json) {
     return list;
 }
 
-/*
-export function updateUploadState(url, fileName) {
-
-    return (dispatch, getState) => {
-
-        let {posting} = getState();
-
-        let assets = posting.assets.toJS();
-        for (var i = 0; i < assets.length; i++) {
-            if (assets[i].name == fileName) {
-                assets[i].webURL = url;
-                assets[i].finished = true;
-            }
-        }
-        let finishCount = posting.finishedCount;
-        finishCount++;
-        let percent = parseFloat(finishCount)/assets.length;
-        let payloadData = {assets,finishCount,percent};
-        dispatch(uploadImageStateChanged(payloadData));
-
-        dispatch(() => {
-            NativeModules.YH_CommunityHelper.uid().then(ssouid => {
-                let {posting} = getState();
-                if (posting.postPercent == 1) {
-                    let assets = posting.assets.toJS();
-                    let imageStr = '';
-                    let sizeStr = '';
-                    for (let i = 0; i < assets.length; i++) {
-                        imageStr += assets[i].webURL+',';
-                        sizeStr += assets[i].width + 'x' + assets[i].height +',';
-                    }
-                    let param = {
-                        postsTitle: posting.title,
-                        uid: ssouid,
-                        forumCode: posting.currentBoardId,
-                        contentData: posting.content,
-                        images: imageStr,
-                        sizes: sizeStr,
-                    }
-                    return new PostingService().commitPost(param).then((json) => {
-                        store.delete(POSTING_CACHE_KEY);
-                        dispatch(postFinished(true));
-                    }).catch(error => {
-                        dispatch(postFinished(false));
-                    });
-                }
-            });
-        });
-    }
-}
-*/
-
 export function postStart() {
     return {
         type: POSTING_POST_START,
@@ -396,17 +344,15 @@ function shouldCommitPost(state) {
 
 function commitTextPost() {
     return (dispatch, getState) => {
-        NativeModules.YH_CommunityHelper.uid().then(uid => {
-            let {posting} = getState();
-            let {post} = posting;
-            let params = {
-                postsTitle: post.title,
-                uid: uid,
-                forumCode: post.sectionId,
-                contentData: post.content,
-            }
-            dispatch(commitPost(params));
-        });
+        let {posting, user} = getState();
+        let {post} = posting;
+        let params = {
+            postsTitle: post.title,
+            uid: user.profile.uid,
+            forumCode: post.sectionId,
+            contentData: post.content,
+        }
+        dispatch(commitPost(params));
     }
 }