Merge pull request #100 from oasisprotocol/mz/syncMeeting

Align app with sync meeting requirements

Author: buberdds

package.json

@@ -1,7 +1,7 @@
 {
   "name": "rofl-app",
   "private": true,
-  "version": "0.0.0",
+  "version": "0.9.0",
   "type": "module",
   "scripts": {
     "checkTs": "tsc --noEmit",

src/coin-gecko/api.ts

@@ -8,7 +8,7 @@ type GetRosePriceResponse = {
 
 const staleTime = 1000 * 60 * 3 // 3 minutes
 
-export function useGetRosePrice() {
+export function useGetRosePrice(options?: { enabled?: boolean }) {
   return useQuery<number, AxiosError<unknown>>({
     queryKey: ['rosePrice'],
     queryFn: () =>
@@ -22,5 +22,6 @@ export function useGetRosePrice() {
         .then(({ data }) => data['oasis-network'].usd),
     staleTime,
     throwOnError: false,
+    enabled: options?.enabled ?? true,
   })
 }

src/components/AppsList/index.tsx

@@ -26,6 +26,7 @@ export const AppsList: FC<AppsListProps> = ({ emptyState, type }) => {
         limit: pageLimit,
         offset: pageParam,
         admin: type === 'dashboard' ? address : undefined,
+        sort_by: type === 'dashboard' ? 'created_at_desc' : undefined,
       })
       return result
     },

src/components/Layout/MainLayout.tsx

@@ -162,14 +162,24 @@ export const MainLayout: FC = () => {
             <div className="bg-sidebar-accent p-4 rounded-md text-sm text-foreground">
               <span className="font-bold">Running in Beta.</span>
               <br />
-              <a href="#" target="_blank" rel="noopener noreferrer" className="underline text-foreground">
-                Click to provide feedback.
+              <a
+                href="https://forms.gle/yewQDdMzNg81wKtw9"
+                target="_blank"
+                rel="noopener noreferrer"
+                className="underline text-foreground"
+              >
+                Provide feedback here
               </a>
             </div>
             <div className="bg-sidebar-accent p-4 rounded-md text-sm text-foreground">
               <span className="font-bold">Need Support?</span>
               <br />
-              <a href="#" target="_blank" rel="noopener noreferrer" className="underline text-foreground">
+              <a
+                href="https://oasis.io/discord"
+                target="_blank"
+                rel="noopener noreferrer"
+                className="underline text-foreground"
+              >
                 Speak to our devs.
               </a>
             </div>

src/components/MetadataFormFields/index.tsx

@@ -10,9 +10,9 @@ type MetadataFormFieldsProps = {
 export const MetadataFormFields: FC<MetadataFormFieldsProps> = ({ control }) => {
   return (
     <div className="space-y-6">
-      <InputFormField control={control} name="name" label="Name" placeholder="ROFL App name" />
+      <InputFormField control={control} name="name" label="Name" placeholder="App name" />
 
-      <InputFormField control={control} name="author" label="Author" placeholder="Rofl App Creator" />
+      <InputFormField control={control} name="author" label="Author" placeholder="App Creator" />
 
       <InputFormField
         control={control}
@@ -22,9 +22,9 @@ export const MetadataFormFields: FC<MetadataFormFieldsProps> = ({ control }) =>
         type="textarea"
       />
 
-      <InputFormField control={control} name="version" label="Version" placeholder="Rofl App version" />
+      <InputFormField control={control} name="version" label="Version" placeholder="App version" />
 
-      <InputFormField control={control} name="license" label="license" placeholder="MIT, Apache-2.0, etc." />
+      <InputFormField control={control} name="license" label="License" placeholder="MIT, Apache-2.0, etc." />
 
       <InputFormField
         control={control}

src/nexus/generated/api.ts

@@ -2519,8 +2519,23 @@ export type GetRuntimeRoflAppsParams = {
    * A filter on the name of the ROFL app. If multiple names are provided, the ROFL App must match all of them.
    */
   name?: string[]
+  /**
+ * The field to sort the ROFL apps by.
+If unset, the ROFL apps will be sorted by activity (num_active_instances, num_transactions) in descending order.
+To sort by creation time, set this to `created_at` (or `created_at_desc`).
+
+ */
+  sort_by?: GetRuntimeRoflAppsSortBy
 }
 
+export type GetRuntimeRoflAppsSortBy =
+  (typeof GetRuntimeRoflAppsSortBy)[keyof typeof GetRuntimeRoflAppsSortBy]
+
+export const GetRuntimeRoflAppsSortBy = {
+  created_at: 'created_at',
+  created_at_desc: 'created_at_desc',
+} as const
+
 export type GetRuntimeRoflAppsIdTransactionsParams = {
   /**
  * The maximum numbers of items to return.

src/pages/CreateApp/AgentStepHints.tsx

@@ -47,13 +47,15 @@ export const AgentStepHints: FC<AgentStepHintsProps> = ({ selectedTemplateId })
                 README.MD
               </Button>
             </DialogTrigger>
-            <DialogContent className="sm:max-w-3xl">
+            <DialogContent className="sm:max-w-3xl max-h-[80vh] flex flex-col">
               <DialogTitle></DialogTitle>
               <DialogHeader>
                 <DialogTitle>README.md</DialogTitle>
                 <DialogDescription>Docs provided by the template authors.</DialogDescription>
               </DialogHeader>
-              <ReactMarkdown>{markdown}</ReactMarkdown>
+              <div className="flex-1 overflow-y-auto pr-2">
+                <ReactMarkdown>{markdown}</ReactMarkdown>
+              </div>
             </DialogContent>
           </Dialog>
         </>

src/pages/CreateApp/AnimatedStepText.tsx

@@ -38,7 +38,7 @@ const textContent = {
       'Nulla pretium dictum metus, in fringilla arcu tincidunt ut. Duis eget turpis at magna tempor interdum at ac ante.',
   },
   success: {
-    header: 'ROFL App will be ready in 5 minutes!',
+    header: 'App will be ready in 5 minutes!',
     description: (
       <>
         <div>

src/pages/CreateApp/BuildStep.tsx

@@ -172,6 +172,7 @@ export const BuildStep: FC<AgentStepProps> = ({
                       multiplyNumber={Number(form.watch('number'))}
                       duration={form.watch('duration')}
                       onCostCalculated={handleCostCalculated}
+                      network={network}
                     />
                   ))}
                 </RadioGroup>

src/pages/CreateApp/BuildStepOffers.tsx

@@ -17,6 +17,7 @@ type BuildStepOffersProps = {
   multiplyNumber?: number
   duration: BuildFormData['duration']
   onCostCalculated?: (roseCostInBaseUnits: string) => void
+  network: 'mainnet' | 'testnet'
 }
 
 export const BuildStepOffers: FC<BuildStepOffersProps> = ({
@@ -25,14 +26,21 @@ export const BuildStepOffers: FC<BuildStepOffersProps> = ({
   fieldValue,
   duration,
   onCostCalculated,
+  network,
 }) => {
   const ticker = useTicker()
   const targetTerms =
     duration === 'months' ? oasisRT.types.RoflmarketTerm.MONTH : oasisRT.types.RoflmarketTerm.HOUR
   const targetTermsPrice = (offer.payment?.native as { terms?: Record<oasisRT.types.RoflmarketTerm, string> })
     ?.terms?.[targetTerms]
   const multiplyBy = duration === 'days' ? multiplyNumber * 24 : multiplyNumber
-  const { data: rosePrice, isLoading: isLoadingRosePrice, isFetched: isFetchedRosePrice } = useGetRosePrice()
+  const {
+    data: rosePrice,
+    isLoading: isLoadingRosePrice,
+    isFetched: isFetchedRosePrice,
+  } = useGetRosePrice({
+    enabled: network !== 'testnet',
+  })
   const roseCostInBaseUnits = multiplyBaseUnits(targetTermsPrice || '0', multiplyBy)
   const roseCost = fromBaseUnits(roseCostInBaseUnits)