diff --git a/apps/flipcash/core/src/main/res/drawable/ic_deposit_usdc_as_usdf.xml b/apps/flipcash/core/src/main/res/drawable/ic_deposit_usdc_as_usdf.xml new file mode 100644 index 000000000..466d87431 --- /dev/null +++ b/apps/flipcash/core/src/main/res/drawable/ic_deposit_usdc_as_usdf.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + diff --git a/apps/flipcash/core/src/main/res/drawable/ic_usdc.xml b/apps/flipcash/core/src/main/res/drawable/ic_usdc.xml new file mode 100644 index 000000000..8d63bc28b --- /dev/null +++ b/apps/flipcash/core/src/main/res/drawable/ic_usdc.xml @@ -0,0 +1,28 @@ + + + + + diff --git a/apps/flipcash/core/src/main/res/drawable/ic_usdc_on_solana.xml b/apps/flipcash/core/src/main/res/drawable/ic_usdc_on_solana.xml index c6cf37a6c..80b90d5c4 100644 --- a/apps/flipcash/core/src/main/res/drawable/ic_usdc_on_solana.xml +++ b/apps/flipcash/core/src/main/res/drawable/ic_usdc_on_solana.xml @@ -1,38 +1,42 @@ + + android:width="111dp" + android:height="112dp" + android:viewportWidth="111" + android:viewportHeight="112"> + android:pathData="M59.59,15.63C59.8,14.79 60.63,14.38 61.46,14.79C72.92,18.54 82.09,27.5 85.84,39.38C92.09,59.17 81.25,80.21 61.46,86.45C61.25,86.66 60.84,86.66 60.63,86.66C59.8,86.45 59.38,85.83 59.38,85V82.08C59.38,81.04 59.8,80.41 60.63,80C69.17,76.87 76.05,70.21 79.17,61.46C85.21,45.42 76.88,27.29 60.63,21.46C60,21.04 59.38,20.21 59.38,19.38V16.46C59.38,16.04 59.38,15.84 59.59,15.63ZM39.38,14.59C40.21,14.79 40.63,15.42 40.63,16.25V19.17C40.63,20.21 40.21,20.84 39.38,21.25C30.84,24.38 23.96,31.04 20.84,39.79C14.8,55.83 23.13,73.96 39.38,79.79C40,80.21 40.63,81.04 40.63,81.66V84.58C40.63,85 40.63,85.2 40.42,85.41C40.21,86.25 39.38,86.66 38.55,86.25C26.88,82.5 17.92,73.54 14.17,61.87C7.92,42.08 18.75,21.04 38.55,14.79C38.75,14.59 39.17,14.59 39.38,14.59ZM51.46,25.42C52.5,25.63 53.13,26.25 53.13,27.09V32.09C57.92,32.5 61.67,36.04 62.5,40.63V40.84C62.5,41.67 61.88,42.29 61.05,42.29H57.71C57.09,42.29 56.46,41.88 56.25,41.25C55.21,38.13 53.13,36.88 49.38,36.88C45.21,36.88 43.13,38.75 43.13,41.67C43.13,44.58 44.38,46.25 50.63,47.08C59.38,48.13 63.75,50.63 63.75,57.92C63.75,63.54 59.59,67.92 53.34,68.96V73.96C53.13,75 52.5,75.62 51.67,75.62H48.55C47.5,75.42 46.88,74.79 46.88,73.96V68.96C40,67.92 36.67,64.17 35.84,58.96V58.75C35.84,57.92 36.46,57.29 37.3,57.29H40.84C41.46,57.29 42.09,57.71 42.3,58.54C42.92,61.67 44.8,63.96 50.21,63.96C54.17,63.96 57.09,61.67 57.09,58.33C57.09,55 55.21,53.75 49.38,52.71C40.63,51.67 36.46,48.96 36.46,42.09C36.46,36.88 40.42,32.71 46.67,31.88V27.09C46.88,26.04 47.5,25.42 48.34,25.42H51.46Z" + android:fillColor="#ffffff" + android:fillType="evenOdd"/> - - - - - - - + android:pathData="M91.74,92.76m-16.98,0a16.98,16.98 0,1 1,33.96 0a16.98,16.98 0,1 1,-33.96 0" + android:strokeWidth="3.95626" + android:fillColor="#ffffff" + android:strokeColor="#19191A"/> + android:pathData="M100.24,96.22C100.5,96.22 100.62,96.53 100.44,96.71L97.67,99.48C97.56,99.59 97.42,99.65 97.27,99.65H83.24C83.18,99.65 83.12,99.63 83.08,99.6C83.03,99.57 82.99,99.53 82.97,99.47C82.95,99.42 82.94,99.36 82.95,99.31C82.97,99.25 82.99,99.2 83.03,99.16L85.8,96.39C85.91,96.28 86.06,96.22 86.21,96.22H100.24Z" + android:fillColor="#19191A"/> + android:pathData="M97.27,91.01C97.42,91.02 97.56,91.08 97.67,91.18L100.44,93.96C100.62,94.14 100.5,94.45 100.24,94.45H86.21C86.06,94.45 85.91,94.38 85.8,94.28L83.03,91.51C82.99,91.47 82.97,91.41 82.95,91.36C82.94,91.3 82.95,91.24 82.97,91.19C82.99,91.14 83.03,91.09 83.08,91.06C83.12,91.03 83.18,91.01 83.24,91.01H97.27Z" + android:fillColor="#19191A"/> + android:pathData="M100.24,85.88C100.5,85.88 100.62,86.18 100.44,86.37L97.67,89.14C97.56,89.24 97.42,89.31 97.27,89.31H83.24C83.18,89.31 83.12,89.29 83.08,89.26C83.03,89.23 82.99,89.18 82.97,89.13C82.95,89.08 82.94,89.02 82.95,88.96C82.97,88.91 82.99,88.85 83.03,88.81L85.8,86.04L85.81,86.04C85.92,85.94 86.06,85.88 86.21,85.88H100.24Z" + android:fillColor="#19191A"/> diff --git a/apps/flipcash/core/src/main/res/drawable/ic_withdraw_usdf_as_usdc.xml b/apps/flipcash/core/src/main/res/drawable/ic_withdraw_usdf_as_usdc.xml new file mode 100644 index 000000000..1a44052ca --- /dev/null +++ b/apps/flipcash/core/src/main/res/drawable/ic_withdraw_usdf_as_usdc.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + diff --git a/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/components/TransactionReceipt.kt b/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/components/TransactionReceipt.kt index 806ecd5fd..c7985c3be 100644 --- a/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/components/TransactionReceipt.kt +++ b/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/components/TransactionReceipt.kt @@ -95,7 +95,7 @@ internal fun TransactionReceipt( horizontalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x2), iconOverride = { icon -> if (tokenWithBalance.token.address == Mint.usdf) { - painterResource(R.drawable.ic_usdc_on_solana) + painterResource(R.drawable.ic_usdc) } else { icon } @@ -134,7 +134,7 @@ private fun LineItems( ReceiptLineItem( modifier = Modifier.fillMaxWidth(), label = AnnotatedString("Less fee"), - amount = fee.formatted(), + amount = fee.formatted(extraPrefix = "-"), ) val netAmount = remember(transferAmount) { diff --git a/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/screens/UsdcWithdrawalInformationScreen.kt b/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/screens/UsdcWithdrawalInformationScreen.kt index 76f54efe6..e979c32c4 100644 --- a/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/screens/UsdcWithdrawalInformationScreen.kt +++ b/apps/flipcash/features/withdrawal/src/main/kotlin/com/flipcash/app/withdrawal/internal/screens/UsdcWithdrawalInformationScreen.kt @@ -4,18 +4,15 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.IntrinsicSize import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width -import androidx.compose.material.Icon import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowForward -import androidx.compose.material.icons.automirrored.filled.ArrowRight +import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -23,7 +20,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign -import androidx.compose.ui.tooling.preview.Preview import com.flipcash.app.core.withdrawal.WithdrawalResult import com.flipcash.app.core.withdrawal.WithdrawalStep import com.flipcash.core.R @@ -75,29 +71,14 @@ internal fun UsdcWithdrawalInformationScreen() { horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(CodeTheme.dimens.grid.x11), ) { - Row( + Box( modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy( - space = CodeTheme.dimens.grid.x3, - alignment = Alignment.CenterHorizontally - ), + contentAlignment = Alignment.Center, ) { Image( - modifier = Modifier.size(CodeTheme.dimens.staticGrid.x20), - painter = painterResource(R.drawable.ic_flipcash_badge), + painter = painterResource(R.drawable.ic_withdraw_usdf_as_usdc), contentDescription = null, ) - Icon( - imageVector = Icons.AutoMirrored.Default.ArrowForward, - tint = White20, - contentDescription = null - ) - Image( - modifier = Modifier.size(CodeTheme.dimens.staticGrid.x20), - painter = painterResource(id = R.drawable.ic_usdc_on_solana), - contentDescription = null - ) } Column(