fix merge conflict

eoscostarica · Oct 10, 2021 · 5891b3d · 5891b3d
2 parents ce54f9e + b6a415c
commit 5891b3d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/contracts/rateproducer/rateproducer.abi → ...cts/rateproducer/rateproducer_mainnet.abi b/contracts/rateproducer/rateproducer.abi → ...cts/rateproducer/rateproducer_mainnet.abi
diff --git a/contracts/rateproducer/rateproducer.wasm → ...roducer/rateproducer_mainnet_mainnet.wasm b/contracts/rateproducer/rateproducer.wasm → ...roducer/rateproducer_mainnet_mainnet.wasm
diff --git a/webapp/src/context/models/user.js b/webapp/src/context/models/user.js
@@ -31,7 +31,9 @@ export const getUserDataModeled = async ual => {
   const rpc = getRpc(ual)
 
   const account = await rpc.get_account(accountName)
-  const { rows: edenMembers } = await rpc.get_table_rows({
+  const {
+    rows: [edenMembers]
+  } = await rpc.get_table_rows({
     json: true,
     code: mainConfig.contractEden,
     scope: 0,
@@ -42,10 +44,7 @@ export const getUserDataModeled = async ual => {
     show_payer: false
   })
 
-  if (
-    edenMembers.length > 0 &&
-    edenMembers[0].value[1].account === accountName
-  ) {
+  if (edenMembers?.length > 0 && edenMembers[1].account === accountName) {
     edenMember = true
   }