Savings (#579)
* enlarging stroke width * creating local Sql for savings accounts * creating utils for savings feature * fixing collisoin risk for pools and savings account * creating standardized savings transaction container * building explainer page * creating add money page * creating withdrawl page * creating savings homepage * creating savings preview card * creating context to manage savings features * standardizing action buttons between hompage and goal pages * creating goals detail page * creating standardized activity container * creating emoji picker for new goal * creating pool description page * creating goal amount page * creating success screen for goal creation * creating update goal page * creating coal remove confirmation screen * creating goal removed success screen * misc changes * adding translations * fixing missing var * fixed spelling issue * using spark wallet viewer for more reliable balance and txs * adding savingspayout table to delete * fixing formatting for intrest paid out in BTC * combining intrest and nomral txs into single array * adding tx history restore + payouts table * adding earned pill * fixing re-rendering of activities list * adding ability to withdrawl intrest payments * fix open delay * removing tokens dropdown for halfmodal and card * aujust fontsize if too large to prevent overflow * creating clickable wrapper for settings cards * fixing tokens preview card * removing uneeded padding from social options * moving gifts to settings from tabs bar * adding overflow cap to dropdown text length * updating settings pages * adding translations * reducing token image size to decrease banner height * fix theme bug * fixing button widths * fix savings navigation issues + 0 balance issue * starndarizing pool preview to match other previews
This commit is contained in:
+23
-2
@@ -64,10 +64,18 @@ import InformationPopup from '../app/functions/CustomElements/informationPopup';
|
||||
import ShowProfileQr from '../app/functions/CustomElements/showProfileQr';
|
||||
import CreateGift from '../app/components/admin/homeComponents/gifts/createGift';
|
||||
import AdvancedGiftClaim from '../app/components/admin/homeComponents/gifts/advancedClaimMode';
|
||||
import CreatePoolAmount from '../app/components/admin/homeComponents/pools/createPoolAmount';
|
||||
import PoolManagementScreen from '../app/components/admin/homeComponents/pools/poolManagementScreen';
|
||||
import PoolDetailScreen from '../app/components/admin/homeComponents/pools/poolDetailScreen';
|
||||
import ViewContibutors from '../app/components/admin/homeComponents/pools/viewContributors';
|
||||
import SavingsHome from '../app/components/admin/homeComponents/savings/SavingsHome';
|
||||
import SavingsGoalEmoji from '../app/components/admin/homeComponents/savings/SavingsGoalEmoji';
|
||||
import SavingsGoalDescribe from '../app/components/admin/homeComponents/savings/SavingsGoalDescribe';
|
||||
import SavingsGoalAmount from '../app/components/admin/homeComponents/savings/SavingsGoalAmount';
|
||||
import SavingsGoalSuccess from '../app/components/admin/homeComponents/savings/SavingsGoalSuccess';
|
||||
import SavingsUpdateGoal from '../app/components/admin/homeComponents/savings/SavingsUpdateGoal';
|
||||
import SavingsRemoveGoalConfirm from '../app/components/admin/homeComponents/savings/SavingsRemoveGoalConfirm';
|
||||
import SavingsGoalRemovedSuccess from '../app/components/admin/homeComponents/savings/SavingsGoalRemovedSuccess';
|
||||
import SavingsGoalDetails from '../app/components/admin/homeComponents/savings/SavingsGoalDetails';
|
||||
import {
|
||||
CreateAccountHome,
|
||||
DislaimerPage,
|
||||
@@ -91,6 +99,8 @@ import {
|
||||
SettingsHub,
|
||||
} from '../app/screens/inAccount';
|
||||
import ConversionHistory from '../app/components/admin/homeComponents/swaps/swapHistory';
|
||||
import GiftsPageHome from '../app/screens/inAccount/giftsHome';
|
||||
import ReclaimGift from '../app/components/admin/homeComponents/gifts/reclaimGift';
|
||||
|
||||
const SLIDE_FROM_BOTTOM_SCREENS = [
|
||||
{ name: 'CustomWebView', component: CustomWebView },
|
||||
@@ -121,6 +131,7 @@ const SLIDE_FROM_RIGHT_SCREENS = [
|
||||
component: CreateAccountHome,
|
||||
options: { gestureEnabled: true },
|
||||
},
|
||||
{ name: 'SettingsIndex', component: SettingsIndex },
|
||||
{ name: 'SettingsHome', component: SettingsHub },
|
||||
{ name: 'ShowProfileQrSlideRight', component: ShowProfileQr },
|
||||
// {name: 'HistoricalOnChainPayments', component: HistoricalOnChainPayments},
|
||||
@@ -179,8 +190,18 @@ const SLIDE_FROM_RIGHT_SCREENS = [
|
||||
{ name: 'CreateGift', component: CreateGift },
|
||||
{ name: 'AdvancedGiftClaim', component: AdvancedGiftClaim },
|
||||
{ name: 'PoolManagementScreen', component: PoolManagementScreen },
|
||||
{ name: 'CreatePoolAmount', component: CreatePoolAmount },
|
||||
{ name: 'PoolDetailScreen', component: PoolDetailScreen },
|
||||
{ name: 'SavingsHome', component: SavingsHome },
|
||||
{ name: 'SavingsGoalEmoji', component: SavingsGoalEmoji },
|
||||
{ name: 'SavingsGoalDescribe', component: SavingsGoalDescribe },
|
||||
{ name: 'SavingsGoalAmount', component: SavingsGoalAmount },
|
||||
{ name: 'SavingsGoalSuccess', component: SavingsGoalSuccess },
|
||||
{ name: 'SavingsUpdateGoal', component: SavingsUpdateGoal },
|
||||
{ name: 'SavingsRemoveGoalConfirm', component: SavingsRemoveGoalConfirm },
|
||||
{ name: 'SavingsGoalRemovedSuccess', component: SavingsGoalRemovedSuccess },
|
||||
{ name: 'SavingsGoalDetails', component: SavingsGoalDetails },
|
||||
{ name: 'GiftsPageHome', component: GiftsPageHome },
|
||||
{ name: 'ReclaimGift', component: ReclaimGift },
|
||||
];
|
||||
|
||||
const FADE_SCREENS = [
|
||||
|
||||
@@ -32,9 +32,9 @@ function MyTabBar({ state, descriptors, navigation, showShop }) {
|
||||
|
||||
const firstRender = useRef(true);
|
||||
|
||||
const containerWidth = showShop ? 280 : 210;
|
||||
const containerWidth = showShop ? 210 : 140;
|
||||
const adjustedWidth = containerWidth - 2 * 1;
|
||||
const tabWidth = adjustedWidth / (showShop ? 4 : 3);
|
||||
const tabWidth = adjustedWidth / (showShop ? 3 : 2);
|
||||
|
||||
const overlayTranslateX = useSharedValue(0);
|
||||
|
||||
@@ -198,7 +198,7 @@ export function MyTabs(props) {
|
||||
options={{ lazy: false }}
|
||||
/>
|
||||
<Tab.Screen name="Home" component={props.adminHome} />
|
||||
<Tab.Screen name="Gifts" component={props.giftsPageHome} />
|
||||
{/* <Tab.Screen name="Gifts" component={props.giftsPageHome} /> */}
|
||||
{showShop && <Tab.Screen name="App Store" component={props.appStore} />}
|
||||
</Tab.Navigator>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user