Merge pull request #4506 from brave-intl/fix/gemini-icon

Fix/gemini icon
brave-intl · Sep 18, 2024 · 165f79b · 165f79b
2 parents 56d4af2 + 2854b06
commit 165f79b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/nextjs/src/app/[locale]/c/[public_identifier]/CryptoPaymentWidget.jsx b/nextjs/src/app/[locale]/c/[public_identifier]/CryptoPaymentWidget.jsx
@@ -563,7 +563,7 @@ export default function CryptoPaymentWidget({title, cryptoAddresses, cryptoConst
               event.preventDefault();
               sendPayment();
             }}
-            disabled={currentAmount <= 0 || previewMode}
+            isDisabled={currentAmount <= 0 || previewMode}
             className={`mb-3 ${styles['send-button']}`}
           >
             {t("publicChannelPage.send")}

diff --git a/nextjs/src/app/[locale]/publishers/contribution_page/page.jsx b/nextjs/src/app/[locale]/publishers/contribution_page/page.jsx
@@ -165,16 +165,18 @@ export default function ContributionPage() {
 
     return (
       <div className={`${styles['social-link-wrapper']}`} key={category}>
-        <div className='small-semibold pl-0.5 inline'>{channelDisplay(category)}</div>
-        {noOptions && (
-          <Link className='small-semibold pl-0.5 inline' href={`/publishers/home?addChannelModal=true`}>{t('contribution_pages.add_account')}</Link>
-        )}
+        <div>
+          <div className='small-semibold pl-0.5 inline'>{channelDisplay(category)}</div>
+          {noOptions && (
+            <Link className='small-semibold pl-0.5 inline' href={`/publishers/home?addChannelModal=true`}>{t('contribution_pages.add_account')}</Link>
+          )}
+        </div>
         <Dropdown
           placeholder={noOptions ? t('contribution_pages.add_account_msg', { social: channelDisplay(category) }) : t('contribution_pages.select_account')}
           disabled={noOptions}
           value={socialLinks[category] || undefined}
           onChange={({value}) => updateSocial(category, value)}
-          className='w-full mt-1'
+          className='w-full mt-0.5'
           size='normal'
         >
           <div slot='left-icon' className={`${noOptions ? styles['social-link-icon'] : ''}`}>
@@ -191,10 +193,14 @@ export default function ContributionPage() {
             )
           })}
           {socialLinks[category] && (
-            <leo-option key={'clear'} value={''}>
+            <leo-option key='clear' value=''>
               <div className='py-1'>{t('contribution_pages.clear_social')}</div>
             </leo-option>
           )}
+          {/* When there are no options, nala dropdowns are about 4 pixels shorter, which looks weird */}
+          {noOptions && (
+            <leo-option key='placeholder' value=''></leo-option>
+          )}
         </Dropdown>
       </div>
     )

diff --git a/nextjs/src/app/[locale]/publishers/home/custodianServices/CustodianServiceWidget.jsx b/nextjs/src/app/[locale]/publishers/home/custodianServices/CustodianServiceWidget.jsx
@@ -189,7 +189,7 @@ export default function CustodianServiceWidget({ walletData }) {
               onClick={() => redirectToAuthUrl('gemini')}
               kind='outline'
             >
-              <Icon name="gemini-color" slot="icon-before" />
+              <Icon slot="icon-before"><Image src="/images/gemini-color.svg" width="24" height="24" /></Icon>
               {t('Home.account.gemini_connect')}
               <Icon name="launch" slot="icon-after" />
             </Button>