Merge pull request #82 from leo42/BugFixing

Bug fixing
leo42 · Feb 14, 2024 · 890e94e · 890e94e
2 parents f7befec + eda4b9e
commit 890e94e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/Fe/src/components/Multisig/MultisigContainer.js b/Fe/src/components/Multisig/MultisigContainer.js
@@ -24,10 +24,10 @@ state= {
     dAppConnector: null,
 }
 
-componentDidUpdate(prevProps) {
+componentDidUpdate(prevProps) { 
 
   if (this.props.settings !== prevProps.settings) {
-    this.newSettings(this.props.root.state.settings)
+    this.newSettings(this.props.settings)
 
   }
 }

diff --git a/Fe/src/components/SettingsModal.js b/Fe/src/components/SettingsModal.js
@@ -188,7 +188,7 @@ function SettingsModal(props) {
         <span>Metadata Provider</span>
             <select onChange={(event) => setMetadataProvider(event.target.value)} value={metadataProvider} defaultValue={metadataProvider}>
               <option value="None">None</option>
-              <option value="Koios">Koios</option>
+              {/* <option value="Koios">Koios</option> */}
               <option value="Maestro">Maestro</option>
              { provider && <option value="Blockfrost">Blockfrost</option> }
             </select>

diff --git a/Fe/src/components/WalletCreateTx.js b/Fe/src/components/WalletCreateTx.js
@@ -212,7 +212,7 @@ class WalletCreateTx extends React.Component {
     </div>
     ))}
     </div>
-    <TokenDropdownMenu ballances={this.props.wallet.getBalanceFull(this.state.sendFrom)} f={ (tokenId) => this.addToken(tokenId,index )} index={index+this.state.sendFrom}></TokenDropdownMenu>
+    { Object.values(this.props.wallet.getBalanceFull(this.state.sendFrom)).length > 1 && <TokenDropdownMenu ballances={this.props.wallet.getBalanceFull(this.state.sendFrom)} f={ (tokenId) => this.addToken(tokenId,index )} index={index+this.state.sendFrom}></TokenDropdownMenu>}
     { this.props.root.state.settings.sendAll ? <label> Send all: <input type="checkbox" checked={this.state.sendAll === index ? true : false } onChange={()=> this.handleSendAlltoggle(index)}></input>  </label> : ""}
   </div>
   ))

diff --git a/Fe/src/helpers/Messaging.js b/Fe/src/helpers/Messaging.js
@@ -36,7 +36,12 @@ class Messaging {
    async connect() {
 
        // this.port = chrome.runtime.connect("jfjmokidpopgdhcilhkoanmjcimijgng"); // Selfbuild ID
+       try{
         this.port = chrome.runtime.connect("mdnadibcilebgfdkadlhegdpgpglljmn");   //playstore ID
+       }catch(e){
+              console.log(e)
+              return
+         } 
         this.port.onMessage.addListener( async (message) => {
             if(message.action){
                 let response

diff --git a/Fe/src/helpers/newLucid.js b/Fe/src/helpers/newLucid.js
@@ -17,14 +17,13 @@ async function getNewLucidInstance(settings){
 async function changeProvider(lucid, settings){
     return new Promise(async (resolve, reject) => {
         const provider = getProvider(settings);
-        lucid.switchProvider(provider);
+        await lucid.switchProvider(provider);
         resolve(lucid);
     });
 
 }
 
 function getProvider(settings){
-    console.log(settings)
     switch(settings.provider){
         case "Blockfrost":
             return new Blockfrost(settings.api.url, settings.api.projectId);

diff --git a/Fe/src/index.js b/Fe/src/index.js
@@ -77,7 +77,6 @@ class App extends React.Component {
       return
     }
     const settings = {...this.state.settings, ...newSettings}
-    localStorage.setItem("settings", JSON.stringify(newSettings))
 
     this.setState({settings})
   }