chore: resolve merge conflicts

contract/builder/start-tribbles-airdrop.js

@@ -5,8 +5,6 @@ import { Fail } from '@endo/errors';
 import { makeTracer, deeplyFulfilledObject } from '@agoric/internal';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 
-const ONE_DAY = 86_000n;
-
 const AIRDROP_TIERS_STATIC = [9000n, 6500n, 3500n, 1500n, 750n].map(
   x => x * 1_000_000n,
 );
@@ -181,15 +179,12 @@ export const startAirdrop = async (powers, config) => {
       value: 5n,
     }),
   };
-  trace('BEFORE assert(config?.options?.merkleRoot');
   assert(
     customTerms?.merkleRoot,
     'can not start contract without merkleRoot???',
   );
-  trace('AFTER assert(config?.options?.merkleRoot');
   const marshaller = await E(board).getReadonlyMarshaller();
 
-  console.log('------------------------');
   const startOpts = {
     installation: await airdropInstallationP,
     label: contractName,

contract/test/airdrop.test.js

@@ -20,19 +20,19 @@ import { makeMockTools } from '../tools/boot-tools.js';
 import {
   makeTerms,
   startAirdrop as startAirdropCampaignContract,
-} from '../src/airdrop.proposal.js';
+} from '../src/tribbles/airdrop.proposal.js';
 
 /** @type {import('ava').TestFn<Awaited<ReturnType<setupTestContext>>>} */
 const test = anyTest;
 
 const nodeRequire = createRequire(import.meta.url);
 
 const bundleRoots = {
-  airdrop: nodeRequire.resolve('../src/airdrop.contract.js'),
+  airdrop: nodeRequire.resolve('../src/tribbles/airdrop.contract.js'),
 };
 
 const scriptRoots = {
-  airdrop: nodeRequire.resolve('../src/airdrop.proposal.js'),
+  airdrop: nodeRequire.resolve('../src/tribbles/airdrop.proposal.js'),
 };
 
 /** @param {import('ava').ExecutionContext} t */

contract/test/bundle-source.test.js

@@ -12,7 +12,7 @@ import { E, passStyleOf } from '@endo/far';
 import { makeZoeKitForTest } from '@agoric/zoe/tools/setup-zoe.js';
 
 const myRequire = createRequire(import.meta.url);
-const contractPath = myRequire.resolve(`../src/airdrop.contract.js`);
+const contractPath = myRequire.resolve(`../src/tribbles/airdrop.contract.js`);
 
 test.serial('bundleSource() bundles the contract for use with zoe', async t => {
   const bundle = await bundleSource(contractPath);

contract/test/tribbles-airdrop/e2e.test.js

@@ -40,11 +40,15 @@ const test = anyTest;
 const nodeRequire = createRequire(import.meta.url);
 
 const bundleRoots = {
-  tribblesAirdrop: nodeRequire.resolve('../../src/airdrop.contract.js'),
+  tribblesAirdrop: nodeRequire.resolve(
+    '../../src/tribbles/airdrop.contract.js',
+  ),
 };
 
 const scriptRoots = {
-  tribblesAirdrop: nodeRequire.resolve('../../src/airdrop.proposal.js'),
+  tribblesAirdrop: nodeRequire.resolve(
+    '../../src/tribbles/airdrop.proposal.js',
+  ),
 };
 
 /** @param {import('ava').ExecutionContext} t */
@@ -207,7 +211,7 @@ test.skip('E2E test', async t => {
   ]);
   consoleCounter();
 
-  /** @type {import('../../src/airdrop.proposal.js').AirdropSpace} */
+  /** @type {import('../../src/tribbles/airdrop.proposal.js').AirdropSpace} */
   // @ts-expect-error cast
   const airdropSpace = powers;
   const instance = await airdropSpace.instance.consume.tribblesAirdrop;

ui/package.json

@@ -17,12 +17,16 @@
     "@agoric/ui-components": "^0.3.9-u13.0",
     "@agoric/web-components": "0.15.1-dev-8fc28e8.0",
     "@cosmjs/proto-signing": "^0.32.4",
+    "@fortawesome/fontawesome-svg-core": "^6.6.0",
+    "@fortawesome/free-solid-svg-icons": "^6.6.0",
+    "@fortawesome/react-fontawesome": "^0.2.2",
     "@noble/hashes": "1.5.0",
     "bech32": "2.0.0",
     "buffer": "^6.0.3",
     "chain-registry": "1.28.0",
     "cosmos-kit": "^2.19.0",
     "daisyui": "^4.12.10",
+    "framer-motion": "^11.11.11",
     "react": "^18.3.1",
     "react-daisyui": "^5.0.0",
     "react-dom": "^18.2.0",

ui/src/App.tsx

@@ -11,7 +11,6 @@ import '@agoric/react-components/dist/style.css';
 function App() {
   const { themeClass } = useTheme();
 
-  console.log({themeClass})
   return (
     <ThemeProvider>
       <div className={themeClass}>

ui/src/components/Orchestration/Orchestration.tsx

@@ -87,7 +87,7 @@ const Orchestration = () => {
     walletConnection,
     pubkeyToAgoricAddress,
   });
-  return purse?.currentAmount?.value !== 0n ? (
+  return !purse == false &&  purse?.currentAmount?.value !== 0n ? (
     <div className="flex flex-col items-center shadow-lg bg-purple-900 rounded text-white">
       <h3>Tribbles Allocation</h3>
 

yarn.lock

@@ -11574,7 +11574,6 @@ __metadata:
     eslint-plugin-react-hooks: "npm:^4.6.0"
     eslint-plugin-react-refresh: "npm:^0.4.5"
     framer-motion: "npm:^11.11.11"
-    immer: "npm:^10.1.1"
     postcss: "npm:^8.4.35"
     react: "npm:^18.3.1"
     react-daisyui: "npm:^5.0.0"