oovg · makoto · Aug 25, 2019 · Aug 28, 2019 · Aug 28, 2019 · Aug 28, 2019
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -7,7 +7,7 @@
     <meta name="theme-color" content="#000000" />
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
 
-    <title>YangDAO</title>
+    <title>OrochiDAO</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/public/manifest.json b/public/manifest.json
@@ -1,6 +1,6 @@
 {
-  "name": "YangDAO",
-  "short_name": "YangDao",
+  "name": "OrochiDAO",
+  "short_name": "OrochiDao",
   "theme_color": "#bd86fe",
   "background_color": "#ef497b",
   "display": "minimal-ui",

diff --git a/serverless.yml b/serverless.yml
@@ -1,4 +1,4 @@
-service: yang-dao-app-v1
+service: orochidao
 
 plugins:
   - serverless-single-page-app-plugin
@@ -12,7 +12,7 @@ provider:
   runtime: nodejs8.10
   stage: dev
   region: us-east-1
-  profile: yang-gang
+  profile: default
 
 resources:
   - ${file(resources/s3-bucket.yml)}

diff --git a/src/_variables.scss b/src/_variables.scss
@@ -5,7 +5,7 @@ $base-font: 'Roboto', sans-serif;
 $data-font: 'Montserrat', sans-serif;
 $base-font-color: white;
 $base-padding: 15px;
-$brand: 'yang-ico.png';
+$brand: 'orochi.jpeg';
 
 // Color Palette
 $app-background: #0d1424;

diff --git a/src/assets/background.jpg b/src/assets/background.jpg
diff --git a/src/assets/orochi.jpeg b/src/assets/orochi.jpeg
diff --git a/src/components/proposal/ProposalDetail.js b/src/components/proposal/ProposalDetail.js
@@ -31,6 +31,7 @@ const ProposalDetail = ({
 
   useEffect(() => {
     const fetchData = async () => {
+      console.log('fetchData', proposal)
       const uuid = proposal.details.split('~')[1];
 
       if (uuid) {

diff --git a/src/components/proposal/ProposalForm.js b/src/components/proposal/ProposalForm.js
@@ -37,6 +37,7 @@ const ProposalForm = ({ history }) => {
               applicant: '',
               tokenTribute: 0,
               sharesRequested: 0,
+              interestRecipientMapRequested:0
             }}
             validate={(values) => {
               let errors = {};
@@ -66,7 +67,8 @@ const ProposalForm = ({ history }) => {
                   web3Service.toWei(values.tokenTribute),
                   values.sharesRequested + '',
                   `id~${uuid}~title~${values.title}`,
-                  true,
+                  values.interestRecipientMapRequested,
+                  true
                 );
                 const estimated = await sdk.estimateAccountTransaction(
                   dao.contractAddr,
@@ -215,6 +217,20 @@ const ProposalForm = ({ history }) => {
                   </div>
                 )}
                 </Field>
+                <Field name="interestRecipientMapRequested">
+                {({ field, form }) => (
+                  <div
+                    className={
+                      field.value
+                        ? 'Field HasValue'
+                        : 'Field '
+                    }
+                  >
+                  <label>RDai Hat ID</label>
+                  <input type="number" {...field} />
+                  </div>
+                )}
+                </Field>
                 <ErrorMessage name="sharesRequested">
                   {(msg) => <div className="Error">{msg}</div>}
                 </ErrorMessage>

diff --git a/src/components/shared/IconDai.js b/src/components/shared/IconDai.js
@@ -2,12 +2,24 @@ import React from 'react';
 
 const IconDai = ({ message }) => {
   return (
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2500 2500">
-            <title>dai</title>
-            <path className="a" fill="#ffce45" d="M1250,287.71l941.84,941.84L1250,2171.4,308.16,1229.55Z"/>
-            <path className="b" fill="#febe44" d="M1250,1536.89,307.38,1229.51,1250,287.68l942.62,941.83Z"/>
-            <path className="c" fill="#fff" d="M635.25,1168h430.32L1250,963.11,1454.92,1168h430.33L1250,481.58Z"/>
-            <path className="d" fill="#d9a547" opacity="0.42" isolation="isolate" d="M1250,2171.34V287.68l941.83,941.83L1250,2171.34Z"/>
+    <svg viewBox="0 0 767 740" version="1.1" xmlns="http://www.w3.org/2000/svg">
+        <title>logo</title>
+        <desc>Created with Sketch.</desc>
+        <defs>
+            <linearGradient x1="9.39779518%" y1="88.3248351%" x2="106.181899%" y2="34.5692976%" id="linearGradient-1">
+                <stop stop-color="#FF3A54" offset="0%"></stop>
+                <stop stop-color="#FFB700" offset="41.7289233%"></stop>
+                <stop stop-color="#32C065" offset="72.4180405%"></stop>
+                <stop stop-color="#1239FF" offset="100%"></stop>
+            </linearGradient>
+        </defs>
+        <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+            <g id="Group-3" transform="translate(-173.000000, -185.000000)" fill="url(#linearGradient-1)">
+                <g id="logo" transform="translate(173.000000, 185.000000)">
+                    <path d="M0,382.958264 C0.162615447,505.481578 59.0299986,620.529641 158.365566,692.457315 C160.216426,684.109766 161.141363,674.50701 161.141363,663.572287 L161.141363,293.353076 C161.141363,263.971034 154.832031,244.23244 142.221006,234.1586 C133.813738,227.442772 117.429542,222.412888 93.0485587,219.054827 L93.0485587,188.822038 L331.399144,188.822038 L331.399144,288.318469 C355.780127,255.578513 376.794626,231.648332 394.449884,216.537671 C428.079004,187.995058 462.958983,173.718265 499.110319,173.718265 C536.943049,173.718265 565.106517,186.318512 583.602545,211.503063 C597.054095,229.13221 603.796033,249.277233 603.796033,271.943299 C603.796033,292.930458 598.326241,310.966969 587.396758,326.077779 C573.104388,346.225361 551.657431,356.310567 523.07269,356.310567 C496.169344,356.310567 470.524543,339.518783 446.143511,305.939398 C434.373356,289.989307 422.619511,282.012465 410.849306,282.012465 C389.831063,282.012465 371.335231,295.45101 355.361516,322.314567 C342.750491,344.141057 336.441061,370.586228 336.441159,401.647129 L336.441159,639.645109 C336.441159,679.101237 342.318032,705.546212 354.088237,718.977572 C365.858392,732.409425 390.252089,743.226056 428.496384,739.116002 C587.616634,734.446492 766.754352,553.234574 767,359.31101 C767.01296,147.813606 595.31071,0.00113170418 383.500049,0 C171.689241,0.00113170418 -0.0129599583,171.46086 0,382.958264 Z" id="path10"></path>
+                </g>
+            </g>
+        </g>
     </svg>
   );
 };

diff --git a/src/components/shared/TopNav.js b/src/components/shared/TopNav.js
@@ -4,7 +4,7 @@ import { withRouter, Link } from 'react-router-dom';
 import { CurrentUserContext } from '../../contexts/Store';
 import BcToast from './BcToast';
 
-import Brand from '../../assets/yang-brand.png';
+import Brand from '../../assets/orochi.jpeg';
 import './TopNav.scss';
 import useModal from './useModal';
 import Modal from './Modal'